[Lemon-commits] [lemon_svn] alpar: r1083 - hugo/trunk/src/test

[Lemon SVN]

Author: alpar
Date: Thu Sep  2 19:11:04 2004
New Revision: 1083

Modified:
   hugo/trunk/src/test/Makefile.am
   hugo/trunk/src/test/minlengthpaths_test.cc

Log:
- 'minlengpaths_test.cc' added.
- Path tests in 'minlengpaths_test.cc' are swithced out.

Modified: hugo/trunk/src/test/Makefile.am
==============================================================================
--- hugo/trunk/src/test/Makefile.am	(original)
+++ hugo/trunk/src/test/Makefile.am	Thu Sep  2 19:11:04 2004
@@ -2,23 +2,28 @@
 
 noinst_HEADERS = test_tools.h
 
-check_PROGRAMS = graph_test dijkstra_test bfs_test dfs_test time_measure_test \
-	error_test xy_test \
-	unionfind_test test_tools_pass test_tools_fail \
-	mincostflows_test
+check_PROGRAMS = test_tools_pass test_tools_fail \
+	graph_test \
+	dijkstra_test bfs_test dfs_test \
+	minlengthpaths_test mincostflows_test \
+	unionfind_test xy_test \
+	time_measure_test \
+	error_test 
+
 
 TESTS = $(check_PROGRAMS)
 XFAIL_TESTS = test_tools_fail
 
-graph_test_SOURCES = graph_test.cc
-dijkstra_test_SOURCES = dijkstra_test.cc
 bfs_test_SOURCES = bfs_test.cc
 dfs_test_SOURCES = dfs_test.cc
-unionfind_test_SOURCES = unionfind_test.cc
-time_measure_test_SOURCES = time_measure_test.cc
+dijkstra_test_SOURCES = dijkstra_test.cc
 error_test_SOURCES = error_test.cc
-xy_test_SOURCES = xy_test.cc
-test_tools_pass_SOURCES = test_tools_pass.cc
-test_tools_fail_SOURCES = test_tools_fail.cc
+graph_test_SOURCES = graph_test.cc
 mincostflows_test_SOURCES = mincostflows_test.cc
+minlengthpaths_test_SOURCES = minlengthpaths_test.cc
+time_measure_test_SOURCES = time_measure_test.cc
+test_tools_fail_SOURCES = test_tools_fail.cc
+test_tools_pass_SOURCES = test_tools_pass.cc
+unionfind_test_SOURCES = unionfind_test.cc
+xy_test_SOURCES = xy_test.cc
 

Modified: hugo/trunk/src/test/minlengthpaths_test.cc
==============================================================================
--- hugo/trunk/src/test/minlengthpaths_test.cc	(original)
+++ hugo/trunk/src/test/minlengthpaths_test.cc	Thu Sep  2 19:11:04 2004
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <hugo/list_graph.h>
 #include <hugo/minlengthpaths.h>
-#include <path.h>
+//#include <path.h>
 #include "test_tools.h"
 
 using namespace std;
@@ -62,8 +62,8 @@
 
   check(  surb_test.checkComplementarySlackness(), "Complementary slackness conditions are not met.");
 
-  typedef DirPath<ListGraph> DPath;
-  DPath P(graph);
+  //  typedef DirPath<ListGraph> DPath;
+  //  DPath P(graph);
 
   /*
   surb_test.getPath(P,0);
@@ -79,8 +79,8 @@
 
   check(  surb_test.checkComplementarySlackness(), "Complementary slackness conditions are not met.");
  
-  surb_test.getPath(P,0);
-  check(P.length() == 4, "First path should contain 4 edges.");  
+  //  surb_test.getPath(P,0);
+  //  check(P.length() == 4, "First path should contain 4 edges.");  
 
   cout << (passed ? "All tests passed." : "Some of the tests failed!!!")
        << endl;