Changeset 128:7cd965d2257f in lemon-main

Timestamp:

04/03/08 12:10:49 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Port graph_to_eps() and Color from svn -r3482.

Files:

• .hgignore (modified) (1 diff)
• demo/Makefile.am (modified) (2 diffs)
• demo/arg_parser_demo.cc (modified) (2 diffs)
• demo/graph_to_eps_demo.cc (added)
• lemon/Makefile.am (modified) (3 diffs)
• lemon/arg_parser.cc (modified) (1 diff)
• lemon/bits/bezier.h (added)
• lemon/color.cc (added)
• lemon/color.h (added)
• lemon/graph_to_eps.h (added)

.hgignore

@@ -25 +25 @@
 .libs/*
 .deps/*
+demo/*.eps
 
 syntax: regexp

demo/Makefile.am

@@ -5 +5 @@
 
 noinst_PROGRAMS += \
-        demo/arg_parser_demo
+        demo/arg_parser_demo \
+        demo/graph_to_eps_demo
 
 endif WANT_DEMO
@@ -11 +12 @@
 demo_arg_parser_demo_SOURCES = demo/arg_parser_demo.cc
 
+demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
+

demo/arg_parser_demo.cc

@@ -38 +38 @@
   ap.refOption("n", "An integer input.", i, true)
     .refOption("val", "A double input.", d)
+    .doubleOption("val2", "A double input.", d)
     .synonym("vals","val")
     .refOption("name", "A string input.", s)
@@ -46 +47 @@
     .refOption("grc","Choice C",g3)
     .optionGroup("gr","gra")
-    .optionGroup("gr","grb")
+    .optionGroup("gr","grbkk")
     .optionGroup("gr","grc")
     .mandatoryGroup("gr")

lemon/Makefile.am

@@ -10 +10 @@
         lemon/arg_parser.cc \
         lemon/base.cc \
+        lemon/color.cc \
         lemon/random.cc
 
@@ -21 +22 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
+        lemon/color.h \
         lemon/dfs.h \
         lemon/dijkstra.h \
         lemon/dim2.h \
         lemon/error.h \
+        lemon/graph_to_eps.h \
         lemon/graph_utils.h \
         lemon/kruskal.h \
@@ -40 +43 @@
         lemon/bits/array_map.h \
         lemon/bits/base_extender.h \
+        lemon/bits/bezier.h \
         lemon/bits/default_map.h \
         lemon/bits/graph_extender.h \

lemon/arg_parser.cc

@@ -195 +195 @@
     Opts::iterator i = _opts.find(opt);
     LEMON_ASSERT(i!=_opts.end(), "Unknown option: '"+opt+"'");
+    if(i==_opts.end()) std::cout << "JAJJJJJJJJ\n";
     LEMON_ASSERT(!(i->second.ingroup), 
                  "Option already in option group: '"+opt+"'");