Skip to content

Commit

Permalink
WIP using impl Iterator in graph traits instead of box<dyn Iterator>
Browse files Browse the repository at this point in the history
  • Loading branch information
@Emoun
Emoun committed Oct 27, 2024
1 parent a06a177 commit af0b72b
Show file tree
Hide file tree
Showing 12 changed files with 220 additions and 285 deletions.
2 changes: 1 addition & 1 deletion src/algo/tarjan_scc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ where
);
Self {
dfs,
unchecked: graph.all_vertices(),
unchecked: Box::new(graph.all_vertices()),
}
}
}
Expand Down
158 changes: 75 additions & 83 deletions src/common/adjacency_list/impl_graph.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,122 +16,114 @@ where
type Vertex = usize;
type VertexWeight = Vw;

fn all_vertices_weighted(
&self,
) -> Box<dyn '_ + Iterator<Item = (Self::Vertex, &Self::VertexWeight)>>
fn all_vertices_weighted(&self) -> impl Iterator<Item = (Self::Vertex, &Self::VertexWeight)>
{
Box::new(self.vertices.iter().enumerate().map(|(v, (w, _))| (v, w)))
self.vertices.iter().enumerate().map(|(v, (w, _))| (v, w))
}

fn edges_between<'a: 'b, 'b>(
&'a self,
source: impl 'b + Borrow<Self::Vertex>,
sink: impl 'b + Borrow<Self::Vertex>,
) -> Box<dyn 'b + Iterator<Item = &'a Self::EdgeWeight>>
) -> impl 'b + Iterator<Item = &'a Self::EdgeWeight>
{
let source = source.borrow().clone();
let sink = sink.borrow().clone();

Box::new(
self.vertices
.get(source)
.into_iter()
.flat_map(move |(_, edges)| {
edges.iter().filter_map(move |(si, w)| {
if *si == sink
{
Some(w)
}
else
{
None
}
})
self.vertices
.get(source)
.into_iter()
.flat_map(move |(_, edges)| {
edges.iter().filter_map(move |(si, w)| {
if *si == sink
{
Some(w)
}
else
{
None
}
})
.chain(
self.vertices
.get(sink)
.into_iter()
.flat_map(move |(_, edges)| {
edges.iter().filter_map(move |(si, w)| {
if !Self::Directedness::directed() && *si != sink && *si == source
{
Some(w)
}
else
{
None
}
})
}),
),
)
})
.chain(
self.vertices
.get(sink)
.into_iter()
.flat_map(move |(_, edges)| {
edges.iter().filter_map(move |(si, w)| {
if !Self::Directedness::directed() && *si != sink && *si == source
{
Some(w)
}
else
{
None
}
})
}),
)
}
}

impl<Vw, Ew, D> GraphMut for AdjListGraph<Vw, Ew, D>
where
D: Directedness,
{
fn all_vertices_weighted_mut<'a>(
&'a mut self,
) -> Box<dyn 'a + Iterator<Item = (Self::Vertex, &'a mut Self::VertexWeight)>>
fn all_vertices_weighted_mut(
&mut self,
) -> impl '_ + Iterator<Item = (Self::Vertex, &mut Self::VertexWeight)>
{
Box::new(
self.vertices
.iter_mut()
.enumerate()
.map(|(v, (w, _))| (v, w)),
)
self.vertices
.iter_mut()
.enumerate()
.map(|(v, (w, _))| (v, w))
}

fn edges_between_mut<'a: 'b, 'b>(
&'a mut self,
source: impl 'b + Borrow<Self::Vertex>,
sink: impl 'b + Borrow<Self::Vertex>,
) -> Box<dyn 'b + Iterator<Item = &'a mut Self::EdgeWeight>>
) -> impl 'b + Iterator<Item = &'a mut Self::EdgeWeight>
{
let source = source.borrow().clone();
let sink = sink.borrow().clone();

Box::new(
self.vertices
.iter_mut()
.enumerate()
.filter_map(move |(so, (_, edges))| {
if source == so
{
Some((false, edges))
}
else if !Self::Directedness::directed() && (so == sink)
{
Some((true, edges))
}
else
{
None
}
})
.flat_map(|(sink_first, edges)| {
edges
.iter_mut()
.map(move |(si, weight)| (sink_first, si, weight))
})
.filter_map(move |(sink_first, si, weight)| {
if sink_first
{
if source == *si
{
return Some(weight);
}
}
else if sink == *si
self.vertices
.iter_mut()
.enumerate()
.filter_map(move |(so, (_, edges))| {
if source == so
{
Some((false, edges))
}
else if !Self::Directedness::directed() && (so == sink)
{
Some((true, edges))
}
else
{
None
}
})
.flat_map(|(sink_first, edges)| {
edges
.iter_mut()
.map(move |(si, weight)| (sink_first, si, weight))
})
.filter_map(move |(sink_first, si, weight)| {
if sink_first
{
if source == *si
{
return Some(weight);
}
None
}),
)
}
else if sink == *si
{
return Some(weight);
}
None
})
}
}

Expand Down
94 changes: 42 additions & 52 deletions src/core/graph.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,53 +75,49 @@ pub trait Graph
type Directedness: Directedness;

/// Returns copies of all current vertex values in the graph.
fn all_vertices_weighted(
&self,
) -> Box<dyn '_ + Iterator<Item = (Self::Vertex, &Self::VertexWeight)>>;
fn all_vertices_weighted(&self) -> impl Iterator<Item = (Self::Vertex, &Self::VertexWeight)>;

/// Returns the weights of all edges that are sourced in v1 and sinked in
/// v2. I.e. all edges where e == (v1,v2,_).
///
/// If the graph is undirected, returns all edges connecting the two
/// vertices I.e. all edges where e == (v1,v2,_) or e == (v2,v1,_)
/// vertices. I.e. all edges where e == (v1,v2,_) or e == (v2,v1,_)
fn edges_between<'a: 'b, 'b>(
&'a self,
source: impl 'b + Borrow<Self::Vertex>,
sink: impl 'b + Borrow<Self::Vertex>,
) -> Box<dyn 'b + Iterator<Item = &'a Self::EdgeWeight>>;
) -> impl 'b + Iterator<Item = &'a Self::EdgeWeight>;

// Optional methods

/// Returns copies of all current edges in the graph.
fn all_edges<'a>(
&'a self,
) -> Box<dyn 'a + Iterator<Item = (Self::Vertex, Self::Vertex, &'a Self::EdgeWeight)>>
fn all_edges(
&self,
) -> impl '_ + Iterator<Item = (Self::Vertex, Self::Vertex, &Self::EdgeWeight)>
{
let mut finished = Vec::new();
Box::new(
self.all_vertices()
.flat_map(move |v| self.edges_sourced_in(v).map(move |(v2, w)| (v, v2, w)))
.filter(move |(so, si, _)| {
if finished.last().is_none() || finished.last().unwrap() != so
{
finished.push(so.clone());
}

if !Self::Directedness::directed()
{
si == so || !finished.contains(&si)
}
else
{
true
}
}),
)
self.all_vertices()
.flat_map(move |v| self.edges_sourced_in(v).map(move |(v2, w)| (v, v2, w)))
.filter(move |(so, si, _)| {
if finished.last().is_none() || finished.last().unwrap() != so
{
finished.push(so.clone());
}

if !Self::Directedness::directed()
{
si == so || !finished.contains(&si)
}
else
{
true
}
})
}

fn all_vertices<'a>(&'a self) -> Box<dyn 'a + Iterator<Item = Self::Vertex>>
fn all_vertices(&self) -> impl '_ + Iterator<Item = Self::Vertex>
{
Box::new(self.all_vertices_weighted().map(|(v, _)| v))
self.all_vertices_weighted().map(|(v, _)| v)
}

fn vertex_weight(&self, v: impl Borrow<Self::Vertex>) -> Option<&Self::VertexWeight>
Expand All @@ -141,9 +137,9 @@ pub trait Graph
iter.into_iter().all(|v| self.contains_vertex(v))
}

fn all_vertex_weights<'a>(&'a self) -> Box<dyn 'a + Iterator<Item = &'a Self::VertexWeight>>
fn all_vertex_weights(&self) -> impl '_ + Iterator<Item = &Self::VertexWeight>
{
Box::new(self.all_vertices_weighted().map(|(_, w)| w))
self.all_vertices_weighted().map(|(_, w)| w)
}

/// Returns the sink and weight of any edge sourced in the given vertex.
Expand All @@ -154,12 +150,12 @@ pub trait Graph
fn edges_sourced_in<'a: 'b, 'b>(
&'a self,
v: impl 'b + Borrow<Self::Vertex>,
) -> Box<dyn 'b + Iterator<Item = (Self::Vertex, &'a Self::EdgeWeight)>>
) -> impl 'b + Iterator<Item = (Self::Vertex, &'a Self::EdgeWeight)>
{
Box::new(self.all_vertices().flat_map(move |v2| {
self.all_vertices().flat_map(move |v2| {
self.edges_between(v.borrow().clone(), v2.borrow().clone())
.map(move |w| (v2.clone(), w))
}))
})
}

/// Returns the source and weight of any edge sinked in the given vertex.
Expand All @@ -170,12 +166,12 @@ pub trait Graph
fn edges_sinked_in<'a: 'b, 'b>(
&'a self,
v: impl 'b + Borrow<Self::Vertex>,
) -> Box<dyn 'b + Iterator<Item = (Self::Vertex, &'a Self::EdgeWeight)>>
) -> impl 'b + Iterator<Item = (Self::Vertex, &'a Self::EdgeWeight)>
{
Box::new(self.all_vertices().flat_map(move |v2| {
self.all_vertices().flat_map(move |v2| {
self.edges_between(v2.borrow().clone(), v.borrow().clone())
.map(move |w| (v2.clone(), w))
}))
})
}

/// Returns the neighboring vertex and the weight of any edge incident
Expand All @@ -185,15 +181,11 @@ pub trait Graph
fn edges_incident_on<'a: 'b, 'b>(
&'a self,
v: impl 'b + Borrow<Self::Vertex>,
) -> Box<dyn 'b + Iterator<Item = (Self::Vertex, &'a Self::EdgeWeight)>>
) -> impl 'b + Iterator<Item = (Self::Vertex, &'a Self::EdgeWeight)>
{
Box::new(
self.edges_sourced_in(v.borrow().clone()).chain(
self.edges_sinked_in(v.borrow().clone())
.filter(move |(v2, _)| {
Self::Directedness::directed() && v.borrow() != v2.borrow()
}),
),
self.edges_sourced_in(v.borrow().clone()).chain(
self.edges_sinked_in(v.borrow().clone())
.filter(move |(v2, _)| Self::Directedness::directed() && v.borrow() != v2.borrow()),
)
}

Expand All @@ -202,12 +194,10 @@ pub trait Graph
fn vertex_neighbors<'a: 'b, 'b>(
&'a self,
v: impl 'b + Borrow<Self::Vertex>,
) -> Box<dyn 'b + Iterator<Item = Self::Vertex>>
) -> impl 'b + Iterator<Item = Self::Vertex>
{
Box::new(
self.all_vertices()
.filter(move |other| self.neighbors(v.borrow(), other.borrow())),
)
self.all_vertices()
.filter(move |other| self.neighbors(v.borrow(), other.borrow()))
}

/// Returns whether the two vertices are connected by an edge in any
Expand Down Expand Up @@ -235,13 +225,13 @@ pub trait GraphMut: Graph
{
fn all_vertices_weighted_mut(
&mut self,
) -> Box<dyn '_ + Iterator<Item = (Self::Vertex, &mut Self::VertexWeight)>>;
) -> impl '_ + Iterator<Item = (Self::Vertex, &mut Self::VertexWeight)>;

fn edges_between_mut<'a: 'b, 'b>(
&'a mut self,
source: impl 'b + Borrow<Self::Vertex>,
sink: impl 'b + Borrow<Self::Vertex>,
) -> Box<dyn 'b + Iterator<Item = &'a mut Self::EdgeWeight>>;
) -> impl 'b + Iterator<Item = &'a mut Self::EdgeWeight>;

// Optional methods

Expand Down
Loading

0 comments on commit af0b72b

Please sign in to comment.