Changeset 1610:893dacc1866c in lemon-0.x

Timestamp:

08/01/05 23:16:08 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

A default LP solver is defined in lp.h

Files:

• demo/lp_demo.cc (modified) (2 diffs)
• demo/lp_maxflow_demo.cc (modified) (6 diffs)
• lemon/lp.h (added)
• lemon/lp_base.h (modified) (1 diff)

demo/lp_demo.cc

@@ -25 +25 @@
 /// interface read \ref lemon::LpSolverBase "this".
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lemon/lp.h>
 
 #include <iostream>
 
-
-#ifdef HAVE_GLPK
-#include <lemon/lp_glpk.h>
-#elif HAVE_CPLEX
-#include <lemon/lp_cplex.h>
-#endif
-
 using namespace lemon;
-
-
-
-#ifdef HAVE_GLPK
-typedef LpGlpk LpDefault;
-const char default_solver_name[]="GLPK";
-#elif HAVE_CPLEX
-typedef LpCplex LpDefault;
-const char default_solver_name[]="CPLEX";
-#endif
 
 int main()
@@ -56 +37 @@
 
   //A default solver is taken
-  LpDefault lp;
-  typedef LpDefault::Row Row;
-  typedef LpDefault::Col Col;
+  Lp lp;
+  typedef Lp::Row Row;
+  typedef Lp::Col Col;
   
 

demo/lp_maxflow_demo.cc

@@ -24 +24 @@
 /// constraints that arise in graph theory in our library LEMON .
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include<lemon/graph_reader.h>
 #include<lemon/list_graph.h>
+#include <lemon/lp.h>
 
 #include <fstream>
@@ -35 +32 @@
 
 
-#ifdef HAVE_GLPK
-#include <lemon/lp_glpk.h>
-#elif HAVE_CPLEX
-#include <lemon/lp_cplex.h>
-#endif
 
 using namespace lemon;
-
-#ifdef HAVE_GLPK
-typedef LpGlpk LpDefault;
-const char default_solver_name[]="GLPK";
-#elif HAVE_CPLEX
-typedef LpCplex LpDefault;
-const char default_solver_name[]="CPLEX";
-#endif
-
 
 template<class G,class C>
 double maxFlow(const G &g,const C &cap,typename G::Node s,typename G::Node t)
 {
-  LpDefault lp;
+  Lp lp;
   
   typedef G Graph;
@@ -66 +49 @@
   
   //Define a map on the edges for the variables of the LP problem
-  typename G::template EdgeMap<LpDefault::Col> x(g);
+  typename G::template EdgeMap<Lp::Col> x(g);
   lp.addColSet(x);
   
@@ -78 +61 @@
   //Flow conservation constraints for the nodes (except for 's' and 't')
   for(NodeIt n(g);n!=INVALID;++n) if(n!=s&&n!=t) {
-    LpDefault::Expr ex;
+    Lp::Expr ex;
     for(InEdgeIt  e(g,n);e!=INVALID;++e) ex+=x[e];
     for(OutEdgeIt e(g,n);e!=INVALID;++e) ex-=x[e];
@@ -85 +68 @@
   
   //Objective function: the flow value entering 't'
-  LpDefault::Expr obj;
+  Lp::Expr obj;
   for(InEdgeIt  e(g,t);e!=INVALID;++e) obj+=x[e];
   for(OutEdgeIt e(g,t);e!=INVALID;++e) obj-=x[e];
@@ -94 +77 @@
   lp.max();
 
-#ifdef HAVE_GLPK
+#if DEFAULT_LP==GLPK
   lp.presolver(true);
   lp.messageLevel(3);

lemon/lp_base.h

@@ -26 +26 @@
 #include<lemon/error.h>
 #include<lemon/invalid.h>
-
-//#include"lin_expr.h"
 
 ///\file