Changeset 1264:92ba3e62825d in lemon-0.x for src/work/athos/lp/lp_base.h

Timestamp:

03/25/05 19:56:07 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Constraints (expressions containing <= or >=) can be passed to addRow()
and setRow()

File:

• src/work/athos/lp/lp_base.h (modified) (4 diffs)

src/work/athos/lp/lp_base.h

@@ -117 +117 @@
     ///The infinity constant
     static const Value INF;
+    ///The not a number constant
+    static const Value NaN;
     
     ///Refer to a column of the LP.
@@ -168 +170 @@
     ///Linear expression
     typedef SparseLinExpr<Col> Expr;
+    ///Linear constraint
+    typedef LinConstr<Expr> Constr;
 
   protected:
@@ -319 +323 @@
     }
 
+    ///Set a row (i.e a constaint) of the LP
+
+    ///\param r is the row to be modified
+    ///\param c is a linear expression (see \ref Constr)
+    ///\bug This is a temportary function. The interface will change to
+    ///a better one.
+    void setRow(Row r, const Constr &c) {
+      Value lb= c.lb==NaN?-INF:lb;
+      Value ub= c.ub==NaN?INF:lb;
+      setRow(r,lb,c.expr,ub);
+    }
+
     ///Add a new row (i.e a new constaint) to the LP
 
@@ -333 +349 @@
     }
 
+    ///Add a new row (i.e a new constaint) to the LP
+
+    ///\param c is a linear expression (see \ref Constr)
+    ///\return The created row.
+    ///\bug This is a temportary function. The interface will change to
+    ///a better one.
+    Row addRow(const Constr &c) {
+      Row r=addRow();
+      setRow(r,c);
+      return r;
+    }
+
     /// Set the lower bound of a column (i.e a variable)