Changeset 793:9cd0aeea47b0 in lemon-0.x

Timestamp:

09/03/04 11:41:50 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• BFD/DFS/Dijkstra compile test is done with skeleton::GraphSkeleton? graph and skeleton::ReadMap?.
• 'skeleton::' is explicitely written instead of 'using namespace ...' in graph_test.cc
• Output messages of type "makeRep(3)..." in unionfind_test.cc have been changed in order not to confuse compiler output parsers.

Location:

src/test

Files:

• bfs_test.cc (modified) (4 diffs)
• dfs_test.cc (modified) (3 diffs)
• dijkstra_test.cc (modified) (4 diffs)
• graph_test.cc (modified) (2 diffs)
• unionfind_test.cc (modified) (1 diff)

src/test/bfs_test.cc

@@ -2 +2 @@
 #include <hugo/smart_graph.h>
 #include <hugo/bfs.h>
+#include<hugo/skeletons/graph.h>
 
 using namespace hugo;
@@ -8 +9 @@
 
 
-void check_Bfs_SmartGraph_Compile() 
+void check_Bfs_Compile() 
 {
-  typedef int VType;
-  typedef SmartGraph Graph;
+  typedef skeleton::StaticGraphSkeleton Graph;
 
   typedef Graph::Edge Edge;
@@ -17 +17 @@
   typedef Graph::EdgeIt EdgeIt;
   typedef Graph::NodeIt NodeIt;
-  typedef Graph::EdgeMap<VType> LengthMap;
  
   typedef Bfs<Graph> BType;
@@ -24 +23 @@
   Node n;
   Edge e;
-  VType l;
+  int l;
   bool b;
   BType::DistMap d(G);
   BType::PredMap p(G);
   BType::PredNodeMap pn(G);
-  LengthMap cap(G);
   
   BType bfs_test(G);

src/test/dfs_test.cc

@@ -2 +2 @@
 #include <hugo/smart_graph.h>
 #include <hugo/dfs.h>
+#include<hugo/skeletons/graph.h>
 
 using namespace hugo;
@@ -10 +11 @@
 void check_Dfs_SmartGraph_Compile() 
 {
-  typedef int VType;
-  typedef SmartGraph Graph;
+  typedef skeleton::StaticGraphSkeleton Graph;
 
   typedef Graph::Edge Edge;
@@ -17 +17 @@
   typedef Graph::EdgeIt EdgeIt;
   typedef Graph::NodeIt NodeIt;
-  typedef Graph::EdgeMap<VType> LengthMap;
  
-  typedef Dfs<Graph> BType;
+  typedef Dfs<Graph> DType;
   
   Graph G;
   Node n;
   Edge e;
-  VType l;
+  int l;
   bool b;
-  BType::DistMap d(G);
-  BType::PredMap p(G);
-  BType::PredNodeMap pn(G);
-  LengthMap cap(G);
+  DType::DistMap d(G);
+  DType::PredMap p(G);
+  DType::PredNodeMap pn(G);
   
-  BType dfs_test(G);
+  DType dfs_test(G);
   
   dfs_test.run(n);

src/test/dijkstra_test.cc

@@ -2 +2 @@
 #include <hugo/smart_graph.h>
 #include <hugo/dijkstra.h>
-
+#include<hugo/skeletons/graph.h>
+#include<hugo/skeletons/maps.h>
 using namespace hugo;
 
@@ -8 +9 @@
 
 
-void check_Dijkstra_SmartGraph_BinHeap_Compile() 
+void check_Dijkstra_BinHeap_Compile() 
 {
   typedef int VType;
-  typedef SmartGraph Graph;
+  typedef skeleton::StaticGraphSkeleton Graph;
 
   typedef Graph::Edge Edge;
@@ -17 +18 @@
   typedef Graph::EdgeIt EdgeIt;
   typedef Graph::NodeIt NodeIt;
-  typedef Graph::EdgeMap<VType> LengthMap;
+  typedef skeleton::ReadMap<Edge,VType> LengthMap;
  
   typedef Dijkstra<Graph, LengthMap> DType;
@@ -29 +30 @@
   DType::PredMap p(G);
   DType::PredNodeMap pn(G);
-  LengthMap cap(G);
+  LengthMap cap;
 
   DType dijkstra_test(G,cap);

src/test/graph_test.cc

@@ -19 +19 @@
 
 using namespace hugo;
-using namespace hugo::skeleton;
 
 template<class Graph> void checkCompileStaticGraph(Graph &G) 
@@ -342 +341 @@
 
 //Compile GraphSkeleton
-template 
-void checkCompileStaticGraph<StaticGraphSkeleton>(StaticGraphSkeleton &);
-template void checkCompile<GraphSkeleton>(GraphSkeleton &);
-template
-void checkCompileErase<EraseableGraphSkeleton>(EraseableGraphSkeleton &);
+template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
+(skeleton::StaticGraphSkeleton &);
+
+template void checkCompile<skeleton::GraphSkeleton>(skeleton::GraphSkeleton &);
+
+template void checkCompileErase<skeleton::EraseableGraphSkeleton>
+(skeleton::EraseableGraphSkeleton &);
 
 //Compile SmartGraph

src/test/unionfind_test.cc

@@ -163 +163 @@
   check(U.size(2) == 3,"Test failed.");
 
-  cout << "makeRep(4)..." << endl;
+  cout << "Calling makeRep(4)..." << endl;
   U.makeRep(4);
 //   print(U);
-  cout << "makeRep(3)..." << endl;
+  cout << "Calling makeRep(3)..." << endl;
   U.makeRep(3);
 //   print(U);
-  cout << "makeRep(2)..." << endl;
+  cout << "Calling makeRep(2)..." << endl;
   U.makeRep(2);
 //   print(U);