Changeset 1377:bfbb5b30c5b8 in lemon-0.x

Timestamp:

04/20/05 17:06:42 (19 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

_clearObj instead of _setObj.

Location:

src/lemon

Files:

• lp_base.h (modified) (3 diffs)
• lp_glpk.cc (modified) (1 diff)
• lp_glpk.h (modified) (1 diff)

src/lemon/lp_base.h

@@ -435 +435 @@
     virtual void _setRowUpperBound(int i, Value value) = 0;
     virtual void _setObjCoeff(int i, Value obj_coef) = 0;
-    virtual void _setObj(int length,
-                         int  const * indices, 
-                         Value  const * values ) = 0;
+    virtual void _clearObj()=0;
+//     virtual void _setObj(int length,
+//                          int  const * indices, 
+//                          Value  const * values ) = 0;
     virtual SolveExitStatus _solve() = 0;
     virtual Value _getPrimal(int i) = 0;
@@ -450 +451 @@
     Value obj_const_comp;
     
-    ///\e
-    
-    ///\bug Unimplemented
-    void clearObj() {}
+
+
     
   public:
@@ -668 +667 @@
     ///\bug The previous objective function is not cleared!
     void setObj(Expr e) {
-      clearObj();
+      _clearObj();
       for (Expr::iterator i=e.begin(); i!=e.end(); ++i)
         objCoeff((*i).first,(*i).second);

src/lemon/lp_glpk.cc

@@ -268 +268 @@
   }
 
-  void LpGlpk::_setObj(int length,
-                       int  const * indices, 
-                       Value  const * values )
-  {
-    Value new_values[1+lpx_num_cols()];
-    for (i=0;i<=lpx_num_cols();++i){
-      new_values[i]=0;
-    }
-    for (i=1;i<=length;++i){
-      new_values[indices[i]]=values[i];
-    }
+  void LpGlpk::_clearObj()
+  {
+    for (int i=0;i<=lpx_get_num_cols(lp);++i){
+      lpx_set_obj_coef(lp, i, 0);
+    }
+  }
+//   void LpGlpk::_setObj(int length,
+//                     int  const * indices, 
+//                     Value  const * values )
+//   {
+//     Value new_values[1+lpx_num_cols()];
+//     for (i=0;i<=lpx_num_cols();++i){
+//       new_values[i]=0;
+//     }
+//     for (i=1;i<=length;++i){
+//       new_values[indices[i]]=values[i];
+//     }
     
-    for (i=0;i<=lpx_num_cols();++i){
-      lpx_set_obj_coef(lp, i, new_values[i]);
-    }
-  }
+//     for (i=0;i<=lpx_num_cols();++i){
+//       lpx_set_obj_coef(lp, i, new_values[i]);
+//     }
+//   }
 
   LpGlpk::SolveExitStatus LpGlpk::_solve()

src/lemon/lp_glpk.h

@@ -64 +64 @@
     virtual void _setRowUpperBound(int i, Value value);
     virtual void _setObjCoeff(int i, Value obj_coef);
-    virtual void _setObj(int length,
-                         int  const * indices, 
-                         Value  const * values ) = 0;
+    virtual void _clearObj();
+//     virtual void _setObj(int length,
+//                          int  const * indices, 
+//                          Value  const * values ) = 0;
 
     ///\e