# HG changeset patch
# User athos
# Date 1084293497 0
# Node ID 83530dad618a2da222436d3756d3118791d997cb
# Parent  4ce8c695e748847126567bb62c3282959d97995b
Some modifications and another testfile.

diff -r 4ce8c695e748 -r 83530dad618a src/hugo/mincostflows.h
--- a/src/hugo/mincostflows.h	Tue May 11 16:15:18 2004 +0000
+++ b/src/hugo/mincostflows.h	Tue May 11 16:38:17 2004 +0000
@@ -6,7 +6,7 @@
 ///\file
 ///\brief An algorithm for finding a flow of value \c k (for small values of \c k) having minimal total cost 
 
-#include <iostream>
+
 #include <hugo/dijkstra.h>
 #include <hugo/graph_wrapper.h>
 #include <hugo/maps.h>
diff -r 4ce8c695e748 -r 83530dad618a src/hugo/minlengthpaths.h
--- a/src/hugo/minlengthpaths.h	Tue May 11 16:15:18 2004 +0000
+++ b/src/hugo/minlengthpaths.h	Tue May 11 16:38:17 2004 +0000
@@ -6,7 +6,7 @@
 ///\file
 ///\brief An algorithm for finding k paths of minimal total length.
 
-#include <iostream>
+
 //#include <hugo/dijkstra.h>
 //#include <hugo/graph_wrapper.h>
 #include <hugo/maps.h>
diff -r 4ce8c695e748 -r 83530dad618a src/test/mincostflows_test.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/test/mincostflows_test.cc	Tue May 11 16:38:17 2004 +0000
@@ -0,0 +1,88 @@
+#include <iostream>
+#include "test_tools.h"
+#include <hugo/list_graph.h>
+#include <hugo/mincostflows.h>
+//#include <path.h>
+//#include <maps.h>
+
+using namespace std;
+using namespace hugo;
+
+
+
+bool passed = true;
+/*
+void check(bool rc, char *msg="") {
+  passed = passed && rc;
+  if(!rc) {
+    std::cerr << "Test failed! ("<< msg << ")" << std::endl; \
+ 
+
+  }
+}
+*/
+
+
+int main()
+{
+
+  typedef ListGraph::Node Node;
+  typedef ListGraph::Edge Edge;
+
+  ListGraph graph;
+
+  //Ahuja könyv példája
+
+  Node s=graph.addNode();
+  Node v1=graph.addNode();  
+  Node v2=graph.addNode();
+  Node v3=graph.addNode();
+  Node v4=graph.addNode();
+  Node v5=graph.addNode();
+  Node t=graph.addNode();
+
+  Edge s_v1=graph.addEdge(s, v1);
+  Edge v1_v2=graph.addEdge(v1, v2);
+  Edge s_v3=graph.addEdge(s, v3);
+  Edge v2_v4=graph.addEdge(v2, v4);
+  Edge v2_v5=graph.addEdge(v2, v5);
+  Edge v3_v5=graph.addEdge(v3, v5);
+  Edge v4_t=graph.addEdge(v4, t);
+  Edge v5_t=graph.addEdge(v5, t);
+  
+
+  ListGraph::EdgeMap<int> length(graph);
+
+  length.set(s_v1, 6);
+  length.set(v1_v2, 4);
+  length.set(s_v3, 10);
+  length.set(v2_v4, 5);
+  length.set(v2_v5, 1);
+  length.set(v3_v5, 5);
+  length.set(v4_t, 8);
+  length.set(v5_t, 8);
+
+  ConstMap<Edge, int> const1map(1);
+  std::cout << "Mincostflows algorithm test..." << std::endl;
+
+  
+  int k=3;
+  MinCostFlows< ListGraph, ListGraph::EdgeMap<int>, ConstMap<Edge, int> >
+    surb_test(graph, length, const1map);
+
+  check(  surb_test.run(s,t,k) == 2 && surb_test.totalLength() == 46,"Two paths, total length should be 46");
+
+  check(surb_test.checkComplementarySlackness(), "Is the primal-dual solution pair really optimal?");
+
+  k=1;
+  check(  surb_test.run(s,t,k) == 1 && surb_test.totalLength() == 19,"One path, total length should be 19");
+
+  check(surb_test.checkComplementarySlackness(), "Is the primal-dual solution pair really optimal?");
+  
+
+  cout << (passed ? "All tests passed." : "Some of the tests failed!!!")
+       << endl;
+
+  return passed ? 0 : 1;
+
+}
diff -r 4ce8c695e748 -r 83530dad618a src/test/minlengthpaths_test.cc
--- a/src/test/minlengthpaths_test.cc	Tue May 11 16:15:18 2004 +0000
+++ b/src/test/minlengthpaths_test.cc	Tue May 11 16:38:17 2004 +0000
@@ -2,6 +2,7 @@
 #include <hugo/list_graph.h>
 #include <hugo/minlengthpaths.h>
 #include <path.h>
+#include "test_tools.h"
 
 using namespace std;
 using namespace hugo;
@@ -10,16 +11,6 @@
 
 bool passed = true;
 
-void check(bool rc, char *msg="") {
-  passed = passed && rc;
-  if(!rc) {
-    std::cerr << "Test failed! ("<< msg << ")" << std::endl; \
- 
-
-  }
-}
-
-
 
 int main()
 {
diff -r 4ce8c695e748 -r 83530dad618a src/work/athos/mincostflows_test.cc
--- a/src/work/athos/mincostflows_test.cc	Tue May 11 16:15:18 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-#include <iostream>
-#include <list_graph.h>
-#include <mincostflows.h>
-//#include <path.h>
-//#include <maps.h>
-
-using namespace std;
-using namespace hugo;
-
-
-
-bool passed = true;
-
-void check(bool rc, char *msg="") {
-  passed = passed && rc;
-  if(!rc) {
-    std::cerr << "Test failed! ("<< msg << ")" << std::endl; \
- 
-
-  }
-}
-
-
-
-int main()
-{
-
-  typedef ListGraph::Node Node;
-  typedef ListGraph::Edge Edge;
-
-  ListGraph graph;
-
-  //Ahuja könyv példája
-
-  Node s=graph.addNode();
-  Node v1=graph.addNode();  
-  Node v2=graph.addNode();
-  Node v3=graph.addNode();
-  Node v4=graph.addNode();
-  Node v5=graph.addNode();
-  Node t=graph.addNode();
-
-  Edge s_v1=graph.addEdge(s, v1);
-  Edge v1_v2=graph.addEdge(v1, v2);
-  Edge s_v3=graph.addEdge(s, v3);
-  Edge v2_v4=graph.addEdge(v2, v4);
-  Edge v2_v5=graph.addEdge(v2, v5);
-  Edge v3_v5=graph.addEdge(v3, v5);
-  Edge v4_t=graph.addEdge(v4, t);
-  Edge v5_t=graph.addEdge(v5, t);
-  
-
-  ListGraph::EdgeMap<int> length(graph);
-
-  length.set(s_v1, 6);
-  length.set(v1_v2, 4);
-  length.set(s_v3, 10);
-  length.set(v2_v4, 5);
-  length.set(v2_v5, 1);
-  length.set(v3_v5, 5);
-  length.set(v4_t, 8);
-  length.set(v5_t, 8);
-
-  ConstMap<Edge, int> const1map(1);
-  std::cout << "Mincostflows algorithm test..." << std::endl;
-
-  
-  int k=3;
-  MinCostFlows< ListGraph, ListGraph::EdgeMap<int>, ConstMap<Edge, int> >
-    surb_test(graph, length, const1map);
-
-  check(  surb_test.run(s,t,k) == 2 && surb_test.totalLength() == 46,"Two paths, total length should be 46");
-
-  check(surb_test.checkSolution(), "Is the primal-dual solution pair really optimal?");
-
-  k=1;
-  check(  surb_test.run(s,t,k) == 1 && surb_test.totalLength() == 19,"One path, total length should be 19");
-
-  check(surb_test.checkSolution(), "Is the primal-dual solution pair really optimal?");
-  
-  //cout << surb_test.run(s,t,k) << surb_test.totalLength()<<endl;
-  /*
-  typedef DirPath<ListGraph> DPath;
-  DPath P(graph);
-
-  surb_test.getPath(P,0);
-  check(P.length() == 4, "First path should contain 4 edges.");  
-
-  surb_test.getPath(P,1);
-  check(P.length() == 3, "Second path: 3 edges.");
-  
-  k=1;
-  check(  surb_test.run(s,t,k) == 1 && surb_test.totalLength() == 19,"One path, total length should be 19");
- 
-  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;
-
-  return passed ? 0 : 1;
-
-}