trurl/search-graph
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New methods for adding parent edges to graph.

Browse Source
This commit is contained in:
Stu Black 2016-04-17 14:17:12 -04:00
parent 6ce69e5d12
commit 4b348c9bc6
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/hidden/mutators/mod.rs
View File

@ -197,8 +197,7 @@ impl<'a, T, S, A> MutChildList<'a, T, S, A> where T: Hash + Eq + Clone + 'a, S:
id
},
};
let edge_id =
EdgeId(self.graph.add_edge_from_raw(self.id, target_id, edge_data).get_id());
let edge_id = self.graph.add_raw_edge(edge_data, self.id, target_id);
MutEdge { graph: self.graph, id: edge_id, }
}
@ -214,8 +213,7 @@ impl<'a, T, S, A> MutChildList<'a, T, S, A> where T: Hash + Eq + Clone + 'a, S:
id
},
};
let edge_id =
EdgeId(self.graph.add_edge_from_raw(self.id, target_id, edge_data).get_id());
let edge_id = self.graph.add_raw_edge(edge_data, self.id, target_id);
MutEdge { graph: self.graph, id: edge_id, }
}
}
@ -284,6 +282,40 @@ impl<'a, T, S, A> MutParentList<'a, T, S, A> where T: Hash + Eq + Clone + 'a, S:
pub fn iter<'s>(&'s self) -> ParentListIter<'s, T, S, A> {
self.get_target_node().get_parent_list().iter()
}
/// Adds a parent edge to the vertex labeled by `parent_label`. If no such
/// vertex exists, it is created and associated with the data returned by
/// `f`. Returns a mutable edge handle for the new edge, with a lifetime
/// limited to a borrow of `self`.
pub fn add_parent<'s, F>(&'s mut self, parent_label: T, f: F, edge_data: A)
-> MutEdge<'s, T, S, A>
where F: FnOnce() -> S {
let source_id = match self.graph.state_ids.get_or_insert(parent_label) {
NamespaceInsertion::Present(id) => id,
NamespaceInsertion::New(id) => {
self.graph.add_raw_vertex(f());
id
},
};
let edge_id = self.graph.add_raw_edge(edge_data, source_id, self.id);
MutEdge { graph: self.graph, id: edge_id, }
}
/// Adds a parent edge to the vertex labeled by `parent_label`. If no such
/// vertex exists, it is created and associated with the data returned by
/// `f`. Returns a mutable edge handle for the new edge.
pub fn to_add_parent<F>(self, parent_label: T, f: F, edge_data: A) -> MutEdge<'a, T, S, A>
where F: FnOnce() -> S {
let source_id = match self.graph.state_ids.get_or_insert(parent_label) {
NamespaceInsertion::Present(id) => id,
NamespaceInsertion::New(id) => {
self.graph.add_raw_vertex(f());
id
},
};
let edge_id = self.graph.add_raw_edge(edge_data, source_id, self.id);
MutEdge { graph: self.graph, id: edge_id, }
}
}
/// Mutable handle to a graph edge ("edge handle") when edge expansion state is

9
src/lib.rs
View File

@ -124,12 +124,6 @@ impl<T, S, A> Graph<T, S, A> where T: Hash + Eq + Clone {
make_mut_node(self, node_id)
}
fn add_edge_from_raw<'s>(&'s mut self, source: VertexId, target: VertexId, data: A)
-> MutEdge<'s, T, S, A> {
let arc_id = self.add_raw_edge(data, source, target);
make_mut_edge(self, arc_id)
}
/// Adds an edge from the vertex with state data `source` to the vertex with
/// state data `dest`. If vertices are not found for `source` or `dest`,
/// they are added, with the data provided by `source_data` and `dest_data`
@ -156,7 +150,8 @@ impl<T, S, A> Graph<T, S, A> where T: Hash + Eq + Clone {
id
},
};
self.add_edge_from_raw(source_id, dest_id, edge_data)
let edge_id = self.add_raw_edge(edge_data, source_id, dest_id);
make_mut_edge(self, edge_id)
}
/// Returns the number of vertices in the graph.