Changeset 2303:005b3f927287 in lemon-0.x

Timestamp:

11/14/06 10:49:26 (17 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

ColIt? added. (Untested, but at least it compiles.)

File:

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

lemon/lp_base.h

@@ -40 +40 @@
   {
   protected:
+    int _first_index;
+    int first_free;
+  public:
     std::vector<int> index;
     std::vector<int> cross;
-    int first_free;
-  public:
-    _FixId() : first_free(-1) {};
+    _FixId() : _first_index(-1), first_free(-1) {};
     ///Convert a floating id to a fix one
 
@@ -62 +63 @@
     int insert(int n)
     {
+      if(cross.empty()) _first_index=n;
       if(n>=int(cross.size())) {
         cross.resize(n+1);
@@ -102 +104 @@
     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;}
   };
     
@@ -109 +116 @@
   ///\ingroup gen_opt_group
   class LpSolverBase {
+
+  protected:
+    _FixId rows;
+    _FixId cols;
 
   public:
@@ -164 +175 @@
 
     static inline bool isNaN(const Value& v) { return v!=v; }
+    
+    friend class Col;
+    friend class ColIt;
+    friend class Row;
     
     ///Refer to a column of the LP.
@@ -190 +205 @@
     };
 
+    class ColIt : public Col {
+      LpSolverBase *_lp;
+      ColIt() {}
+      ColIt(LpSolverBase &lp) : _lp(&lp)
+      {
+        id = _lp->cols.cross.empty()?-1:
+          _lp->cols.fixId(_lp->cols.firstIndex());
+      }
+      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;
+        return *this;
+      }
+    };
+      
     ///Refer to a row of the LP.
 
@@ -565 +597 @@
 
   protected:
-    _FixId rows;
-    _FixId cols;
 
     //Abstract virtual functions
@@ -580 +610 @@
 
     virtual int _addCol() = 0;
-    virtual int _addRow() = 0;
+    virtual int _addRow() = 0; 
     virtual void _eraseCol(int col) = 0;
     virtual void _eraseRow(int row) = 0;