Changeset 1263:a490938ad0aa in lemon-0.x for src/work/athos/lp/lp_base.h

Timestamp:

03/25/05 17:19:03 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• LpGlpk? added to the makefile
• missing const_cast<>() added
• prop for two new functions (solve() and solution())

File:

• src/work/athos/lp/lp_base.h (modified) (6 diffs)

src/work/athos/lp/lp_base.h

@@ -101 +101 @@
   public:
 
+    ///\e
+    enum SolutionType {
+      ///\e
+      INFEASIBLE = 0,
+      ///\e
+      UNBOUNDED = 1,
+      ///\e
+      OPTIMAL = 2,
+      ///\e
+      FEASIBLE = 3,
+    };
+      
     ///The floating point type used by the solver
     typedef double Value;
@@ -161 +173 @@
     _FixId cols;
 
-    //MATRIX MANIPULATING FUNCTIONS
-
     /// \e
     virtual int _addCol() = 0;
@@ -213 +223 @@
 
     ///\e
+    
+    ///\bug Wrong interface
+    ///
+    virtual SolutionType _solve() = 0;
+
+    ///\e
+
+    ///\bug Wrong interface
+    ///
+    virtual Value _getSolution(int i) = 0;
+    ///\e
 
     ///\bug unimplemented!!!!
@@ -222 +243 @@
     virtual ~LpSolverBase() {}
 
+    ///\name Building up and modification of the LP
+
+    ///@{
+
     ///Add a new empty column (i.e a new variable) to the LP
     Col addCol() { Col c; c.id=cols.insert(_addCol()); return c;}
+
     ///\brief Fill the elements of a container with newly created columns
     ///(i.e a new variables)
@@ -262 +288 @@
     }
 #endif
+
     ///Add a new empty row (i.e a new constaint) to the LP
 
@@ -349 +376 @@
         setObjCoeff((*i).first,(*i).second);
     }
+
+    ///@}
+
+
+    ///\name Solving the LP
+
+    ///@{
+
+    ///\e
+    SolutionType solve() { return _solve(); }
+    
+    ///@}
+    
+    ///\name Obtaining the solution LP
+
+    ///@{
+
+    ///\e
+    Value solution(Col c) { return _getSolution(cols.floatingId(c.id)); }
+
+    ///@}
     
   };