Changeset 2321:e23a610bed51 in lemon-0.x

Timestamp:

12/04/06 14:13:14 (17 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Copy constructor for LpGlpk?

Location:

lemon

Files:

• lp_glpk.cc (modified) (3 diffs)
• lp_glpk.h (modified) (2 diffs)

lemon/lp_glpk.cc

@@ -32 +32 @@
   }
   
+  LpGlpk::LpGlpk(const LpGlpk &glp) : Parent(glp), 
+                                      lp(lpx_create_prob()) {
+    ///\todo constrol function for this:
+    lpx_set_int_parm(lp, LPX_K_DUAL, 1);
+    messageLevel(0);
+    //Coefficient matrix, row bounds
+    lpx_add_rows(lp, lpx_get_num_rows(glp.lp));
+    lpx_add_cols(lp, lpx_get_num_cols(glp.lp));
+    int len;
+    int ind[1+lpx_get_num_cols(glp.lp)];
+    Value val[1+lpx_get_num_cols(glp.lp)];
+    for (int i=1;i<=lpx_get_num_rows(glp.lp);++i)
+      {
+        len=lpx_get_mat_row(glp.lp,i,ind,val);
+        lpx_set_mat_row(lp, i,len,ind,val);
+        lpx_set_row_bnds(lp,i,lpx_get_row_type(glp.lp,i),
+                         lpx_get_row_lb(glp.lp,i),lpx_get_row_ub(glp.lp,i));
+      }
+
+    //Objective function, coloumn bounds
+    lpx_set_obj_dir(lp, lpx_get_obj_dir(glp.lp));
+    //Objectif function's constant term treated separately
+    lpx_set_obj_coef(lp,0,lpx_get_obj_coef(glp.lp,0));
+    for (int i=1;i<=lpx_get_num_cols(glp.lp);++i)
+      {
+        lpx_set_obj_coef(lp,i,lpx_get_obj_coef(glp.lp,i));
+        lpx_set_col_bnds(lp,i,lpx_get_col_type(glp.lp,i),
+                         lpx_get_col_lb(glp.lp,i),lpx_get_col_ub(glp.lp,i));
+      }
+  }
+  
   LpGlpk::~LpGlpk() {
     lpx_delete_prob(lp);
@@ -48 +79 @@
   LpSolverBase &LpGlpk::_newLp()
   {
-    LpGlpk* newlp=new LpGlpk();
+    LpGlpk* newlp=new LpGlpk;
     return *newlp;
   }
@@ -56 +87 @@
   LpSolverBase &LpGlpk::_copyLp()
   {
-    LpGlpk* newlp=new LpGlpk();
-
-    //Coefficient matrix, row bounds
-    lpx_add_rows(newlp->lp, lpx_get_num_rows(lp));
-    lpx_add_cols(newlp->lp, lpx_get_num_cols(lp));
-    int len;
-    int ind[1+lpx_get_num_cols(lp)];
-    Value val[1+lpx_get_num_cols(lp)];
-    for (int i=1;i<=lpx_get_num_rows(lp);++i){
-      len=lpx_get_mat_row(lp,i,ind,val);
-      lpx_set_mat_row(newlp->lp, i,len,ind,val);
-      lpx_set_row_bnds(newlp->lp,i,lpx_get_row_type(lp,i),
-                       lpx_get_row_lb(lp,i),lpx_get_row_ub(lp,i));
-    }
-
-    //Objective function, coloumn bounds
-    lpx_set_obj_dir(newlp->lp, lpx_get_obj_dir(lp));
-    //Objectif function's constant term treated separately
-    lpx_set_obj_coef(newlp->lp,0,lpx_get_obj_coef(lp,0));
-    for (int i=1;i<=lpx_get_num_cols(lp);++i){
-      lpx_set_obj_coef(newlp->lp,i,lpx_get_obj_coef(lp,i));
-      lpx_set_col_bnds(newlp->lp,i,lpx_get_col_type(lp,i),
-                       lpx_get_col_lb(lp,i),lpx_get_col_ub(lp,i));
-      
-      
-    }
-
+    LpGlpk* newlp=new LpGlpk(*this);
     return *newlp;
   }

lemon/lp_glpk.h

@@ -45 +45 @@
     
     LpGlpk();
+    LpGlpk(const LpGlpk &);
     ~LpGlpk();
     
@@ -109 +110 @@
     ///The presolver is off by default.
     void presolver(bool b);
-    
+
+    LPX *lpx() {return lp;}
   };
 } //END OF NAMESPACE LEMON