Changeset 294:cbe3ec2d59d2 in lemon-main for demo

Timestamp:

10/01/08 13:56:40 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

295:7c796c1cf1b0, 296:9768e60aa4e1

Parents:

293:47fbc814aa31 (diff), 292:e7af73f1805e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• demo/lgf_demo.cc (modified) (2 diffs)
• demo/lgf_demo.cc (modified) (1 diff)

demo/lgf_demo.cc

@@ -45 +45 @@
 
   try {
-    digraphReader("digraph.lgf", g). // read the directed graph into g
+    digraphReader(g, "digraph.lgf"). // read the directed graph into g
       arcMap("capacity", cap).       // read the 'capacity' arc map into cap
       node("source", s).             // read 'source' node to s
@@ -61 +61 @@
   std::cout << "We can write it to the standard output:" << std::endl;
 
-  digraphWriter(std::cout, g).     // write g to the standard output
+  digraphWriter(g).                // write g to the standard output
     arcMap("capacity", cap).       // write cap into 'capacity'
     node("source", s).             // write s to 'source'

demo/lgf_demo.cc

@@ -50 +50 @@
       node("target", t).             // read 'target' node to t
       run();
-  } catch (DataFormatError& error) { // check if there was any error
+  } catch (Exception& error) { // check if there was any error
     std::cerr << "Error: " << error.what() << std::endl;
     return -1;