Changeset 1732:edeee3cbd80c in lemon-0.x for test/all_pairs_shortest_path_test.cc

Timestamp:

10/21/05 10:34:47 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bugfix

File:

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

test/all_pairs_shortest_path_test.cc

@@ -11 +11 @@
 
 #include <lemon/time_measure.h>
+#include "test_tools.h"
 
 using namespace lemon;
@@ -27 +28 @@
 
   const int n = argc > 1 ? atoi(argv[1]) : 20;
-  const int e = argc > 2 ? atoi(argv[2]) : (int)(n * log(n));
+  const int e = argc > 2 ? atoi(argv[2]) : (int)(n * log((double)n));
   const double m = argc > 3 ? (double)atoi(argv[3]) : 100.0;
 
@@ -65 +66 @@
   for (NodeIt it(graph); it != INVALID; ++it) {
     for (NodeIt jt(graph); jt != INVALID; ++jt) {
-      assert(johnson.connected(it, jt) == floyd.connected(it, jt));
+      check(johnson.connected(it, jt) == floyd.connected(it, jt),
+            "Wrong connection in all pairs shortest path");
       if (johnson.connected(it, jt)) {
-        assert(johnson.dist(it, jt) == floyd.dist(it, jt));
+        check(johnson.dist(it, jt) == floyd.dist(it, jt),
+              "Wrong distance in all pairs shortest path");
         if (it != jt) {
-          assert(johnson.dist(it, jt) == 
-                 johnson.dist(it, johnson.predNode(it, jt)) +
-                 length[johnson.pred(it, jt)]);
-          assert(floyd.dist(it, jt) == 
-                 floyd.dist(it, floyd.predNode(it, jt)) +
-                 length[floyd.pred(it, jt)]);
+          check(johnson.dist(it, jt) == 
+                johnson.dist(it, johnson.predNode(it, jt)) +
+                length[johnson.pred(it, jt)],
+                "Wrong edge in all pairs shortest path");
+          check(floyd.dist(it, jt) == 
+                floyd.dist(it, floyd.predNode(it, jt)) +
+                length[floyd.pred(it, jt)],
+                "Wrong edge in all pairs shortest path");
         }
       }