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

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())

Location:

src/work/athos/lp

Files:

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

src/work/athos/lp/Makefile

@@ -9 +9 @@
 lp_solver_skeleton.o: lp_solver_skeleton.cc lp_solver_skeleton.h lp_base.h \
                 lin_expr.h
+lp_glpk.o: lp_glpk.cc lp_glpk.h lp_base.h \
+                lin_expr.h
 lp_test.o: lp_test.cc lp_base.h lin_expr.h lp_solver_skeleton.h lp_base.h \
                 lin_expr.h
 
-lp_test: lp_test.o lp_base.o lp_solver_skeleton.o 
-        g++ -o $@ $^
+lp_test: lp_test.o lp_base.o lp_solver_skeleton.o lp_glpk.o
+        g++ -o $@ $^ -lglpk

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)); }
+
+    ///@}
     
   };  

src/work/athos/lp/lp_glpk.cc

@@ -42 +42 @@
     void LpGlpk::_setRowCoeffs(int i, 
                                int length,
-                               int   * indices, 
-                               Value   * values )
-    {
-        lpx_set_mat_row(lp, i, length, indices, values);
+                               const int   * indices, 
+                               const Value   * values )
+    {
+      lpx_set_mat_row(lp, i, length,
+                      const_cast<int * >(indices) ,
+                      const_cast<Value * >(values));
     }
   
     void LpGlpk::_setColCoeffs(int i, 
                                int length,
-                               int   * indices, 
-                               Value   * values)
-    {
-        lpx_set_mat_col(lp, i, length, indices, values);
+                               const int   * indices, 
+                               const Value   * values)
+    {
+      lpx_set_mat_col(lp, i, length,
+                      const_cast<int * >(indices),
+                      const_cast<Value * >(values));
     }
   
@@ -234 +238 @@
     }
 
+
+  LpGlpk::SolutionType LpGlpk::_solve()
+  {
+    return OPTIMAL;
+  }
+
+  LpGlpk::Value LpGlpk::_getSolution(int i)
+  {
+    return 0;
+  }
+  
+
+
 } //END OF NAMESPACE LEMON
 

src/work/athos/lp/lp_glpk.h

@@ -56 +56 @@
     virtual void _setRowCoeffs(int i, 
                                int length,
-                               int   * indices, 
-                               Value   * values );
+                               const int   * indices, 
+                               const Value   * values );
     virtual void _setColCoeffs(int i, 
                                int length,
-                               int   * indices, 
-                               Value   * values);
+                               const int   * indices, 
+                               const Value   * values);
     virtual void _setColLowerBound(int i, Value value);
     virtual void _setColUpperBound(int i, Value value);
@@ -67 +67 @@
     virtual void _setRowUpperBound(int i, Value value);
     virtual void _setObjCoeff(int i, Value obj_coef);
+    ///\e
+    
+    ///\bug Unimplemented
+    ///
+    virtual SolutionType _solve();
+    ///\e
+    
+    ///\bug Unimplemented
+    ///
+    virtual Value _getSolution(int i);
 
   };

src/work/athos/lp/lp_solver_skeleton.cc

@@ -65 +65 @@
   {
   }
+
+  LpSolverSkeleton::SolutionType LpSolverSkeleton::_solve()
+  {
+    return OPTIMAL;
+  }
+
+  LpSolverSkeleton::Value LpSolverSkeleton::_getSolution(int i)
+  {
+    return 0;
+  }
   
 } //namespace lemon

src/work/athos/lp/lp_solver_skeleton.h

@@ -44 +44 @@
     virtual void _setRowUpperBound(int i, Value value);
     virtual void _setObjCoeff(int i, Value obj_coef);
+    virtual SolutionType _solve();
+    virtual Value _getSolution(int i);
+
   };  
 

src/work/athos/lp/lp_test.cc

@@ -1 +1 @@
 #include"lp_solver_skeleton.h"
+#include"lp_glpk.h"
 
 using namespace lemon;
 
-int main()
+void lpTest(LpSolverBase & lp)
 {
-  typedef LpSolverSkeleton LP;
-  LP lp;
+  typedef LpSolverBase LP;
 
   std::vector<LP::Col> x;
@@ -38 +38 @@
   lp.addRow(LP::INF,3.0*(x[1]+x[2]*2-5*x[3]+12-x[4]/3)+2*x[4]-4,23);
 }
+
+
+int main() 
+{
+  LpSolverSkeleton lp_skel;
+  LpGlpk lp_glpk;
+
+  lpTest(lp_skel);
+  lpTest(lp_glpk);
+}