Changeset 2242:16523135943d in lemon-0.x for test/all_pairs_shortest_path_test.cc

Timestamp:

10/14/06 17:26:05 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

New random interface
Switching to the new interface

File:

• test/all_pairs_shortest_path_test.cc (modified) (4 diffs)

test/all_pairs_shortest_path_test.cc

@@ -37 +37 @@
 
 int main(int argc, const char *argv[]) {
-  srand(time(0));
   typedef SmartGraph Graph;
   typedef Graph::Node Node;
@@ -44 +43 @@
   typedef Graph::EdgeIt EdgeIt;
 
-  typedef Graph::EdgeMap<double> LengthMap;
-  typedef Graph::NodeMap<double> DistMap;
+  typedef Graph::EdgeMap<int> LengthMap;
+  typedef Graph::NodeMap<int> DistMap;
 
   const int n = argc > 1 ? atoi(argv[1]) : 20;
   const int e = argc > 2 ? atoi(argv[2]) : (int)(n * log((double)n));
-  const double m = argc > 3 ? (double)atoi(argv[3]) : 100.0;
+  const int m = argc > 3 ? atoi(argv[3]) : 100;
 
   Graph graph;
@@ -59 +58 @@
     Node node = graph.addNode();
     nodes.push_back(node);
-    shift[node] = m * (double)rand() / (RAND_MAX + 1.0);
+    shift[node] = rnd[m];
   }
 
   for (int i = 0; i < e; ++i) {
-    int s = (int)(n * (double)rand() / (RAND_MAX + 1.0));
-    int t = (int)(n * (double)rand() / (RAND_MAX + 1.0));
-    double c = m * (double)rand() / (RAND_MAX + 1.0);
+    int s = rnd[n];
+    int t = rnd[n];
     Edge edge = graph.addEdge(nodes[s], nodes[t]);
-    length[edge] = c - shift[nodes[s]] + shift[nodes[t]];
+    length[edge] = rnd[m] - shift[nodes[s]] + shift[nodes[t]];
   }
 
@@ -77 +75 @@
   }
 
-  typedef FibHeap<Node, double, Graph::NodeMap<int> > DoubleFibHeap;
-  Johnson<Graph, LengthMap>::DefStandardHeap<DoubleFibHeap>
+  typedef FibHeap<Node, int, Graph::NodeMap<int> > IntFibHeap;
+  Johnson<Graph, LengthMap>::DefStandardHeap<IntFibHeap>
     ::Create fibJohnson(graph, length);
   {