Changeset 1048:38a49245a701 in lemon-0.x for src/work/marci

Timestamp:

01/04/05 18:54:41 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

minor changes for various number types

File:

• src/work/marci/lp/lp_solver_wrapper_2.h (modified) (10 diffs)

src/work/marci/lp/lp_solver_wrapper_2.h

@@ -160 +160 @@
   /*! \e
    */
+  template <typename _Value>
   class LPSolverBase {
   public:
+    /// \e
+    typedef _Value Value;
     /// \e
     typedef IterablePartition<int>::ClassIt RowIt;
@@ -192 +195 @@
     /// temporally, glpk style indexing
     virtual void setRowCoeffs(RowIt row_it, int num, 
-                              int* indices, double* doubles) = 0;
-    //pair<RowIt, double>-bol kell megadni egy std range-et
+                              int* indices, _Value* doubles) = 0;
+    //pair<RowIt, _Value>-bol kell megadni egy std range-et
     /// \e
     template <typename Begin, typename End>
@@ -199 +202 @@
       int mem_length=1+colNum();
       int* indices = new int[mem_length];
-      double* doubles = new double[mem_length];
+      _Value* doubles = new _Value[mem_length];
       int length=0;
       for ( ; begin!=end; ++begin) {
@@ -212 +215 @@
     /// temporally, glpk style indexing
     virtual void setColCoeffs(ColIt col_it, int num, 
-                              int* indices, double* doubles) = 0;
-    //pair<ColIt, double>-bol kell megadni egy std range-et
+                              int* indices, _Value* doubles) = 0;
+    //pair<ColIt, _Value>-bol kell megadni egy std range-et
     /// \e
     template <typename Begin, typename End>
@@ -219 +222 @@
       int mem_length=1+rowNum();
       int* indices = new int[mem_length];
-      double* doubles = new double[mem_length];
+      _Value* doubles = new _Value[mem_length];
       int length=0;
       for ( ; begin!=end; ++begin) {
@@ -236 +239 @@
     /// \e
     virtual void setColBounds(const ColIt& col_it, int bound_type, 
-                              double lo, double up) =0; 
-    /// \e
-    virtual double getObjCoef(const ColIt& col_it) = 0;
+                              _Value lo, _Value up) =0; 
+    /// \e
+    virtual _Value getObjCoef(const ColIt& col_it) = 0;
     /// \e
     virtual void setRowBounds(const RowIt& row_it, int bound_type, 
-                              double lo, double up) = 0;
-    /// \e
-    virtual void setObjCoef(const ColIt& col_it, double obj_coef) = 0;
+                              _Value lo, _Value up) = 0;
+    /// \e
+    virtual void setObjCoef(const ColIt& col_it, _Value obj_coef) = 0;
     /// \e
     virtual void solveSimplex() = 0;
@@ -251 +254 @@
     virtual void solveDualSimplex() = 0;
     /// \e
-    virtual double getPrimal(const ColIt& col_it) = 0;
-    /// \e
-    virtual double getObjVal() = 0;
+    virtual _Value getPrimal(const ColIt& col_it) = 0;
+    /// \e
+    virtual _Value getObjVal() = 0;
     /// \e
     virtual int rowNum() const = 0;
@@ -280 +283 @@
   };
   
+
   /// \brief Wrappers for LP solvers
   /// 
@@ -287 +291 @@
   /// solvers, i.e. it makes possible to write algorithms using LP's, 
   /// in which the solver can be changed to an other one easily.
-  class LPSolverWrapper : public LPSolverBase {
-  public:
-    typedef LPSolverBase Parent;
+  class LPSolverWrapper : public LPSolverBase<double> {
+  public:
+    typedef LPSolverBase<double> Parent;
 
     //   class Row {
@@ -324 +328 @@
   public:
     /// \e
-    LPSolverWrapper() : LPSolverBase(), 
+    LPSolverWrapper() : Parent(), 
                         lp(lpx_create_prob()) {
       lpx_set_int_parm(lp, LPX_K_DUAL, 1);