equal
deleted
inserted
replaced
22 demo/simann_maxcut_demo \ |
22 demo/simann_maxcut_demo \ |
23 demo/disjoint_paths_demo \ |
23 demo/disjoint_paths_demo \ |
24 demo/strongly_connected_orientation |
24 demo/strongly_connected_orientation |
25 |
25 |
26 if HAVE_GLPK |
26 if HAVE_GLPK |
27 noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo |
27 noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo demo/mip_demo |
28 else !HAVE_GLPK |
28 else !HAVE_GLPK |
29 if HAVE_CPLEX |
29 if HAVE_CPLEX |
30 noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo |
30 noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo |
31 endif HAVE_CPLEX |
31 endif HAVE_CPLEX |
32 endif !HAVE_GLPK |
32 endif !HAVE_GLPK |
60 demo/tight_edge_filter_map.h |
60 demo/tight_edge_filter_map.h |
61 |
61 |
62 demo_lp_demo_SOURCES = demo/lp_demo.cc |
62 demo_lp_demo_SOURCES = demo/lp_demo.cc |
63 demo_lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) |
63 demo_lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) |
64 |
64 |
|
65 demo_mip_demo_SOURCES = demo/mip_demo.cc |
|
66 demo_mip_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) |
|
67 |
65 demo_lp_maxflow_demo_SOURCES = demo/lp_maxflow_demo.cc |
68 demo_lp_maxflow_demo_SOURCES = demo/lp_maxflow_demo.cc |
66 demo_lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) |
69 demo_lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) |
67 |
70 |
68 demo_descriptor_map_demo_SOURCES = demo/descriptor_map_demo.cc |
71 demo_descriptor_map_demo_SOURCES = demo/descriptor_map_demo.cc |
69 |
72 |