Changeset 1312:48f9299b390d in lemon-0.x

Timestamp:

04/07/05 08:31:03 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

max() [_setMax()], min() [_setMin()], primalValue() [_getPrimalValue()] added

Location:

src/lemon

Files:

• lp_base.h (modified) (5 diffs)
• lp_glpk.cc (modified) (2 diffs)
• lp_glpk.h (modified) (1 diff)
• lp_solver_skeleton.cc (modified) (2 diffs)
• lp_solver_skeleton.h (modified) (1 diff)

src/lemon/lp_base.h

@@ -393 +393 @@
     virtual SolveExitStatus _solve() = 0;
     virtual Value _getPrimal(int i) = 0;
-    virtual SolutionStatus _getPrimalType() = 0;
-
+    virtual Value _getPrimalValue() = 0;
+    virtual SolutionStatus _getPrimalStatus() = 0;
+    virtual void _setMax() = 0;
+    virtual void _setMin() = 0;
+    
 
     void clearObj() {}
@@ -428 +431 @@
     ///like
     ///\code
-    ///std::map<AnyType,LpSolverBase::Col>
+    ///std::map<AnyStatus,LpSolverBase::Col>
     ///\endcode
     ///- an iterable lemon \ref concept::WriteMap "write map" like 
@@ -607 +610 @@
     }
 
+    ///Maximize
+    void max() { _setMax(); }
+    ///Minimize
+    void min() { _setMin(); }
+
+    
     ///@}
 
@@ -624 +633 @@
 
     ///\e
-    SolutionStatus primalType() {
-      return _getPrimalType();
+    SolutionStatus primalStatus() {
+      return _getPrimalStatus();
     }
 
@@ -631 +640 @@
     Value primal(Col c) { return _getPrimal(cols.floatingId(c.id)); }
 
+    ///\e
+
+    ///\return
+    ///- \ref INF or -\ref INF means either infeasibility or unboundedness
+    /// of the primal problem, depending on whether we minimize or maximize.
+    ///- \ref NAN if no primal solution is found.
+    ///- The (finite) objective value if an optimal solution is found.
+    Value primalValue() { return _getPrimalValue();}
     ///@}
     

src/lemon/lp_glpk.cc

@@ -256 +256 @@
   }
   
+  LpGlpk::Value LpGlpk::_getPrimalValue()
+  {
+    return 0;
+  }
+  
  
-  LpGlpk::SolutionStatus LpGlpk::_getPrimalType()
+  LpGlpk::SolutionStatus LpGlpk::_getPrimalStatus()
   {
     int stat=  lpx_get_status(lp);
@@ -284 +289 @@
 
 
+  void LpGlpk::_setMax()
+  {
+  }
+  void LpGlpk::_setMin()
+  {
+  }
+
+ 
 } //END OF NAMESPACE LEMON
 

src/lemon/lp_glpk.h

@@ -81 +81 @@
     ///\bug Unimplemented
     ///
-    virtual SolutionStatus _getPrimalType();
+    virtual Value _getPrimalValue();
+    ///\e
+    
+    ///\bug Unimplemented
+    ///
+    virtual SolutionStatus _getPrimalStatus();
 
+    ///\e
+    
+    ///\bug Unimplemented
+    ///
+    virtual void _setMax();
+    ///\e
+    
+    ///\bug Unimplemented
+    ///
+    virtual void _setMin();
+  
   };
 } //END OF NAMESPACE LEMON

src/lemon/lp_solver_skeleton.cc

@@ -66 +66 @@
   }
 
+  void LpSolverSkeleton::_setMax()
+  {
+  }
+  void LpSolverSkeleton::_setMin()
+  {
+  }
+
   LpSolverSkeleton::SolveExitStatus LpSolverSkeleton::_solve()
   {
@@ -76 +83 @@
   }
   
-  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_getPrimalType()
+  LpSolverSkeleton::Value LpSolverSkeleton::_getPrimalValue()
+  {
+    return 0;
+  }
+  
+  LpSolverSkeleton::SolutionStatus LpSolverSkeleton::_getPrimalStatus()
   {
     return OPTIMAL;

src/lemon/lp_solver_skeleton.h

@@ -94 +94 @@
     ///\bug Wrong interface
     ///
-    virtual SolutionStatus _getPrimalType();
+    virtual Value _getPrimalValue();
+    ///\e
+
+    ///\bug Wrong interface
+    ///
+    virtual SolutionStatus _getPrimalStatus();
+
+    ///\e
+    virtual void _setMax();
+    ///\e
+    virtual void _setMin();
+    
 
   public: