Changeset 1577:15098fb5275c in lemon-0.x

Timestamp:

07/20/05 18:05:04 (18 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

Documentation (lp_demo,lp_maxflow) and slight changes (rest).

Location:

demo

Files:

• coloring.cc (modified) (1 diff)
• dim_to_dot.cc (modified) (3 diffs)
• lp_demo.cc (modified) (4 diffs)
• lp_maxflow_demo.cc (modified) (3 diffs)
• sub_gad_input.lgf (added)
• sub_graph_adaptor_demo.cc (modified) (3 diffs)

demo/coloring.cc

@@ -17 +17 @@
   if(argc<2)
   {
-      std::cerr << "USAGE: coloring <input_file.lgf>" << std::endl;
+      std::cerr << "USAGE: coloring input_file.lgf" << std::endl;
       std::cerr << "The file 'input_file.lgf' has to contain a graph in LEMON format together with a nodemap called 'coords' to draw the graph (e.g. sample.lgf is not such a file)." << std::endl;
       return 0;

demo/dim_to_dot.cc

@@ -6 +6 @@
 // This program can be an aid in making up to date visualized documantation 
 // of demo programs.
+
+// For later documentation (if marci does not do it)
+// Az a graphviz csomag egy egyszeru formatuma, ami egy graphrajzolo csomag.
+// Az EdgeSubGraphAdaptor doksijaban szerepel egy kirajzolt graf. Azt nem
+// kezzel csinaltam, hanem a megfelelo dim file-bol ezzel a progival. A
+// doxygen ugyanis ilyet eszik, igy a juzer vizualisan is latja a grafot a
+// doksiban, es sajat maga is le tudja futtatni az algoritmust, mert ott van
+// a kezeben a dim file is. Es mivel ez egy generalt file, ezert ha vmit
+// valtoztatunk a dim-en, ezt is konnyu bemasolni. Uff.
+
 
 #include <iostream>
@@ -18 +28 @@
 using std::endl;
 
-int main()
-{    
+int main(int argc, char *argv[]) 
+{
+  if(argc<2)
+  {
+      std::cerr << "USAGE: sub_graph_adaptor_demo input_file.dim" << std::endl;
+      std::cerr << "The file 'input_file.dim' has to contain a max flow instance in DIMACS format (e.g. sub_graph_adaptor_demo.dim is such a file)." << std::endl;
+      return 0;
+  }
+
+
+  //input stream to read the graph from
+  std::ifstream is(argv[1]);
+
   typedef SmartGraph Graph;
 
@@ -32 +53 @@
   LengthMap length(g);
 
-  readDimacs(std::cin, g, length, s, t);
+  readDimacs(is, g, length, s, t);
 
   cout << "digraph lemon_dot_example {" << endl;

demo/lp_demo.cc

@@ +1 @@
+/* -*- C++ -*-
+ * demo/graph_to_eps.cc - Part of LEMON, a generic C++ optimization library
+ *
+ * Copyright (C) 2005 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
+ * (Egervary Research Group on Combinatorial Optimization, EGRES).
+ *
+ * Permission to use, modify and distribute this software is granted
+ * provided that this copyright notice appears in all copies. For
+ * precise terms see the accompanying LICENSE file.
+ *
+ * This software is provided "AS IS" with no warranty of any kind,
+ * express or implied, and with no claim as to its suitability for any
+ * purpose.
+ *
+ */
+
+/// \ingroup demos
+/// \file
+/// \brief A program demonstrating the LEMON LP solver interface
+///
+/// This program is a simple application of the LEMON LP solver
+/// interface: we formulate a linear programming (LP) problem and then
+/// solve it using the underlying solver (GLPK or CPLEX for
+/// example). For the detailed documentation of the LEMON LP solver
+/// interface read \ref lemon::LpSolverBase "this".
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -14 +40 @@
 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
 
@@ -30 +60 @@
   typedef LpDefault::Col Col;
   
+
+  std::cout<<"A program demonstrating the LEMON LP solver interface"<<std::endl; 
+  std::cout<<"Solver used: "<<default_solver_name<<std::endl;
 
   //This will be a maximization
@@ -55 +88 @@
   //Print results
   if (lp.primalStatus()==LpSolverBase::OPTIMAL){
-    printf("Z = %g; x1 = %g; x2 = %g; x3 = %g\n", 
+    std::cout<<"Optimal solution found!"<<std::endl;
+    printf("optimum value = %g; x1 = %g; x2 = %g; x3 = %g\n", 
            lp.primalValue(), 
            lp.primal(x1), lp.primal(x2), lp.primal(x3));

demo/lp_maxflow_demo.cc

@@ -45 +45 @@
 #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
 
@@ -97 +99 @@
 #endif
 
+  std::cout<<"Solver used: "<<default_solver_name<<std::endl;
+
   //Solve with the underlying solver
   lp.solve();
@@ -107 +111 @@
   if(argc<2)
   {
-      std::cerr << "  USAGE: lp_maxflow_demo <input_file.lgf>" << std::endl;
+      std::cerr << "  USAGE: lp_maxflow_demo input_file.lgf" << std::endl;
       std::cerr << "  The file 'input_file.lgf' has to contain a max "
                 << "flow instance in\n"

demo/sub_graph_adaptor_demo.cc

@@ -17 +17 @@
 #include <tight_edge_filter_map.h>
 
+
+
+//#include <lemon/graph_reader.h>
+//#include <lemon/graph_writer.h>
+
 using namespace lemon;
 
@@ -26 +31 @@
   if(argc<2)
   {
-      std::cerr << "USAGE: sub_graph_adaptor_demo <input_file.dim>" << std::endl;
+      std::cerr << "USAGE: sub_graph_adaptor_demo input_file.dim" << std::endl;
       std::cerr << "The file 'input_file.dim' has to contain a max flow instance in DIMACS format (e.g. sub_graph_adaptor_demo.dim is such a file)." << std::endl;
       return 0;
@@ -48 +53 @@
 
   readDimacs(is, g, length, s, t);
+
+//     GraphWriter<SmartGraph> writer(std::cout, g);
+//     writer.writeEdgeMap("length", length);
+//     writer.writeNode("source",s);
+//     writer.writeNode("target",t);
+//     writer.run();
+
+//   GraphReader<ListGraph> reader(is,g);
+//   reader.readNode("source",s).readNode("target",t)
+//     .readEdgeMap("length",length).run();
 
   cout << "edges with lengths (of form id, source--length->target): " << endl;