COIN-OR::LEMON - Graph Library

Changeset 492:04c0631fd332 in lemon


Ignore:
Timestamp:
01/12/09 14:37:37 (10 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
493:81627fa1b007, 550:c35afa9e89e7
Parents:
490:a1155a9e8e09 (diff), 491:68fe66e2b34a (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:
6 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r484 r492  
    6161        lemon/dim2.h \
    6262        lemon/dimacs.h \
     63        lemon/edge_set.h \
    6364        lemon/elevator.h \
    6465        lemon/error.h \
     
    9899        lemon/bits/bezier.h \
    99100        lemon/bits/default_map.h \
     101        lemon/bits/edge_set_extender.h \
    100102        lemon/bits/enable_if.h \
    101103        lemon/bits/graph_adaptor_extender.h \
  • lemon/Makefile.am

    r491 r492  
    88
    99lemon_libemon_la_SOURCES = \
    10         lemon/arg_parser.cc \
    11         lemon/base.cc \
    12         lemon/color.cc \
    13         lemon/random.cc
     10        lemon/arg_parser.cc \
     11        lemon/base.cc \
     12        lemon/color.cc \
     13        lemon/lp_base.cc \
     14        lemon/lp_skeleton.cc \
     15        lemon/random.cc
    1416
    15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
    16 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
     17
     18lemon_libemon_la_CXXFLAGS = \
     19        $(GLPK_CFLAGS) \
     20        $(CPLEX_CFLAGS) \
     21        $(SOPLEX_CXXFLAGS) \
     22        $(CLP_CXXFLAGS)
     23
     24lemon_libemon_la_LDFLAGS = \
     25        $(GLPK_LIBS) \
     26        $(CPLEX_LIBS) \
     27        $(SOPLEX_LIBS) \
     28        $(CLP_LIBS)
     29
     30if HAVE_GLPK
     31lemon_libemon_la_SOURCES += lemon/glpk.cc
     32endif
     33
     34if HAVE_CPLEX
     35lemon_libemon_la_SOURCES += lemon/cplex.cc
     36endif
     37
     38if HAVE_SOPLEX
     39lemon_libemon_la_SOURCES += lemon/soplex.cc
     40endif
     41
     42if HAVE_CLP
     43lemon_libemon_la_SOURCES += lemon/clp.cc
     44endif
    1745
    1846lemon_HEADERS += \
    1947        lemon/adaptors.h \
    20         lemon/arg_parser.h \
     48        lemon/arg_parser.h \
    2149        lemon/assert.h \
    22         lemon/bfs.h \
    23         lemon/bin_heap.h \
    24         lemon/circulation.h \
    25         lemon/color.h \
     50        lemon/bfs.h \
     51        lemon/bin_heap.h \
     52        lemon/circulation.h \
     53        lemon/clp.h \
     54        lemon/color.h \
    2655        lemon/concept_check.h \
    27         lemon/counter.h \
     56        lemon/counter.h \
    2857        lemon/core.h \
    29         lemon/dfs.h \
    30         lemon/dijkstra.h \
    31         lemon/dim2.h \
    32         lemon/dimacs.h \
     58        lemon/cplex.h \
     59        lemon/dfs.h \
     60        lemon/dijkstra.h \
     61        lemon/dim2.h \
     62        lemon/dimacs.h \
    3363        lemon/edge_set.h \
    3464        lemon/elevator.h \
    3565        lemon/error.h \
    3666        lemon/full_graph.h \
    37         lemon/graph_to_eps.h \
    38         lemon/grid_graph.h \
     67        lemon/glpk.h \
     68        lemon/graph_to_eps.h \
     69        lemon/grid_graph.h \
    3970        lemon/hypercube_graph.h \
    4071        lemon/kruskal.h \
     
    4273        lemon/lgf_reader.h \
    4374        lemon/lgf_writer.h \
     75        lemon/list_graph.h \
     76        lemon/lp.h \
     77        lemon/lp_base.h \
     78        lemon/lp_skeleton.h \
    4479        lemon/list_graph.h \
    4580        lemon/maps.h \
     
    4984        lemon/path.h \
    5085        lemon/preflow.h \
    51         lemon/random.h \
     86        lemon/radix_sort.h \
     87        lemon/random.h \
    5288        lemon/smart_graph.h \
     89        lemon/soplex.h \
    5390        lemon/suurballe.h \
    54         lemon/time_measure.h \
    55         lemon/tolerance.h \
     91        lemon/time_measure.h \
     92        lemon/tolerance.h \
    5693        lemon/unionfind.h
    5794
     
    6097        lemon/bits/array_map.h \
    6198        lemon/bits/base_extender.h \
    62         lemon/bits/bezier.h \
     99        lemon/bits/bezier.h \
    63100        lemon/bits/default_map.h \
    64101        lemon/bits/edge_set_extender.h \
    65         lemon/bits/enable_if.h \
     102        lemon/bits/enable_if.h \
    66103        lemon/bits/graph_adaptor_extender.h \
    67104        lemon/bits/graph_extender.h \
    68105        lemon/bits/map_extender.h \
    69106        lemon/bits/path_dump.h \
     107        lemon/bits/solver_bits.h \
    70108        lemon/bits/traits.h \
    71109        lemon/bits/variant.h \
  • test/CMakeLists.txt

    r490 r492  
    1313  dim_test
    1414  error_test
     15  edge_set_test
    1516  graph_copy_test
    1617  graph_test
  • test/CMakeLists.txt

    r491 r492  
    44
    55SET(TESTS
     6  adaptors_test
    67  bfs_test
     8  circulation_test
    79  counter_test
    810  dfs_test
     
    1820  heap_test
    1921  kruskal_test
     22  lp_test
     23  mip_test
    2024  maps_test
    2125  max_matching_test
     26  radix_sort_test
     27  path_test
     28  preflow_test
    2229  random_test
    23   path_test
     30  suurballe_test
    2431  time_measure_test
    2532  unionfind_test)
  • test/Makefile.am

    r490 r492  
    1515        test/dijkstra_test \
    1616        test/dim_test \
     17        test/edge_set_test \
    1718        test/error_test \
    1819        test/graph_copy_test \
     
    5253test_dijkstra_test_SOURCES = test/dijkstra_test.cc
    5354test_dim_test_SOURCES = test/dim_test.cc
     55test_edge_set_test_SOURCES = test/edge_set_test.cc
    5456test_error_test_SOURCES = test/error_test.cc
    5557test_graph_copy_test_SOURCES = test/graph_copy_test.cc
  • test/Makefile.am

    r491 r492  
    11EXTRA_DIST += \
    2         test/CMakeLists.txt \
    3         test/min_cost_flow_test.lgf \
    4         test/preflow_graph.lgf
     2        test/CMakeLists.txt
    53
    64noinst_HEADERS += \
    75        test/graph_test.h \
    8         test/test_tools.h
     6        test/test_tools.h
    97
    108check_PROGRAMS += \
     9        test/adaptors_test \
    1110        test/bfs_test \
    12         test/circulation_test \
    13         test/counter_test \
     11        test/circulation_test \
     12        test/counter_test \
    1413        test/dfs_test \
    1514        test/digraph_test \
    1615        test/dijkstra_test \
    17         test/dim_test \
     16        test/dim_test \
    1817        test/edge_set_test \
    1918        test/error_test \
    20         test/graph_adaptor_test \
    2119        test/graph_copy_test \
    2220        test/graph_test \
    2321        test/graph_utils_test \
     22        test/hao_orlin_test \
    2423        test/heap_test \
    2524        test/kruskal_test \
    26         test/hao_orlin_test \
    27         test/maps_test \
     25        test/maps_test \
    2826        test/max_matching_test \
    29         test/random_test \
    30         test/path_test \
    31         test/preflow_test \
    32         test/suurballe_test \
    33         test/test_tools_fail \
    34         test/test_tools_pass \
    35         test/time_measure_test \
     27        test/path_test \
     28        test/preflow_test \
     29        test/radix_sort_test \
     30        test/random_test \
     31        test/suurballe_test \
     32        test/test_tools_fail \
     33        test/test_tools_pass \
     34        test/time_measure_test \
    3635        test/unionfind_test
     36
     37if HAVE_LP
     38check_PROGRAMS += test/lp_test
     39endif HAVE_LP
     40if HAVE_MIP
     41check_PROGRAMS += test/mip_test
     42endif HAVE_MIP
    3743
    3844TESTS += $(check_PROGRAMS)
    3945XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
    4046
     47test_adaptors_test_SOURCES = test/adaptors_test.cc
    4148test_bfs_test_SOURCES = test/bfs_test.cc
    4249test_circulation_test_SOURCES = test/circulation_test.cc
     
    4855test_edge_set_test_SOURCES = test/edge_set_test.cc
    4956test_error_test_SOURCES = test/error_test.cc
    50 test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
    5157test_graph_copy_test_SOURCES = test/graph_copy_test.cc
    5258test_graph_test_SOURCES = test/graph_test.cc
     
    5561test_kruskal_test_SOURCES = test/kruskal_test.cc
    5662test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
     63test_lp_test_SOURCES = test/lp_test.cc
    5764test_maps_test_SOURCES = test/maps_test.cc
     65test_mip_test_SOURCES = test/mip_test.cc
    5866test_max_matching_test_SOURCES = test/max_matching_test.cc
    5967test_path_test_SOURCES = test/path_test.cc
    6068test_preflow_test_SOURCES = test/preflow_test.cc
     69test_radix_sort_test_SOURCES = test/radix_sort_test.cc
    6170test_suurballe_test_SOURCES = test/suurballe_test.cc
    6271test_random_test_SOURCES = test/random_test.cc
Note: See TracChangeset for help on using the changeset viewer.