Changeset 2369:6ae1a97055a2 in lemon-0.x

Timestamp:

02/19/07 19:21:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Naming convention changes

setObj => obj
is_min => isMin
is_max => isMax

Files:

• demo/lp_demo.cc (modified) (1 diff)
• demo/lp_maxflow_demo.cc (modified) (1 diff)
• demo/mip_demo.cc (modified) (1 diff)
• lemon/lp_base.h (modified) (4 diffs)
• lemon/lp_utils.h (modified) (2 diffs)
• test/lp_test.cc (modified) (2 diffs)
• test/mip_test.cc (modified) (1 diff)

demo/lp_demo.cc

@@ -66 +66 @@
   lp.colLowerBound(x3, 0);
   //Objective function
-  lp.setObj(10*x1+6*x2+4*x3);
+  lp.obj(10*x1+6*x2+4*x3);
   
   //Call the routine of the underlying LP solver

demo/lp_maxflow_demo.cc

@@ -75 +75 @@
   for(InEdgeIt  e(g,t);e!=INVALID;++e) obj+=x[e];
   for(OutEdgeIt e(g,t);e!=INVALID;++e) obj-=x[e];
-  lp.setObj(obj);
+  lp.obj(obj);
 
 

demo/mip_demo.cc

@@ -32 +32 @@
   ilp.colLowerBound(x3, 0);
   //Objective function
-  ilp.setObj(10*x1+6*x2+4*x3);
+  ilp.obj(10*x1+6*x2+4*x3);
   
   //Call the routine of the underlying LP solver

lemon/lp_base.h

@@ -973 +973 @@
     ///\param e is a linear expression (see \ref Expr)
     ///\param u is the upper bound (\ref INF means no bound)
-    ///\bug This is a temportary function. The interface will change to
+    ///\bug This is a temporary function. The interface will change to
     ///a better one.
     ///\todo Option to control whether a constraint with a single variable is
@@ -1010 +1010 @@
     ///\param u is the upper bound (\ref INF means no bound)
     ///\return The created row.
-    ///\bug This is a temportary function. The interface will change to
+    ///\bug This is a temporary function. The interface will change to
     ///a better one.
     Row addRow(Value l,const Expr &e, Value u) {
@@ -1285 +1285 @@
 
     ///\param e is a linear expression of type \ref Expr.
-    ///\bug Is should be called obj()
-    void setObj(Expr e) {
+    void obj(Expr e) {
       _clearObj();
       for (Expr::iterator i=e.begin(); i!=e.end(); ++i)
@@ -1314 +1313 @@
 
     ///Query function: is this a maximization problem?
-    bool is_max() const {return _isMax(); }
+    bool isMax() const {return _isMax(); }
 
     ///Query function: is this a minimization problem?
-    bool is_min() const {return !is_max(); }
+    bool isMin() const {return !isMax(); }
     
     ///@}

lemon/lp_utils.h

@@ -433 +433 @@
       is >> std::ws;
       readExpression(is, expr);
-      lp.setObj(expr);
+      lp.obj(expr);
       if (sense == "min") {
         lp.min();
@@ -944 +944 @@
       os << "objective" << std::endl;
       os << "   ";
-      if (lp.is_min()) {
+      if (lp.isMin()) {
         os << "min ";
       } else {

test/lp_test.cc

@@ -292 +292 @@
   lp.colLowerBound(x2, 0);
   //Objective function
-  lp.setObj(x1+x2);
+  lp.obj(x1+x2);
 
   lp.max();
@@ -299 +299 @@
   //Testing the problem retrieving routines
   check(lp.objCoeff(x1)==1,"First term should be 1 in the obj function!");
-  check(lp.is_max(),"This is a maximization!");
+  check(lp.isMax(),"This is a maximization!");
   check(lp.coeff(upright,x1)==1,"The coefficient in question is 1!");
   //  std::cout<<lp.colLowerBound(x1)<<std::endl;

test/mip_test.cc

@@ -53 +53 @@
 
   //Objective function
-  mip.setObj(x1);
+  mip.obj(x1);
 
   mip.max();