Ticket #203: faster-addrow-c46afb3f67a6.patch

lemon/lp_base.h

@@ -597 +597 @@
       const Value &upperBound() const { return _ub; }
       ///Is the constraint lower bounded?
       bool lowerBounded() const {
-        return _lb != -INF && !isnan(_lb);
+        return _lb != -INF && !std::isnan(_lb);
       }
       ///Is the constraint upper bounded?
       bool upperBounded() const {
-        return _ub != INF && !isnan(_ub);
+        return _ub != INF && !std::isnan(_ub);
       }
 
     };
@@ -941 +941 @@
     virtual void _setRowName(int row, const std::string& name) = 0;
     virtual int _rowByName(const std::string& name) const = 0;
 
+    virtual int _addRow(ExprIterator b, ExprIterator e){
+      int i=_addRow();_setRowCoeffs(i, b, e); return i;
+    };
     virtual void _setRowCoeffs(int i, ExprIterator b, ExprIterator e) = 0;
     virtual void _getRowCoeffs(int i, InsertIterator b) const = 0;
 
@@ -1067 +1070 @@
     ///a better one.
     void col(Col c, const DualExpr &e) {
       e.simplify();
-      _setColCoeffs(cols(id(c)), ExprIterator(e.comps.begin(), rows),
-                    ExprIterator(e.comps.end(), rows));
+      _setColCoeffs(cols(id(c)), ExprIterator(e.comps.begin(), cols),
+                    ExprIterator(e.comps.end(), cols));
     }
 
     ///Get a column (i.e a dual constraint) of the LP
@@ -1197 +1200 @@
     ///\param u is the upper bound (\ref INF means no bound)
     ///\return The created row.
     Row addRow(Value l,const Expr &e, Value u) {
-      Row r=addRow();
-      row(r,l,e,u);
+      Row r;
+      e.simplify();
+      int id=_addRow(ExprIterator(e.comps.begin(), cols),
+                    ExprIterator(e.comps.end(), cols));
+      _setRowLowerBound(id,l - *e);
+      _setRowUpperBound(id,u - *e);
+      r._id=id;
       return r;
     }
 
@@ -1207 +1215 @@
     ///\param c is a linear expression (see \ref Constr)
     ///\return The created row.
     Row addRow(const Constr &c) {
-      Row r=addRow();
-      row(r,c);
+      Row r=addRow(c.lowerBounded()?c.lowerBound():-INF,
+            c.expr(), c.upperBounded()?c.upperBound():INF);
       return r;
     }
     ///Erase a column (i.e a variable) from the LP
@@ -1666 +1674 @@
   inline LpBase::Constr operator<=(const LpBase::Value &n,
                                    const LpBase::Constr &c) {
     LpBase::Constr tmp(c);
-    LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");
+    LEMON_ASSERT(std::isnan(tmp.lowerBound()), "Wrong LP constraint");
     tmp.lowerBound()=n;
     return tmp;
   }
@@ -1678 +1686 @@
                                    const LpBase::Value &n)
   {
     LpBase::Constr tmp(c);
-    LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");
+    LEMON_ASSERT(std::isnan(tmp.upperBound()), "Wrong LP constraint");
     tmp.upperBound()=n;
     return tmp;
   }
@@ -1690 +1698 @@
   inline LpBase::Constr operator>=(const LpBase::Value &n,
                                    const LpBase::Constr &c) {
     LpBase::Constr tmp(c);
-    LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");
+    LEMON_ASSERT(std::isnan(tmp.upperBound()), "Wrong LP constraint");
     tmp.upperBound()=n;
     return tmp;
   }
@@ -1702 +1710 @@
                                    const LpBase::Value &n)
   {
     LpBase::Constr tmp(c);
-    LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");
+    LEMON_ASSERT(std::isnan(tmp.lowerBound()), "Wrong LP constraint");
     tmp.lowerBound()=n;
     return tmp;
   }

lemon/lp_skeleton.cc

@@ -43 +43 @@
   void SkeletonSolverBase::_setRowName(int, const std::string &) {}
   int SkeletonSolverBase::_rowByName(const std::string&) const { return -1; }
 
+  int SkeletonSolverBase::_addRow(ExprIterator, ExprIterator) { return -1; }
   void SkeletonSolverBase::_setRowCoeffs(int, ExprIterator, ExprIterator) {}
   void SkeletonSolverBase::_getRowCoeffs(int, InsertIterator) const {}
 

lemon/lp_skeleton.h

@@ -57 +57 @@
     /// \e
     virtual int _rowByName(const std::string& name) const;
 
+    /// \e
+    virtual int _addRow(ExprIterator b, ExprIterator e);
     /// \e
     virtual void _setRowCoeffs(int i, ExprIterator b, ExprIterator e);
     /// \e