[Lemon-commits] [lemon_svn] athos: r1906 - hugo/trunk/src/lemon

[Lemon SVN]

Author: athos
Date: Fri May 20 11:43:40 2005
New Revision: 1906

Modified:
   hugo/trunk/src/lemon/lp_cplex.cc
   hugo/trunk/src/lemon/lp_cplex.h
   hugo/trunk/src/lemon/lp_glpk.cc
   hugo/trunk/src/lemon/lp_glpk.h
   hugo/trunk/src/lemon/lp_skeleton.cc
   hugo/trunk/src/lemon/lp_skeleton.h

Log:
Functions _eraseRow(), _eraseCol(). Not yet implemented for cplex.

Modified: hugo/trunk/src/lemon/lp_cplex.cc
==============================================================================
--- hugo/trunk/src/lemon/lp_cplex.cc	(original)
+++ hugo/trunk/src/lemon/lp_cplex.cc	Fri May 20 11:43:40 2005
@@ -95,6 +95,16 @@
     status = CPXnewrows (env, lp, 1, rhs, sense, NULL, NULL);
     return i;
   }
+
+
+  void LpCplex::_eraseCol(int i) {
+    ///\todo Not implemented yet
+  }
+  
+  void LpCplex::_eraseRow(int i) {
+    ///\todo Not implemented yet
+  }
+
   
   ///\warning Data at index 0 is ignored in the arrays.
   void LpCplex::_setRowCoeffs(int i, 

Modified: hugo/trunk/src/lemon/lp_cplex.h
==============================================================================
--- hugo/trunk/src/lemon/lp_cplex.h	(original)
+++ hugo/trunk/src/lemon/lp_cplex.h	Fri May 20 11:43:40 2005
@@ -55,6 +55,8 @@
 
     virtual int _addCol();
     virtual int _addRow();
+    virtual void _eraseCol(int i);
+    virtual void _eraseRow(int i);
     virtual void _setRowCoeffs(int i, 
 			       int length,
                                const int   * indices, 

Modified: hugo/trunk/src/lemon/lp_glpk.cc
==============================================================================
--- hugo/trunk/src/lemon/lp_glpk.cc	(original)
+++ hugo/trunk/src/lemon/lp_glpk.cc	Fri May 20 11:43:40 2005
@@ -68,6 +68,18 @@
   }
 
   
+  void LpGlpk::_eraseCol(int i) {
+    int cols[2];
+    cols[1]=i;
+    lpx_del_cols(lp, 1, cols);
+  }
+  
+  void LpGlpk::_eraseRow(int i) {
+    int rows[2];
+    rows[1]=i;
+    lpx_del_rows(lp, 1, rows);
+  }
+
   void LpGlpk::_setRowCoeffs(int i, 
 			     int length,
 			     const int   * indices, 

Modified: hugo/trunk/src/lemon/lp_glpk.h
==============================================================================
--- hugo/trunk/src/lemon/lp_glpk.h	(original)
+++ hugo/trunk/src/lemon/lp_glpk.h	Fri May 20 11:43:40 2005
@@ -50,6 +50,9 @@
 
     virtual int _addCol();
     virtual int _addRow();
+    virtual void _eraseCol(int i);
+    virtual void _eraseRow(int i);
+
     virtual void _setRowCoeffs(int i, 
 			       int length,
                                const int   * indices, 

Modified: hugo/trunk/src/lemon/lp_skeleton.cc
==============================================================================
--- hugo/trunk/src/lemon/lp_skeleton.cc	(original)
+++ hugo/trunk/src/lemon/lp_skeleton.cc	Fri May 20 11:43:40 2005
@@ -43,6 +43,12 @@
     return ++row_num;
   }
   
+  void LpSkeleton::_eraseCol(int ) {
+  }
+  
+  void LpSkeleton::_eraseRow(int) {
+  }
+
   void LpSkeleton::_setRowCoeffs(int, 
 				 int,
 				 int  const *, 

Modified: hugo/trunk/src/lemon/lp_skeleton.h
==============================================================================
--- hugo/trunk/src/lemon/lp_skeleton.h	(original)
+++ hugo/trunk/src/lemon/lp_skeleton.h	Fri May 20 11:43:40 2005
@@ -38,6 +38,10 @@
     /// \e
     virtual int _addRow();
     /// \e
+    virtual void _eraseCol(int i);
+    /// \e
+    virtual void _eraseRow(int i);
+    /// \e
 
     /// \warning Arrays are indexed from 1 (datum at index 0 is ignored)
     ///