Changes in test/suurballe_test.cc [440:88ed40ad0d4f:346:7f26c4b32651] in lemon-1.1

File:

• test/suurballe_test.cc (modified) (9 diffs)

test/suurballe_test.cc

@@ -1 @@
-/* -*- mode: C++; indent-tabs-mode: nil; -*-
+/* -*- C++ -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library.
+ * This file is a part of LEMON, a generic C++ optimization library
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2008
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -18 +18 @@
 
 #include <iostream>
+#include <fstream>
 
 #include <lemon/list_graph.h>
@@ -28 +29 @@
 using namespace lemon;
 
-char test_lgf[] =
-  "@nodes\n"
-  "label supply1 supply2 supply3\n"
-  "1     0        20      27\n"
-  "2     0       -4        0\n"
-  "3     0        0        0\n"
-  "4     0        0        0\n"
-  "5     0        9        0\n"
-  "6     0       -6        0\n"
-  "7     0        0        0\n"
-  "8     0        0        0\n"
-  "9     0        3        0\n"
-  "10    0       -2        0\n"
-  "11    0        0        0\n"
-  "12    0       -20     -27\n"
-  "@arcs\n"
-  "      cost capacity lower1 lower2\n"
-  " 1  2  70  11       0      8\n"
-  " 1  3 150   3       0      1\n"
-  " 1  4  80  15       0      2\n"
-  " 2  8  80  12       0      0\n"
-  " 3  5 140   5       0      3\n"
-  " 4  6  60  10       0      1\n"
-  " 4  7  80   2       0      0\n"
-  " 4  8 110   3       0      0\n"
-  " 5  7  60  14       0      0\n"
-  " 5 11 120  12       0      0\n"
-  " 6  3   0   3       0      0\n"
-  " 6  9 140   4       0      0\n"
-  " 6 10  90   8       0      0\n"
-  " 7  1  30   5       0      0\n"
-  " 8 12  60  16       0      4\n"
-  " 9 12  50   6       0      0\n"
-  "10 12  70  13       0      5\n"
-  "10  2 100   7       0      0\n"
-  "10  7  60  10       0      0\n"
-  "11 10  20  14       0      6\n"
-  "12 11  30  10       0      0\n"
-  "@attributes\n"
-  "source  1\n"
-  "target 12\n"
-  "@end\n";
-
 // Check the feasibility of the flow
 template <typename Digraph, typename FlowMap>
-bool checkFlow( const Digraph& gr, const FlowMap& flow,
+bool checkFlow( const Digraph& gr, const FlowMap& flow, 
                 typename Digraph::Node s, typename Digraph::Node t,
                 int value )
@@ -96 +54 @@
 
 // Check the optimalitiy of the flow
-template < typename Digraph, typename CostMap,
+template < typename Digraph, typename CostMap, 
            typename FlowMap, typename PotentialMap >
 bool checkOptimality( const Digraph& gr, const CostMap& cost,
@@ -139 +97 @@
   Node source, target;
 
-  std::istringstream input(test_lgf);
+  std::string fname;
+  if(getenv("srcdir"))
+    fname = std::string(getenv("srcdir"));
+  else fname = ".";
+  fname += "/test/min_cost_flow_test.lgf";
+
+  std::ifstream input(fname.c_str());
+  check(input, "Input file '" << fname << "' not found");
   DigraphReader<ListDigraph>(digraph, input).
     arcMap("cost", length).
@@ -145 +110 @@
     node("target", target).
     run();
-
+  input.close();
+  
   // Find 2 paths
   {
@@ -153 +119 @@
           "The flow is not feasible");
     check(suurballe.totalLength() == 510, "The flow is not optimal");
-    check(checkOptimality(digraph, length, suurballe.flowMap(),
+    check(checkOptimality(digraph, length, suurballe.flowMap(), 
                           suurballe.potentialMap()),
           "Wrong potentials");
@@ -168 +134 @@
           "The flow is not feasible");
     check(suurballe.totalLength() == 1040, "The flow is not optimal");
-    check(checkOptimality(digraph, length, suurballe.flowMap(),
+    check(checkOptimality(digraph, length, suurballe.flowMap(), 
                           suurballe.potentialMap()),
           "Wrong potentials");
@@ -183 +149 @@
           "The flow is not feasible");
     check(suurballe.totalLength() == 1040, "The flow is not optimal");
-    check(checkOptimality(digraph, length, suurballe.flowMap(),
+    check(checkOptimality(digraph, length, suurballe.flowMap(), 
                           suurballe.potentialMap()),
           "Wrong potentials");