1.1 --- a/lemon/bits/graph_extender.h Thu Dec 07 16:10:54 2006 +0000
1.2 +++ b/lemon/bits/graph_extender.h Tue Dec 12 13:35:52 2006 +0000
1.3 @@ -283,8 +283,8 @@
1.4 }
1.5
1.6 template <typename Graph, typename NodeRefMap, typename EdgeRefMap>
1.7 - void clone(const Graph& graph, NodeRefMap& nodeRef, EdgeRefMap& edgeRef) {
1.8 - Parent::clone(graph, nodeRef, edgeRef);
1.9 + void build(const Graph& graph, NodeRefMap& nodeRef, EdgeRefMap& edgeRef) {
1.10 + Parent::build(graph, nodeRef, edgeRef);
1.11 getNotifier(Node()).build();
1.12 getNotifier(Edge()).build();
1.13 }
1.14 @@ -694,9 +694,9 @@
1.15 }
1.16
1.17 template <typename Graph, typename NodeRefMap, typename UEdgeRefMap>
1.18 - void clone(const Graph& graph, NodeRefMap& nodeRef,
1.19 + void build(const Graph& graph, NodeRefMap& nodeRef,
1.20 UEdgeRefMap& uEdgeRef) {
1.21 - Parent::clone(graph, nodeRef, uEdgeRef);
1.22 + Parent::build(graph, nodeRef, uEdgeRef);
1.23 getNotifier(Node()).build();
1.24 getNotifier(UEdge()).build();
1.25 getNotifier(Edge()).build();
1.26 @@ -1318,9 +1318,9 @@
1.27
1.28 template <typename Graph, typename ANodeRefMap,
1.29 typename BNodeRefMap, typename UEdgeRefMap>
1.30 - void clone(const Graph& graph, ANodeRefMap& aNodeRef,
1.31 + void build(const Graph& graph, ANodeRefMap& aNodeRef,
1.32 BNodeRefMap& bNodeRef, UEdgeRefMap& uEdgeRef) {
1.33 - Parent::clone(graph, aNodeRef, bNodeRef, uEdgeRef);
1.34 + Parent::build(graph, aNodeRef, bNodeRef, uEdgeRef);
1.35 getNotifier(ANode()).build();
1.36 getNotifier(BNode()).build();
1.37 getNotifier(Node()).build();
2.1 --- a/lemon/bits/traits.h Thu Dec 07 16:10:54 2006 +0000
2.2 +++ b/lemon/bits/traits.h Tue Dec 12 13:35:52 2006 +0000
2.3 @@ -324,14 +324,14 @@
2.4 };
2.5
2.6 template <typename Graph, typename Enable = void>
2.7 - struct CloneableTagIndicator {
2.8 + struct BuildTagIndicator {
2.9 static const bool value = false;
2.10 };
2.11
2.12 template <typename Graph>
2.13 - struct CloneableTagIndicator<
2.14 + struct BuildTagIndicator<
2.15 Graph,
2.16 - typename enable_if<typename Graph::CloneableTag, void>::type
2.17 + typename enable_if<typename Graph::BuildTag, void>::type
2.18 > {
2.19 static const bool value = true;
2.20 };
3.1 --- a/lemon/graph_utils.h Thu Dec 07 16:10:54 2006 +0000
3.2 +++ b/lemon/graph_utils.h Tue Dec 12 13:35:52 2006 +0000
3.3 @@ -683,12 +683,12 @@
3.4 template <typename Graph>
3.5 struct GraphCopySelector<
3.6 Graph,
3.7 - typename enable_if<typename Graph::CloneableTag, void>::type>
3.8 + typename enable_if<typename Graph::BuildTag, void>::type>
3.9 {
3.10 template <typename Source, typename NodeRefMap, typename EdgeRefMap>
3.11 static void copy(Graph &target, const Source& source,
3.12 NodeRefMap& nodeRefMap, EdgeRefMap& edgeRefMap) {
3.13 - target.clone(source, nodeRefMap, edgeRefMap);
3.14 + target.build(source, nodeRefMap, edgeRefMap);
3.15 }
3.16 };
3.17
3.18 @@ -710,12 +710,12 @@
3.19 template <typename UGraph>
3.20 struct UGraphCopySelector<
3.21 UGraph,
3.22 - typename enable_if<typename UGraph::CloneableTag, void>::type>
3.23 + typename enable_if<typename UGraph::BuildTag, void>::type>
3.24 {
3.25 template <typename Source, typename NodeRefMap, typename UEdgeRefMap>
3.26 static void copy(UGraph &target, const Source& source,
3.27 NodeRefMap& nodeRefMap, UEdgeRefMap& uEdgeRefMap) {
3.28 - target.clone(source, nodeRefMap, uEdgeRefMap);
3.29 + target.build(source, nodeRefMap, uEdgeRefMap);
3.30 }
3.31 };
3.32
3.33 @@ -742,14 +742,14 @@
3.34 template <typename BpUGraph>
3.35 struct BpUGraphCopySelector<
3.36 BpUGraph,
3.37 - typename enable_if<typename BpUGraph::CloneableTag, void>::type>
3.38 + typename enable_if<typename BpUGraph::BuildTag, void>::type>
3.39 {
3.40 template <typename Source, typename ANodeRefMap,
3.41 typename BNodeRefMap, typename UEdgeRefMap>
3.42 static void copy(BpUGraph &target, const Source& source,
3.43 ANodeRefMap& aNodeRefMap, BNodeRefMap& bNodeRefMap,
3.44 UEdgeRefMap& uEdgeRefMap) {
3.45 - target.clone(source, aNodeRefMap, bNodeRefMap, uEdgeRefMap);
3.46 + target.build(source, aNodeRefMap, bNodeRefMap, uEdgeRefMap);
3.47 }
3.48 };
3.49
4.1 --- a/lemon/static_graph.h Thu Dec 07 16:10:54 2006 +0000
4.2 +++ b/lemon/static_graph.h Tue Dec 12 13:35:52 2006 +0000
4.3 @@ -122,10 +122,10 @@
4.4
4.5 public:
4.6
4.7 - typedef True CloneableTag;
4.8 + typedef True BuildTag;
4.9
4.10 template <typename Graph, typename NodeRefMap, typename EdgeRefMap>
4.11 - void clone(const Graph& graph, NodeRefMap& nodeRef, EdgeRefMap& edgeRef) {
4.12 + void build(const Graph& graph, NodeRefMap& nodeRef, EdgeRefMap& edgeRef) {
4.13
4.14 if (node_num != -1) {
4.15 delete[] node_first_out;