Changeset 1013:b3bdd856faf4 in lemon-0.x for src/work/marci/merge_node_graph_wrapper_test.cc

Timestamp:

11/20/04 15:09:27 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

MergeGraphWrapper?

File:

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

src/work/marci/merge_node_graph_wrapper_test.cc

@@ -5 +5 @@
 #include <lemon/smart_graph.h>
 #include <lemon/dimacs.h>
+#include <lemon/full_graph.h>
 #include <merge_node_graph_wrapper.h>
 
@@ -22 +23 @@
 };
 
-int main() {
-  typedef SmartGraph Graph1;
-  typedef ListGraph Graph2;
-  
-  {
-    checkConcept<StaticGraph, NewEdgeSetGraphWrapper<Graph1, Graph2> >(); 
-  }
-  {
-    checkConcept<StaticGraph, MergeEdgeGraphWrapper<Graph1, Graph2> >(); 
-  }
-  
-  Graph1 g;
-  Graph2 h;
-  typedef MergeEdgeGraphWrapper<Graph1, Graph2> GW;
-  GW gw(g, h);
-
-  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;
+template <typename Graph>
+void printGraph(const Graph& g) {
   cout << " nodes:" << endl;
-  for (Graph1::NodeIt n(g); n!=INVALID; ++n) { 
+  for (typename Graph::NodeIt n(g); n!=INVALID; ++n) { 
     cout << "  " << g.id(n) << endl;
   }
   cout << " edges:" << endl;
-  for (Graph1::EdgeIt n(g); n!=INVALID; ++n) { 
+  for (typename Graph::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 << " 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;
+  }  
+}
+
+int main() {
+  {
+    cout << "FIRST TEST" << endl;
+    typedef SmartGraph Graph1;
+    typedef ListGraph Graph2;
+    
+    {
+      checkConcept<StaticGraph, MergeEdgeGraphWrapper<Graph1, Graph2> >();   
+      MergeEdgeGraphWrapper<Graph1, Graph2>::printNode(); 
+      MergeEdgeGraphWrapper<Graph1, Graph2>::printEdge(); 
+      checkConcept<StaticGraph, MergeEdgeGraphWrapper<Graph1, Graph1> >();   
+      MergeEdgeGraphWrapper<Graph1, Graph1>::printNode(); 
+      MergeEdgeGraphWrapper<Graph1, Graph1>::printEdge(); 
+    }
+  
+    Graph1 g1;
+    Graph2 g2;
+    typedef MergeEdgeGraphWrapper<Graph1, Graph2> GW;
+    GW gw(g1, g2);
+
+    std::ifstream f1("graph1.dim");
+    std::ifstream f2("graph2.dim");
+    readDimacs(f1, g1);
+    readDimacs(f2, g2);
+    
+    cout << "1st graph" << endl;
+    printGraph(g1);
+
+    cout << "2nd graph" << endl;
+    printGraph(g2);
+
+    cout << "merged graph" << endl;
+    printGraph(gw);
+
   }
 
-  GW::NodeMap<int> nm(gw);
-  int i=0;
-  for (GW::NodeIt n(gw); n!=INVALID; ++n) { 
-    ++i;
-    nm.set(n, i);
-  }
-  for (Graph1::NodeIt n(g); n!=INVALID; ++n) { 
-    cout << nm[GW::Node(n,INVALID,false)] << endl;
-  }
-  for (Graph2::NodeIt n(h); n!=INVALID; ++n) { 
-    cout << nm[GW::Node(INVALID,n,true)] << endl;
+
+  {
+    cout << "SECOND TEST" << endl;
+    typedef SmartGraph Graph1;
+    {
+      checkConcept<StaticGraph, Graph1>();
+    }
+
+    Graph1 g1;
+
+    FullGraph pre_g2(2);
+    ConstMap<FullGraph::Edge, bool> const_false_map(false);
+    typedef EdgeSubGraphWrapper<FullGraph, ConstMap<FullGraph::Edge, bool> >
+      Graph2;
+    {
+      checkConcept<StaticGraph, Graph2>();
+    }
+
+    Graph2 g2(pre_g2, const_false_map);
+
+    typedef MergeEdgeGraphWrapper<Graph1, Graph2> GW;
+    {
+      checkConcept<StaticGraph, GW>();   
+    }
+    GW gw(g1, g2);
+    GW::Node sw;
+    GW::Node tw;
+    {
+      Graph2::NodeIt k(g2);
+      sw=GW::Node(INVALID, k, true);
+      ++k;
+      tw=GW::Node(INVALID, k, true);
+    }
+
+    std::ifstream f1("graph2.dim");
+    readDimacs(f1, g1);
+
+    cout << "1st graph" << endl;
+    printGraph(g1);
+
+    cout << "2nd graph" << endl;
+    printGraph(g2);
+
+    cout << "merged graph" << endl;
+    printGraph(gw);
+
+    typedef ListGraph Graph3;
+    Graph3 g3;
+    GW::NodeMap<Graph3::Node> gwn(gw);
+    Graph3::NodeMap<GW::Node> g3n(g3);
+    for (GW::NodeIt n(gw); n!=INVALID; ++n) {
+      Graph3::Node m=g3.addNode();
+      gwn.set(n, m);
+      g3n.set(m, n);
+    }
+
+    typedef NewEdgeSetGraphWrapper<GW, Graph3> GWW;
+    {
+      checkConcept<StaticGraph, GWW>();   
+    }
+
+    GWW gww(gw, g3, gwn, g3n);
+
+    for (Graph1::NodeIt n(g1); n!=INVALID; ++n) {
+      g3.addEdge(gwn[sw], gwn[GW::Node(n,INVALID,false)]);
+    }
+
+//     for (Graph1::NodeIt n(g1); n!=INVALID; ++n) {
+//       gww.addEdge(sw, GW::Node(n,INVALID,false));
+//     }
+
+    cout << "new edges" << endl;
+    printGraph(g3);
+
+    cout << "new edges in the new graph" << endl;
+    printGraph(gww);
+
+    typedef AugmentingGraphWrapper<GW, GWW> GWWW;
+    {
+      checkConcept<StaticGraph, GWWW>();   
+    }
+    GWWW gwww(gw, gww);
+
+    cout << "new edges merged into the original graph" << endl;
+    printGraph(gwww);
+
   }
 
-  gw.printNode();
-
-  {
-//    typedef SmartGraph Graph1;
-    typedef ListGraph Graph1;
-    typedef ListGraph Graph2;
-    Graph1 g;
-    Graph2 h;
-    typedef MergeNodeGraphWrapper<Graph1, Graph2> GW;
-    GW gw(g, h);    
-    gw.printNode();
-  }
-  {
-//    typedef SmartGraph Graph1;
-    typedef Graph3 Graph1;
-    typedef ListGraph Graph2;
-    Graph1 g;
-    Graph2 h;
-    typedef MergeNodeGraphWrapper<Graph1, Graph2> GW;
-    GW gw(g, h);    
-    gw.printNode();
-  }
-  {
-//    typedef SmartGraph Graph1;
-    typedef ListGraph Graph1;
-    typedef Graph3 Graph2;
-    Graph1 g;
-    Graph2 h;
-    typedef MergeNodeGraphWrapper<Graph1, Graph2> GW;
-    GW gw(g, h);    
-    gw.printNode();
-  }
-  }
-  {
-    Graph1 g;
-    Graph2 h;
-    typedef Graph1::Node Node1;
-    typedef Graph2::Node Node2;
-    typedef NewEdgeSetGraphWrapper<Graph1, Graph2> GW;
-    Graph1::NodeMap<Graph2::Node> e_node(g);
-    Graph2::NodeMap<Graph1::Node> n_node(h);
-    GW gw(g, h, e_node, n_node);
-    for (int i=0; i<4; ++i) { 
-      Node1 n=g.addNode();
-      e_node.set(n, INVALID);
-    }
-    for (int i=0; i<4; ++i) {
-      Graph1::Node n1=g.addNode();
-      Graph2::Node n2=h.addNode();
-      e_node.set(n1, n2);
-      n_node.set(n2, n1);
-    }
-    for (Graph2::NodeIt n(h); n!=INVALID; ++n)
-      for (Graph2::NodeIt m(h); m!=INVALID; ++m)
-        if ((h.id(n)+h.id(m))%3==0) h.addEdge(n, m);
-//     Graph1::NodeIt n(g);
-//     Node1 n1=n;
-//     Node1 n2=++n;
-//     Node1 n3=++n;
-//     Node1 n4=n;
-//     gw.addEdge(n1, n2);
-//     gw.addEdge(n1, n2);
-//     for (EdgeIt(e))
-//   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();
-    for (GW::EdgeIt e(gw); e!=INVALID; ++e) 
-      cout << gw.id(e) << endl;
-    for (GW::NodeIt n(gw); n!=INVALID; ++n) {
-      if (e_node[n]==INVALID) {
-        cout<<gw.id(n)<<" INVALID"<<endl;
-      } else {
-        cout <<gw.id(n)<<" "<<h.id(e_node[n])<<" out_edges: ";
-        //      cout << &e_node << endl;
-        //cout << &n_node << endl;
-        for (GW::OutEdgeIt e(gw, n); e!=INVALID; ++e) {
-          cout<<gw.id(e)<<" ";
-        }
-        cout<< endl;
-      }
-    }
-  }
 }