Changeset 1295:02a403c305b9 in lemon-0.x for src/work/athos

Timestamp:

04/04/05 10:03:43 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• Modifications to compile with *both* gcc-3.3 and gcc-3.4
• Adjust further SolutionType?

Location:

src/work/athos/lp

Files:

• Makefile (modified) (1 diff)
• lp_base.h (modified) (2 diffs)
• lp_test.cc (modified) (1 diff)

src/work/athos/lp/Makefile

@@ -15 +15 @@
 
 lp_test: lp_test.o lp_base.o lp_solver_skeleton.o lp_glpk.o
-        g++ -o $@ $^ -lglpk
+        $(CXX) -o $@ $^ -lglpk

src/work/athos/lp/lp_base.h

@@ -115 +115 @@
     ///\e
     enum SolutionType {
-      ///\e
+      ///Feasible solution has'n been found (but may exist).
+
+      ///\todo NOTFOUND might be a better name.
+      ///
       UNDEFINED = 0,
-      ///\e
+      ///The problem has no feasible solution
       INFEASIBLE = 1,
-      ///\e
+      ///Feasible solution found
       FEASIBLE = 2,
-      ///\e
-      OPTIMAL = 3
+      ///Optimal solution exists and found
+      OPTIMAL = 3,
+      ///The cost function is unbounded
+
+      ///\todo Give a feasible solution and an infinite ray (and the
+      ///corresponding bases)
+      INFINITE = 4
     };
       
@@ -352 +360 @@
       const Value &upperBound() const { return _ub; }
       ///\e
-      bool lowerBounded() const { return std::isfinite(_lb); }
-      ///\e
-      bool upperBounded() const { return std::isfinite(_ub); }
+      bool lowerBounded() const { 
+        using namespace std;
+        return isfinite(_lb);
+      }
+      ///\e
+      bool upperBounded() const {
+        using namespace std;
+        return isfinite(_ub);
+      }
     };
     

src/work/athos/lp/lp_test.cc

@@ -140 +140 @@
   typedef typename G::InEdgeIt InEdgeIt;
   
-  typename G::EdgeMap<LpGlpk::Col> x(g);
+  typename G::template EdgeMap<LpGlpk::Col> x(g);
   lp.addColSet(x);