Changeset 1097:c91e765266d7 in lemon-0.x for src/work/marci/lp

Timestamp:

01/26/05 16:54:06 (19 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

A proposal or test implementation for linear expression`

Location:

src/work/marci/lp

Files:

• expression.h (added)
• expression_test.cc (added)
• lp_solver_wrapper_3.h (modified) (2 diffs)
• makefile (modified) (1 diff)

src/work/marci/lp/lp_solver_wrapper_3.h

@@ -9 +9 @@
 // #include <stdio.h>
 #include <stdlib.h>
+#include <iostream>
+#include <map>
 // #include <stdio>
 //#include <stdlib>
@@ -157 +159 @@
   };
 
+  template <typename _Col, typename _Value>
+  class Expr;
+
+  template <typename _Col, typename _Value>
+  class SmallExpr {
+    template <typename _C, typename _V> 
+    friend class Expr;
+  protected:
+    _Col col;
+    _Value value;
+  public:
+    SmallExpr(_Col _col) : col(_col), value(1) { 
+    }
+    SmallExpr& operator *= (_Value _value) {
+      value*=_value;
+      return *this;
+    }
+    //    template <typename _C, typename _V>
+    //    friend SmallExpr<_C, _V> operator* (_V _value, 
+    //                                  const SmallExpr<_C, _V>& expr);
+    template <typename _C, typename _V>
+    friend std::ostream& operator<<(std::ostream& os, 
+                                    const SmallExpr<_C, _V>& expr);
+  };
+
+  template <typename _Col, typename _Value>
+  SmallExpr<_Col, _Value> 
+  operator* (_Value value, 
+             const SmallExpr<_Col, _Value>& expr) {
+    SmallExpr<_Col, _Value> tmp;
+    tmp=expr;
+    tmp*=value;
+    return tmp;
+  }
+
+  template <typename _Col, typename _Value>
+  std::ostream& operator<<(std::ostream& os, 
+                           const SmallExpr<_Col, _Value>& expr) {
+    os << expr.value << "*" << expr.col;
+    return os;
+  }
+
+  template <typename _Col, typename _Value>
+  class Expr {
+  protected:
+    typedef 
+    typename std::map<_Col, _Value> Data; 
+    Data data;
+  public:
+    Expr() { }
+    Expr(SmallExpr<_Col, _Value> expr) { 
+      data.insert(std::make_pair(expr.col, expr.value));
+    }
+//     Expr(_Col col) { 
+//       data.insert(std::make_pair(col, 1));
+//     }
+    Expr& operator*=(_Value _value) {
+      for (typename Data::iterator i=data.begin(); 
+           i!=data.end(); ++i) {
+        (*i).second *= _value;
+      }
+      return *this;
+    }
+    Expr& operator+=(SmallExpr<_Col, _Value> expr) {
+      typename Data::iterator i=data.find(expr.col);
+      if (i==data.end()) {
+        data.insert(std::make_pair(expr.col, expr.value));
+      } else {
+        (*i).second+=expr.value;
+      }
+      return *this;
+    }
+    //    template <typename _C, typename _V> 
+    //    friend Expr<_C, _V> operator*(_V _value, const Expr<_C, _V>& expr);
+    template <typename _C, typename _V> 
+    friend std::ostream& operator<<(std::ostream& os, 
+                                    const Expr<_C, _V>& expr);
+  };
+
+  template <typename _Col, typename _Value>
+  Expr<_Col, _Value> operator*(_Value _value, 
+                               const Expr<_Col, _Value>& expr) {
+    Expr<_Col, _Value> tmp;
+    tmp=expr;
+    tmp*=_value;
+    return tmp;
+  }
+
+  template <typename _Col, typename _Value>
+  std::ostream& operator<<(std::ostream& os, 
+                           const Expr<_Col, _Value>& expr) {
+    for (typename Expr<_Col, _Value>::Data::const_iterator i=
+           expr.data.begin(); 
+         i!=expr.data.end(); ++i) {
+      os << (*i).second << "*" << (*i).first << " ";
+    }
+    return os;
+  }
+
   /*! \e
    */

src/work/marci/lp/makefile

@@ -6 +6 @@
 LDFLAGS  =  -lglpk#-lcplex -lm -lpthread -lilocplex -L/usr/local/cplex/cplex75/lib/i86_linux2_glibc2.2_gcc3.0/static_mt# -L$(GLPKROOT)/lib
 
-BINARIES = cplex_1 max_flow_by_lp# sample sample2 sample11 sample15
+BINARIES = expression_test max_flow_by_lp# sample sample2 sample11 sample15
 
 #include ../makefile