Changeset 1583:2b329fd595ef in lemon-0.x for demo/sub_graph_adaptor_demo.cc

Timestamp:

07/22/05 17:15:29 (19 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

Documented some more demo programs.

File:

• demo/sub_graph_adaptor_demo.cc (modified) (4 diffs)

demo/sub_graph_adaptor_demo.cc

@@ -1 @@
-// -*- c++ -*-
+/* -*- C++ -*-
+ * demo/lp_maxflow_demo.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 Computing maximum number of edge-disjoint shortest paths
+///
+/// This program computes a maximum number of edge-disjoint shortest paths
+/// between nodes \c s and \c t.
+
 
 // Use a DIMACS max flow file as input.
 // sub_graph_adaptor_demo < dimacs_max_flow_file
-// This program computes a maximum number of edge-disjoint shortest paths
-// between s and t.
+// Modified to eat lemon graph format! 
+
 
 #include <iostream>
@@ -17 +39 @@
 #include <tight_edge_filter_map.h>
 
+#include <lemon/graph_reader.h>
 
-
-//#include <lemon/graph_reader.h>
-//#include <lemon/graph_writer.h>
 
 using namespace lemon;
@@ -31 +51 @@
   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;
+      std::cerr << "USAGE: sub_graph_adaptor_demo input_file.lgf" << std::endl;
+      std::cerr << "The file 'input_file.lgf' has to contain a max flow "
+                << "instance in \n LEMON format "
+                << "(e.g. sub_gad_input.lgf is such a file)." 
+                << std::endl;
       return 0;
   }
@@ -52 +75 @@
   LengthMap length(g);
 
-  readDimacs(is, g, length, s, t);
+  //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();
+  GraphReader<SmartGraph> 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;