Changeset 2363:2aabce558574 in lemon-0.x for lemon/lp_base.h

Timestamp:

02/15/07 15:22:08 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Changes on the LP interface

_FixId => LpId?

• handling of not common ids soplex

LpGlpk? row and col erase bug fix

• calling lpx_std_basis before simplex

LpSoplex?

• added getter functions
• better m4 file
• integration to the tests
• better handling of unsolved lps

File:

• lemon/lp_base.h (modified) (11 diffs)

lemon/lp_base.h

@@ -28 +28 @@
 #include<cmath>
 
-#include<lemon/bits/utility.h>
 #include<lemon/error.h>
 #include<lemon/bits/invalid.h>
+#include<lemon/bits/utility.h>
+#include<lemon/bits/lp_id.h>
 
 ///\file
@@ -37 +38 @@
 namespace lemon {
 
-
-  ///Internal data structure to convert floating id's to fix one's
-    
-  ///\todo This might be implemented to be also usable in other places.
-  class _FixId 
-  {
-  protected:
-    int _first_index;
-    int first_free;
-  public:
-    std::vector<int> index;
-    std::vector<int> cross;
-    _FixId() : _first_index(-1), first_free(-1) {};
-    ///Convert a floating id to a fix one
-
-    ///\param n is a floating id
-    ///\return the corresponding fix id
-    int fixId(int n) const {return cross[n];}
-    ///Convert a fix id to a floating one
-
-    ///\param n is a fix id
-    ///\return the corresponding floating id
-    int floatingId(int n) const { return index[n];}
-    ///Add a new floating id.
-
-    ///\param n is a floating id
-    ///\return the fix id of the new value
-    ///\todo Multiple additions should also be handled.
-    int insert(int n)
-    {
-      if(cross.empty()) _first_index=n;
-      if(n>=int(cross.size())) {
-        cross.resize(n+1);
-        if(first_free==-1) {
-          cross[n]=index.size();
-          index.push_back(n);
-        }
-        else {
-          cross[n]=first_free;
-          int next=index[first_free];
-          index[first_free]=n;
-          first_free=next;
-        }
-        return cross[n];
-      }
-      else {
-        ///\todo Create an own exception type.
-        throw LogicError(); //floatingId-s must form a continuous range;
-      }
-    }
-    ///Remove a fix id.
-
-    ///\param n is a fix id
-    ///
-    void erase(int n) 
-    {
-      int fl=index[n];
-      index[n]=first_free;
-      first_free=n;
-      for(int i=fl+1;i<int(cross.size());++i) {
-        cross[i-1]=cross[i];
-        index[cross[i]]--;
-      }
-      cross.pop_back();
-    }
-    ///An upper bound on the largest fix id.
-
-    ///\todo Do we need this?
-    ///
-    std::size_t maxFixId() { return cross.size()-1; }
-  
-    ///Returns the first (smallest) inserted index
-
-    ///Returns the first (smallest) inserted index
-    ///or -1 if no index has been inserted before.
-    int firstIndex() {return _first_index;}
-  };
-
   ///Common base class for LP solvers
   
@@ -122 +45 @@
 
   protected:
-    _FixId rows;
-    _FixId cols;
-
+
+    _lp_bits::LpId rows;
+    _lp_bits::LpId cols;
+    
   public:
 
@@ -216 +140 @@
       ColIt(LpSolverBase &lp) : _lp(&lp)
       {
-        id = _lp->cols.cross.empty()?-1:
-          _lp->cols.fixId(_lp->cols.firstIndex());
+        _lp->cols.firstFix(id);
       }
       ColIt(const Invalid&) : Col(INVALID) {}
       ColIt &operator++() 
       {
-        int fid = _lp->cols.floatingId(id)+1;
-        id = unsigned(fid)<_lp->cols.cross.size() ? _lp->cols.fixId(fid) : -1;
+        _lp->cols.nextFix(id);
         return *this;
       }
@@ -747 +669 @@
     virtual void _setColUpperBound(int i, Value value) = 0;
     virtual Value _getColUpperBound(int i) = 0;
-//     virtual void _setRowLowerBound(int i, Value value) = 0;
-//     virtual void _setRowUpperBound(int i, Value value) = 0;
     virtual void _setRowBounds(int i, Value lower, Value upper) = 0;
     virtual void _getRowBounds(int i, Value &lower, Value &upper)=0;
@@ -796 +716 @@
 
     ///Add a new empty column (i.e a new variable) to the LP
-    Col addCol() { Col c; c.id=cols.insert(_addCol()); return c;}
+    Col addCol() { Col c; _addCol(); c.id = cols.addId(); return c;}
 
     ///\brief Adds several new columns
@@ -888 +808 @@
     ///This function adds a new empty row (i.e a new constraint) to the LP.
     ///\return The created row
-    Row addRow() { Row r; r.id=rows.insert(_addRow()); return r;}
+    Row addRow() { Row r; _addRow(); r.id = rows.addId(); return r;}
 
     ///\brief Add several new rows
@@ -966 +886 @@
       _setRowCoeffs(_lpId(r), LpRowIterator(e.begin(), *this),
                     LpRowIterator(e.end(), *this));
-//       _setRowLowerBound(_lpId(r),l-e.constComp());
-//       _setRowUpperBound(_lpId(r),u-e.constComp());
        _setRowBounds(_lpId(r),l-e.constComp(),u-e.constComp());
     }
@@ -1009 +927 @@
     void eraseCol(Col c) {
       _eraseCol(_lpId(c));
-      cols.erase(c.id);
+      cols.eraseId(c.id);
     }
     ///Erase a  row (i.e a constraint) from the LP
@@ -1017 +935 @@
     void eraseRow(Row r) {
       _eraseRow(_lpId(r));
-      rows.erase(r.id);
+      rows.eraseId(r.id);
     }
 
@@ -1217 +1135 @@
 #endif
     
-//     /// Set the lower bound of a row (i.e a constraint)
-
-//     /// The lower bound of a linear expression (row) has to be given by an 
-//     /// extended number of type Value, i.e. a finite number of type 
-//     /// Value or -\ref INF.
-//     void rowLowerBound(Row r, Value value) {
-//       _setRowLowerBound(_lpId(r),value);
-//     };
-//     /// Set the upper bound of a row (i.e a constraint)
-
-//     /// The upper bound of a linear expression (row) has to be given by an 
-//     /// extended number of type Value, i.e. a finite number of type 
-//     /// Value or \ref INF.
-//     void rowUpperBound(Row r, Value value) {
-//       _setRowUpperBound(_lpId(r),value);
-//     };
 
     /// Set the lower and the upper bounds of a row (i.e a constraint)
 
-    /// The lower and the upper bound of
-    /// a constraint (row) have to be given by an 
-    /// extended number of type Value, i.e. a finite number of type 
-    /// Value, -\ref INF or \ref INF. There is no separate function for the 
-    /// lower and the upper bound because that would have been hard to implement 
-    /// for CPLEX.
+    /// The lower and the upper bound of a constraint (row) have to be
+    /// given by an extended number of type Value, i.e. a finite
+    /// number of type Value, -\ref INF or \ref INF. There is no
+    /// separate function for the lower and the upper bound because
+    /// that would have been hard to implement for CPLEX.
     void rowBounds(Row c, Value lower, Value upper) {
       _setRowBounds(_lpId(c),lower, upper);