COIN-OR::LEMON - Graph Library

Changeset 575:88bd39ef7d98 in lemon


Ignore:
Timestamp:
02/23/09 13:26:21 (9 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
574:c458e02723b1 (diff), 522:7f8560cb9d65 (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.
Message:

Merge

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r522 r575  
    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 \ 
     16        lemon/bits/windows.cc 
    1417 
    15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS) 
    16 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) 
     18 
     19lemon_libemon_la_CXXFLAGS = \ 
     20        $(GLPK_CFLAGS) \ 
     21        $(CPLEX_CFLAGS) \ 
     22        $(SOPLEX_CXXFLAGS) \ 
     23        $(CLP_CXXFLAGS) 
     24 
     25lemon_libemon_la_LDFLAGS = \ 
     26        $(GLPK_LIBS) \ 
     27        $(CPLEX_LIBS) \ 
     28        $(SOPLEX_LIBS) \ 
     29        $(CLP_LIBS) 
     30 
     31if HAVE_GLPK 
     32lemon_libemon_la_SOURCES += lemon/glpk.cc 
     33endif 
     34 
     35if HAVE_CPLEX 
     36lemon_libemon_la_SOURCES += lemon/cplex.cc 
     37endif 
     38 
     39if HAVE_SOPLEX 
     40lemon_libemon_la_SOURCES += lemon/soplex.cc 
     41endif 
     42 
     43if HAVE_CLP 
     44lemon_libemon_la_SOURCES += lemon/clp.cc 
     45endif 
    1746 
    1847lemon_HEADERS += \ 
    1948        lemon/adaptors.h \ 
    20         lemon/arg_parser.h \ 
     49        lemon/arg_parser.h \ 
    2150        lemon/assert.h \ 
    22         lemon/bfs.h \ 
    23         lemon/bin_heap.h \ 
    24         lemon/circulation.h \ 
    25         lemon/color.h \ 
     51        lemon/bfs.h \ 
     52        lemon/bin_heap.h \ 
     53        lemon/circulation.h \ 
     54        lemon/clp.h \ 
     55        lemon/color.h \ 
    2656        lemon/concept_check.h \ 
    27         lemon/counter.h \ 
     57        lemon/connectivity.h \ 
     58        lemon/counter.h \ 
    2859        lemon/core.h \ 
    29         lemon/dfs.h \ 
    30         lemon/dijkstra.h \ 
    31         lemon/dim2.h \ 
    32         lemon/dimacs.h \ 
     60        lemon/cplex.h \ 
     61        lemon/dfs.h \ 
     62        lemon/dijkstra.h \ 
     63        lemon/dim2.h \ 
     64        lemon/dimacs.h \ 
     65        lemon/edge_set.h \ 
    3366        lemon/elevator.h \ 
    3467        lemon/error.h \ 
     68        lemon/euler.h \ 
    3569        lemon/full_graph.h \ 
    36         lemon/graph_to_eps.h \ 
    37         lemon/grid_graph.h \ 
     70        lemon/glpk.h \ 
     71        lemon/graph_to_eps.h \ 
     72        lemon/grid_graph.h \ 
    3873        lemon/hypercube_graph.h \ 
    3974        lemon/kruskal.h \ 
     
    4176        lemon/lgf_reader.h \ 
    4277        lemon/lgf_writer.h \ 
     78        lemon/list_graph.h \ 
     79        lemon/lp.h \ 
     80        lemon/lp_base.h \ 
     81        lemon/lp_skeleton.h \ 
    4382        lemon/list_graph.h \ 
    4483        lemon/maps.h \ 
     
    4988        lemon/path.h \ 
    5089        lemon/preflow.h \ 
    51         lemon/random.h \ 
     90        lemon/radix_sort.h \ 
     91        lemon/random.h \ 
    5292        lemon/smart_graph.h \ 
     93        lemon/soplex.h \ 
    5394        lemon/suurballe.h \ 
    54         lemon/time_measure.h \ 
    55         lemon/tolerance.h \ 
    56         lemon/unionfind.h 
     95        lemon/time_measure.h \ 
     96        lemon/tolerance.h \ 
     97        lemon/unionfind.h \ 
     98        lemon/bits/windows.h 
    5799 
    58100bits_HEADERS += \ 
     
    60102        lemon/bits/array_map.h \ 
    61103        lemon/bits/base_extender.h \ 
    62         lemon/bits/bezier.h \ 
     104        lemon/bits/bezier.h \ 
    63105        lemon/bits/default_map.h \ 
    64         lemon/bits/enable_if.h \ 
     106        lemon/bits/edge_set_extender.h \ 
     107        lemon/bits/enable_if.h \ 
    65108        lemon/bits/graph_adaptor_extender.h \ 
    66109        lemon/bits/graph_extender.h \ 
    67110        lemon/bits/map_extender.h \ 
    68111        lemon/bits/path_dump.h \ 
     112        lemon/bits/solver_bits.h \ 
    69113        lemon/bits/traits.h \ 
    70114        lemon/bits/variant.h \ 
  • lemon/Makefile.am

    r569 r575  
    8484        lemon/math.h \ 
    8585        lemon/max_matching.h \ 
     86        lemon/min_cost_arborescence.h \ 
    8687        lemon/nauty_reader.h \ 
    8788        lemon/path.h \ 
  • test/CMakeLists.txt

    r522 r575  
    1 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) 
     1INCLUDE_DIRECTORIES( 
     2  ${CMAKE_SOURCE_DIR} 
     3  ${CMAKE_BINARY_DIR} 
     4) 
     5 
     6IF(HAVE_GLPK) 
     7  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR}) 
     8ENDIF(HAVE_GLPK) 
    29 
    310LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon) 
    411 
    512SET(TESTS 
     13  adaptors_test 
    614  bfs_test 
     15  circulation_test 
    716  counter_test 
    817  dfs_test 
     
    1019  dijkstra_test 
    1120  dim_test 
     21  edge_set_test 
    1222  error_test 
     23  euler_test 
    1324  graph_copy_test 
    1425  graph_test 
     
    2031  max_matching_test 
    2132  min_cost_arborescence_test 
     33  path_test 
     34  preflow_test 
     35  radix_sort_test 
    2236  random_test 
    23   path_test 
     37  suurballe_test 
    2438  time_measure_test 
    2539  unionfind_test) 
     40 
     41IF(HAVE_LP) 
     42  ADD_EXECUTABLE(lp_test lp_test.cc) 
     43  IF(HAVE_GLPK) 
     44    TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES}) 
     45  ENDIF(HAVE_GLPK) 
     46  ADD_TEST(lp_test lp_test) 
     47 
     48  IF(WIN32 AND HAVE_GLPK) 
     49    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) 
     50    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 
     51    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD 
     52      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH} 
     53      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH} 
     54      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} 
     55    ) 
     56  ENDIF(WIN32 AND HAVE_GLPK) 
     57ENDIF(HAVE_LP) 
     58 
     59IF(HAVE_MIP) 
     60  ADD_EXECUTABLE(mip_test mip_test.cc) 
     61  IF(HAVE_GLPK) 
     62    TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES}) 
     63  ENDIF(HAVE_GLPK) 
     64  ADD_TEST(mip_test mip_test) 
     65 
     66  IF(WIN32 AND HAVE_GLPK) 
     67    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) 
     68    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 
     69    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD 
     70      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH} 
     71      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH} 
     72      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} 
     73    ) 
     74  ENDIF(WIN32 AND HAVE_GLPK) 
     75ENDIF(HAVE_MIP) 
    2676 
    2777FOREACH(TEST_NAME ${TESTS}) 
  • test/CMakeLists.txt

    r569 r575  
    3030  maps_test 
    3131  max_matching_test 
     32  min_cost_arborescence_test 
    3233  path_test 
    3334  preflow_test 
  • test/Makefile.am

    r522 r575  
    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 \ 
     17        test/edge_set_test \ 
    1818        test/error_test \ 
    19         test/graph_adaptor_test \ 
     19        test/euler_test \ 
    2020        test/graph_copy_test \ 
    2121        test/graph_test \ 
    2222        test/graph_utils_test \ 
     23        test/hao_orlin_test \ 
    2324        test/heap_test \ 
    2425        test/kruskal_test \ 
    25         test/hao_orlin_test \ 
    26         test/maps_test \ 
     26        test/maps_test \ 
    2727        test/max_matching_test \ 
    2828        test/min_cost_arborescence_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 \ 
     29        test/path_test \ 
     30        test/preflow_test \ 
     31        test/radix_sort_test \ 
     32        test/random_test \ 
     33        test/suurballe_test \ 
     34        test/test_tools_fail \ 
     35        test/test_tools_pass \ 
     36        test/time_measure_test \ 
    3637        test/unionfind_test 
     38 
     39if HAVE_LP 
     40check_PROGRAMS += test/lp_test 
     41endif HAVE_LP 
     42if HAVE_MIP 
     43check_PROGRAMS += test/mip_test 
     44endif HAVE_MIP 
    3745 
    3846TESTS += $(check_PROGRAMS) 
    3947XFAIL_TESTS += test/test_tools_fail$(EXEEXT) 
    4048 
     49test_adaptors_test_SOURCES = test/adaptors_test.cc 
    4150test_bfs_test_SOURCES = test/bfs_test.cc 
    4251test_circulation_test_SOURCES = test/circulation_test.cc 
     
    4655test_dijkstra_test_SOURCES = test/dijkstra_test.cc 
    4756test_dim_test_SOURCES = test/dim_test.cc 
     57test_edge_set_test_SOURCES = test/edge_set_test.cc 
    4858test_error_test_SOURCES = test/error_test.cc 
    49 test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc 
     59test_euler_test_SOURCES = test/euler_test.cc 
    5060test_graph_copy_test_SOURCES = test/graph_copy_test.cc 
    5161test_graph_test_SOURCES = test/graph_test.cc 
     
    5464test_kruskal_test_SOURCES = test/kruskal_test.cc 
    5565test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc 
     66test_lp_test_SOURCES = test/lp_test.cc 
    5667test_maps_test_SOURCES = test/maps_test.cc 
     68test_mip_test_SOURCES = test/mip_test.cc 
    5769test_max_matching_test_SOURCES = test/max_matching_test.cc 
    5870test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc 
    5971test_path_test_SOURCES = test/path_test.cc 
    6072test_preflow_test_SOURCES = test/preflow_test.cc 
     73test_radix_sort_test_SOURCES = test/radix_sort_test.cc 
    6174test_suurballe_test_SOURCES = test/suurballe_test.cc 
    6275test_random_test_SOURCES = test/random_test.cc 
  • test/Makefile.am

    r569 r575  
    2626        test/maps_test \ 
    2727        test/max_matching_test \ 
     28        test/min_cost_arborescence_test \ 
    2829        test/path_test \ 
    2930        test/preflow_test \ 
     
    6768test_mip_test_SOURCES = test/mip_test.cc 
    6869test_max_matching_test_SOURCES = test/max_matching_test.cc 
     70test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc 
    6971test_path_test_SOURCES = test/path_test.cc 
    7072test_preflow_test_SOURCES = test/preflow_test.cc 
Note: See TracChangeset for help on using the changeset viewer.