From 5f3a58efca47cf649658bc60a917f514dbf58472 Mon Sep 17 00:00:00 2001 From: Takashi Imamichi Date: Thu, 14 Jul 2022 14:41:25 +0900 Subject: [PATCH] fix examples of cuts --- examples/mp/callbacks/cut_callback.py | 5 +++-- examples/mp/callbacks/lazy_callback.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/mp/callbacks/cut_callback.py b/examples/mp/callbacks/cut_callback.py index 648f8c4..817e869 100644 --- a/examples/mp/callbacks/cut_callback.py +++ b/examples/mp/callbacks/cut_callback.py @@ -123,7 +123,8 @@ def build_supply_model(fixed_costs, supply_costs, use_cuts=False, **kwargs): cut_cb.add_cut_constraint(supply[c, l] <= location_used) print('* add cut constraints callback with {0} cuts'.format(len(cut_cb.cts))) - m.cut_callback = cut_cb + m.cut_callback = cut_cb + return m @@ -160,7 +161,7 @@ def build_test_supply_model(use_cuts, **kwargs): use_cuts = True for arg in args[1:]: if arg == '-cuts': - use_cuts = False + use_cuts = True elif arg == '-nocuts': use_cuts = False else: diff --git a/examples/mp/callbacks/lazy_callback.py b/examples/mp/callbacks/lazy_callback.py index 7eef133..47e78cf 100644 --- a/examples/mp/callbacks/lazy_callback.py +++ b/examples/mp/callbacks/lazy_callback.py @@ -117,7 +117,8 @@ def build_supply_model(fixed_costs, supply_costs, lazy=True, **kwargs): m.sum(supply[c, l] for c in range_clients) <= (nb_clients - 1) * used[l] for l in range_locations) print('* added lazy constraints callback with {0} constraints'.format(len(lazyct_cb.cts))) - m.lazy_callback = lazyct_cb + m.lazy_callback = lazyct_cb + m.parameters.preprocessing.presolve = 0 return m @@ -157,7 +158,7 @@ def build_test_supply_model(lazy, **kwargs): if arg == '-lazy': use_lazy = True if arg == '-nolazy': - use_lazy = True + use_lazy = False else: print('Unknown argument %s' % arg) random = False