COIN-OR::LEMON - Graph Library

Changeset 481:7afc121e0689 in lemon


Ignore:
Timestamp:
12/02/08 21:40:33 (11 years ago)
Author:
Balazs Dezso <deba@…>
Branch:
default
Phase:
public
Message:

Port LP and MIP solvers from SVN -r3509 (#44)

Files:
18 added
6 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r480 r481  
    5151
    5252dnl Checks for libraries.
    53 #LX_CHECK_GLPK
    54 #LX_CHECK_CPLEX
    55 #LX_CHECK_SOPLEX
     53LX_CHECK_GLPK
     54LX_CHECK_CPLEX
     55LX_CHECK_SOPLEX
    5656
    5757AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
     
    118118echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS
    119119echo
    120 #echo GLPK support.................. : $lx_glpk_found
    121 #echo CPLEX support................. : $lx_cplex_found
    122 #echo SOPLEX support................ : $lx_soplex_found
    123 #echo
     120echo GLPK support.................. : $lx_glpk_found
     121echo CPLEX support................. : $lx_cplex_found
     122echo SOPLEX support................ : $lx_soplex_found
     123echo
    124124echo Build demo programs........... : $enable_demo
    125125echo Build additional tools........ : $enable_tools
  • lemon/CMakeLists.txt

    r225 r481  
    55  base.cc
    66  color.cc
     7  lp_base.cc
     8  lp_skeleton.cc
     9  lp_utils.cc
    710  random.cc)
    811
  • lemon/Makefile.am

    r468 r481  
    1111        lemon/base.cc \
    1212        lemon/color.cc \
     13        lemon/lp_base.cc \
     14        lemon/lp_skeleton.cc \
    1315        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
     23lemon_libemon_la_LDFLAGS = \
     24        $(GLPK_LIBS) \
     25        $(CPLEX_LIBS) \
     26        $(SOPLEX_LIBS)
     27
     28if HAVE_GLPK
     29lemon_libemon_la_SOURCES += lemon/lp_glpk.cc lemon/mip_glpk.cc
     30endif
     31
     32if HAVE_CPLEX
     33lemon_libemon_la_SOURCES += lemon/lp_cplex.cc lemon/mip_cplex.cc
     34endif
     35
     36if HAVE_SOPLEX
     37lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
     38endif
    1739
    1840lemon_HEADERS += \
     
    4264        lemon/lgf_writer.h \
    4365        lemon/list_graph.h \
     66        lemon/lp.h \
     67        lemon/lp_base.h \
     68        lemon/lp_cplex.h \
     69        lemon/lp_glpk.h \
     70        lemon/lp_skeleton.h \
     71        lemon/lp_soplex.h \
     72        lemon/mip_cplex.h \
     73        lemon/mip_glpk.h \
    4474        lemon/maps.h \
    4575        lemon/math.h \
     
    6595        lemon/bits/graph_adaptor_extender.h \
    6696        lemon/bits/graph_extender.h \
     97        lemon/bits/lp_id.h \
    6798        lemon/bits/map_extender.h \
    6899        lemon/bits/path_dump.h \
  • lemon/config.h.in

    r480 r481  
    1010/* Define to 1 if you have GLPK. */
    1111#undef HAVE_GLPK
     12
     13/* Define to 1 if you have SOPLEX */
     14#undef HAVE_SOPLEX
  • test/CMakeLists.txt

    r468 r481  
    1919  heap_test
    2020  kruskal_test
     21  lp_test
     22  mip_test
    2123  maps_test
    2224  max_matching_test
  • test/Makefile.am

    r468 r481  
    3434        test/unionfind_test
    3535
     36if HAVE_LP
     37check_PROGRAMS += test/lp_test
     38endif HAVE_LP
     39if HAVE_MIP
     40check_PROGRAMS += test/mip_test
     41endif HAVE_MIP
     42
    3643TESTS += $(check_PROGRAMS)
    3744XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
     
    5259test_kruskal_test_SOURCES = test/kruskal_test.cc
    5360test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
     61test_lp_test_SOURCES = test/lp_test.cc
    5462test_maps_test_SOURCES = test/maps_test.cc
     63test_mip_test_SOURCES = test/mip_test.cc
    5564test_max_matching_test_SOURCES = test/max_matching_test.cc
    5665test_path_test_SOURCES = test/path_test.cc
Note: See TracChangeset for help on using the changeset viewer.