Changeset 1009:8cb323dbae93 in lemon-0.x for src/work/marci/merge_node_graph_wrapper_test.cc

Timestamp:

11/19/04 18:22:29 (19 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1399

Message:

RoadMap? to STGraphWrapper

File:

• src/work/marci/merge_node_graph_wrapper_test.cc (modified) (6 diffs)

src/work/marci/merge_node_graph_wrapper_test.cc

@@ -1 +1 @@
 #include <iostream>
+#include <fstream>
 
 #include <lemon/list_graph.h>
 #include <lemon/smart_graph.h>
+#include <lemon/dimacs.h>
 #include <merge_node_graph_wrapper.h>
 
@@ -24 +26 @@
   typedef ListGraph Graph2;
   
-//   {
-//     checkConcept<StaticGraph, NewEdgeSetGraphWrapper<Graph1, Graph2> >(); 
-//   }
   {
+    checkConcept<StaticGraph, NewEdgeSetGraphWrapper<Graph1, Graph2> >(); 
+  }
+  {
+    checkConcept<StaticGraph, MergeEdgeGraphWrapper<Graph1, Graph2> >(); 
+  }
+  
   Graph1 g;
   Graph2 h;
-  typedef MergeNodeGraphWrapper<Graph1, Graph2> GW;
+  typedef MergeEdgeGraphWrapper<Graph1, Graph2> GW;
   GW gw(g, h);
-  Graph1::Node n1=g.addNode();
-  Graph1::Node n2=g.addNode();
-  Graph1::Node n3=g.addNode();
-  Graph2::Node n4=h.addNode();
-  Graph2::Node n5=h.addNode();
+
+  std::ifstream f1("graph1.dim");
+  std::ifstream f2("graph2.dim");
+  readDimacs(f1, g);
+  readDimacs(f2, h);
+  {
+
+//   Graph1::Node n1=g.addNode();
+//   Graph1::Node n2=g.addNode();
+//   Graph1::Node n3=g.addNode();
+//   Graph2::Node n4=h.addNode();
+//   Graph2::Node n5=h.addNode();
+//   Graph2::Node n6=h.addNode();
+//   Graph1::Edge e1=g.addEdge(n1, n2);
+//   Graph1::Edge e2=g.addEdge(n1, n3);
+//   Graph2::Edge e3=h.addEdge(n4, n5);
+//   Graph2::Edge e4=h.addEdge(n4, n5);
   //GW::NodeIt n(gw)
+  cout << "1st graph" << endl;
+  cout << " nodes:" << endl;
+  for (Graph1::NodeIt n(g); n!=INVALID; ++n) { 
+    cout << "  " << g.id(n) << endl;
+  }
+  cout << " edges:" << endl;
+  for (Graph1::EdgeIt n(g); n!=INVALID; ++n) { 
+    cout << "  " << g.id(n) << ": " 
+         << g.id(g.source(n)) << "->" << g.id(g.target(n)) << endl;
+  }
+  cout << "2nd graph" << endl;
+  cout << " nodes:" << endl;
+  for (Graph2::NodeIt n(h); n!=INVALID; ++n) { 
+    cout << "  " << h.id(n) << endl;
+  }
+  cout << " edges:" << endl;
+  for (Graph2::EdgeIt n(h); n!=INVALID; ++n) { 
+    cout << "  " << h.id(n) << ": " 
+         << h.id(h.source(n)) << "->" << h.id(h.target(n)) << endl;
+  }
+  cout << "merged graph" << endl;
+  cout << " nodes:" << endl;
   for (GW::NodeIt n(gw); n!=INVALID; ++n) { 
-    cout << gw.id(n) << endl;
+    cout << "  "<< gw.id(n) << endl;
+  }
+  cout << " edges:" << endl;
+  for (GW::EdgeIt n(gw); n!=INVALID; ++n) { 
+    cout << "  " << gw.id(n) << ": " 
+         << gw.id(gw.source(n)) << "->" << gw.id(gw.target(n)) << endl;
   }
 
@@ -49 +93 @@
   }
   for (Graph1::NodeIt n(g); n!=INVALID; ++n) { 
-    cout << nm[n] << endl;
+    cout << nm[GW::Node(n,INVALID,false)] << endl;
   }
   for (Graph2::NodeIt n(h); n!=INVALID; ++n) { 
-    cout << nm[n] << endl;
+    cout << nm[GW::Node(INVALID,n,true)] << endl;
   }
 
-  gw.print();
+  gw.printNode();
 
   {
@@ -65 +109 @@
     typedef MergeNodeGraphWrapper<Graph1, Graph2> GW;
     GW gw(g, h);    
-    gw.print();
+    gw.printNode();
   }
   {
@@ -75 +119 @@
     typedef MergeNodeGraphWrapper<Graph1, Graph2> GW;
     GW gw(g, h);    
-    gw.print();
+    gw.printNode();
   }
   {
@@ -85 +129 @@
     typedef MergeNodeGraphWrapper<Graph1, Graph2> GW;
     GW gw(g, h);    
-    gw.print();
+    gw.printNode();
   }
   }