Changeset 1089:2b47dbd6612c in lemon
 Timestamp:
 10/24/11 21:39:34 (11 years ago)
 Branch:
 1.1
 Parents:
 1082:54abdfda0076 (diff), 1087:b96574ff36ec (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
 Files:

 4 edited
Legend:
 Unmodified
 Added
 Removed

lemon/Makefile.am
r1064 r1089 1 1 EXTRA_DIST += \ 2 2 lemon/lemon.pc.in \ 3 lemon/lemon.pc.cmake \ 3 4 lemon/CMakeLists.txt \ 4 5 lemon/config.h.cmake 
lemon/Makefile.am
r1086 r1089 2 2 lemon/lemon.pc.in \ 3 3 lemon/lemon.pc.cmake \ 4 lemon/CMakeLists.txt 4 lemon/CMakeLists.txt \ 5 lemon/config.h.cmake 5 6 6 7 pkgconfig_DATA += lemon/lemon.pc … … 9 10 10 11 lemon_libemon_la_SOURCES = \ 11 lemon/arg_parser.cc \ 12 lemon/base.cc \ 13 lemon/color.cc \ 14 lemon/random.cc \ 12 lemon/arg_parser.cc \ 13 lemon/base.cc \ 14 lemon/color.cc \ 15 lemon/lp_base.cc \ 16 lemon/lp_skeleton.cc \ 17 lemon/random.cc \ 15 18 lemon/bits/windows.cc 16 19 17 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) 18 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) 20 nodist_lemon_HEADERS = lemon/config.h 19 21 20 nodist_lemon_HEADERS = lemon/config.h 22 lemon_libemon_la_CXXFLAGS = \ 23 $(AM_CXXFLAGS) \ 24 $(GLPK_CFLAGS) \ 25 $(CPLEX_CFLAGS) \ 26 $(SOPLEX_CXXFLAGS) \ 27 $(CLP_CXXFLAGS) \ 28 $(CBC_CXXFLAGS) 29 30 lemon_libemon_la_LDFLAGS = \ 31 $(GLPK_LIBS) \ 32 $(CPLEX_LIBS) \ 33 $(SOPLEX_LIBS) \ 34 $(CLP_LIBS) \ 35 $(CBC_LIBS) 36 37 if HAVE_GLPK 38 lemon_libemon_la_SOURCES += lemon/glpk.cc 39 endif 40 41 if HAVE_CPLEX 42 lemon_libemon_la_SOURCES += lemon/cplex.cc 43 endif 44 45 if HAVE_SOPLEX 46 lemon_libemon_la_SOURCES += lemon/soplex.cc 47 endif 48 49 if HAVE_CLP 50 lemon_libemon_la_SOURCES += lemon/clp.cc 51 endif 52 53 if HAVE_CBC 54 lemon_libemon_la_SOURCES += lemon/cbc.cc 55 endif 21 56 22 57 lemon_HEADERS += \ 23 lemon/arg_parser.h \ 58 lemon/adaptors.h \ 59 lemon/arg_parser.h \ 24 60 lemon/assert.h \ 25 lemon/bfs.h \ 26 lemon/bin_heap.h \ 27 lemon/color.h \ 61 lemon/bfs.h \ 62 lemon/bin_heap.h \ 63 lemon/bucket_heap.h \ 64 lemon/cbc.h \ 65 lemon/circulation.h \ 66 lemon/clp.h \ 67 lemon/color.h \ 28 68 lemon/concept_check.h \ 29 lemon/counter.h \ 69 lemon/connectivity.h \ 70 lemon/counter.h \ 30 71 lemon/core.h \ 31 lemon/dfs.h \ 32 lemon/dijkstra.h \ 33 lemon/dim2.h \ 72 lemon/cplex.h \ 73 lemon/dfs.h \ 74 lemon/dijkstra.h \ 75 lemon/dim2.h \ 76 lemon/dimacs.h \ 77 lemon/edge_set.h \ 78 lemon/elevator.h \ 34 79 lemon/error.h \ 35 lemon/graph_to_eps.h \ 80 lemon/euler.h \ 81 lemon/fib_heap.h \ 82 lemon/full_graph.h \ 83 lemon/glpk.h \ 84 lemon/gomory_hu.h \ 85 lemon/graph_to_eps.h \ 86 lemon/grid_graph.h \ 87 lemon/hypercube_graph.h \ 36 88 lemon/kruskal.h \ 89 lemon/hao_orlin.h \ 37 90 lemon/lgf_reader.h \ 38 91 lemon/lgf_writer.h \ 39 92 lemon/list_graph.h \ 93 lemon/lp.h \ 94 lemon/lp_base.h \ 95 lemon/lp_skeleton.h \ 40 96 lemon/maps.h \ 97 lemon/matching.h \ 41 98 lemon/math.h \ 99 lemon/min_cost_arborescence.h \ 100 lemon/nauty_reader.h \ 101 lemon/network_simplex.h \ 42 102 lemon/path.h \ 43 lemon/random.h \ 103 lemon/preflow.h \ 104 lemon/radix_heap.h \ 105 lemon/radix_sort.h \ 106 lemon/random.h \ 44 107 lemon/smart_graph.h \ 45 lemon/time_measure.h \ 46 lemon/tolerance.h \ 108 lemon/soplex.h \ 109 lemon/suurballe.h \ 110 lemon/time_measure.h \ 111 lemon/tolerance.h \ 47 112 lemon/unionfind.h \ 48 113 lemon/bits/windows.h … … 51 116 lemon/bits/alteration_notifier.h \ 52 117 lemon/bits/array_map.h \ 53 lemon/bits/base_extender.h \ 54 lemon/bits/bezier.h \ 118 lemon/bits/bezier.h \ 55 119 lemon/bits/default_map.h \ 56 lemon/bits/enable_if.h \ 120 lemon/bits/edge_set_extender.h \ 121 lemon/bits/enable_if.h \ 122 lemon/bits/graph_adaptor_extender.h \ 57 123 lemon/bits/graph_extender.h \ 58 124 lemon/bits/map_extender.h \ 59 125 lemon/bits/path_dump.h \ 126 lemon/bits/solver_bits.h \ 60 127 lemon/bits/traits.h \ 128 lemon/bits/variant.h \ 61 129 lemon/bits/vector_map.h 62 130 
test/lgf_test.cc
r1078 r1089 118 118 run(); 119 119 } 120 catch (FormatError& error)120 catch (FormatError&) 121 121 { 122 122 ok = true; … … 132 132 run(); 133 133 } 134 catch (FormatError& error)134 catch (FormatError&) 135 135 { 136 136 ok = true; … … 147 147 run(); 148 148 } 149 catch (FormatError& error)149 catch (FormatError&) 150 150 { 151 151 ok = true; … … 161 161 run(); 162 162 } 163 catch (FormatError& error)163 catch (FormatError&) 164 164 { 165 165 ok = true; 
test/lgf_test.cc
r1087 r1089 64 64 65 65 66 int main() 66 int main() 67 67 { 68 68 { 69 ListDigraph d; 69 ListDigraph d; 70 70 ListDigraph::Node s,t; 71 71 ListDigraph::ArcMap<int> label(d); … … 94 94 95 95 { 96 ListDigraph d; 96 ListDigraph d; 97 97 std::istringstream input(test_lgf_nomap); 98 98 digraphReader(d, input). … … 111 111 112 112 { 113 ListDigraph d; 113 ListDigraph d; 114 114 std::istringstream input(test_lgf_bad1); 115 115 bool ok=false; … … 140 140 141 141 { 142 ListDigraph d; 142 ListDigraph d; 143 143 std::istringstream input(test_lgf_bad2); 144 144 bool ok=false;
Note: See TracChangeset
for help on using the changeset viewer.