COIN-OR::LEMON - Graph Library

Changeset 941:7c4ba7daaf5f in lemon-1.2


Ignore:
Timestamp:
12/20/11 17:44:38 (7 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
942:2b6bffe0e7e8, 945:63fd58460c39
Parents:
940:4efe7b32b134 (diff), 502:17cabb114d52 (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:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r502 r941  
    11EXTRA_DIST += \
    22        lemon/lemon.pc.in \
    3         lemon/CMakeLists.txt
     3        lemon/lemon.pc.cmake \
     4        lemon/CMakeLists.txt \
     5        lemon/config.h.cmake
    46
    57pkgconfig_DATA += lemon/lemon.pc
     
    1315        lemon/lp_base.cc \
    1416        lemon/lp_skeleton.cc \
    15         lemon/random.cc
     17        lemon/random.cc \
     18        lemon/bits/windows.cc
    1619
     20nodist_lemon_HEADERS = lemon/config.h   
    1721
    1822lemon_libemon_la_CXXFLAGS = \
     23        $(AM_CXXFLAGS) \
    1924        $(GLPK_CFLAGS) \
    2025        $(CPLEX_CFLAGS) \
    2126        $(SOPLEX_CXXFLAGS) \
    22         $(CLP_CXXFLAGS)
     27        $(CLP_CXXFLAGS) \
     28        $(CBC_CXXFLAGS)
    2329
    2430lemon_libemon_la_LDFLAGS = \
     
    2632        $(CPLEX_LIBS) \
    2733        $(SOPLEX_LIBS) \
    28         $(CLP_LIBS)
     34        $(CLP_LIBS) \
     35        $(CBC_LIBS)
    2936
    3037if HAVE_GLPK
    31 lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
     38lemon_libemon_la_SOURCES += lemon/glpk.cc
    3239endif
    3340
    3441if HAVE_CPLEX
    35 lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
     42lemon_libemon_la_SOURCES += lemon/cplex.cc
    3643endif
    3744
    3845if HAVE_SOPLEX
    39 lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
     46lemon_libemon_la_SOURCES += lemon/soplex.cc
    4047endif
    4148
    4249if HAVE_CLP
    43 lemon_libemon_la_SOURCES += lemon/lp_clp.cc
     50lemon_libemon_la_SOURCES += lemon/clp.cc
     51endif
     52
     53if HAVE_CBC
     54lemon_libemon_la_SOURCES += lemon/cbc.cc
    4455endif
    4556
     
    5061        lemon/bfs.h \
    5162        lemon/bin_heap.h \
     63        lemon/bucket_heap.h \
     64        lemon/cbc.h \
    5265        lemon/circulation.h \
     66        lemon/clp.h \
    5367        lemon/color.h \
    5468        lemon/concept_check.h \
     69        lemon/connectivity.h \
    5570        lemon/counter.h \
    5671        lemon/core.h \
     72        lemon/cplex.h \
    5773        lemon/dfs.h \
    5874        lemon/dijkstra.h \
    5975        lemon/dim2.h \
    6076        lemon/dimacs.h \
     77        lemon/edge_set.h \
    6178        lemon/elevator.h \
    6279        lemon/error.h \
     80        lemon/euler.h \
     81        lemon/fib_heap.h \
    6382        lemon/full_graph.h \
     83        lemon/glpk.h \
     84        lemon/gomory_hu.h \
    6485        lemon/graph_to_eps.h \
    6586        lemon/grid_graph.h \
     
    7293        lemon/lp.h \
    7394        lemon/lp_base.h \
    74         lemon/lp_clp.h \
    75         lemon/lp_cplex.h \
    76         lemon/lp_glpk.h \
    7795        lemon/lp_skeleton.h \
    78         lemon/lp_soplex.h \
    7996        lemon/maps.h \
     97        lemon/matching.h \
    8098        lemon/math.h \
    81         lemon/max_matching.h \
     99        lemon/min_cost_arborescence.h \
    82100        lemon/nauty_reader.h \
     101        lemon/network_simplex.h \
    83102        lemon/path.h \
    84103        lemon/preflow.h \
     104        lemon/radix_heap.h \
    85105        lemon/radix_sort.h \
    86106        lemon/random.h \
    87107        lemon/smart_graph.h \
     108        lemon/soplex.h \
    88109        lemon/suurballe.h \
    89110        lemon/time_measure.h \
    90111        lemon/tolerance.h \
    91         lemon/unionfind.h
     112        lemon/unionfind.h \
     113        lemon/bits/windows.h
    92114
    93115bits_HEADERS += \
    94116        lemon/bits/alteration_notifier.h \
    95117        lemon/bits/array_map.h \
    96         lemon/bits/base_extender.h \
    97118        lemon/bits/bezier.h \
    98119        lemon/bits/default_map.h \
     120        lemon/bits/edge_set_extender.h \
    99121        lemon/bits/enable_if.h \
    100122        lemon/bits/graph_adaptor_extender.h \
  • lemon/Makefile.am

    r937 r941  
    9494        lemon/lp_base.h \
    9595        lemon/lp_skeleton.h \
    96         lemon/list_graph.h \
    9796        lemon/maps.h \
    9897        lemon/matching.h \
Note: See TracChangeset for help on using the changeset viewer.