From e352e478d076dca01b462e8960f1016bcb4ec761 Mon Sep 17 00:00:00 2001 From: Alinson S Xavier Date: Fri, 24 Apr 2020 12:42:20 -0500 Subject: [PATCH] Branch: add progress bar --- benchmark/benchmark.py | 4 ++-- src/python/miplearn/components/branching.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py index f1dead2..c5a3526 100755 --- a/benchmark/benchmark.py +++ b/benchmark/benchmark.py @@ -66,8 +66,8 @@ def train(): solver = LearningSolver(time_limit=train_time_limit, solver=internal_solver) solver.add(BranchPriorityComponent()) - solver.parallel_solve(train_instances[:1], n_jobs=n_jobs) - solver.fit(train_instances[:1]) + solver.parallel_solve(train_instances, n_jobs=n_jobs) + solver.fit(train_instances) save(train_instances, "%s/train_instances.bin" % basepath) save(test_instances, "%s/test_instances.bin" % basepath) diff --git a/src/python/miplearn/components/branching.py b/src/python/miplearn/components/branching.py index 16eb187..5979868 100644 --- a/src/python/miplearn/components/branching.py +++ b/src/python/miplearn/components/branching.py @@ -55,7 +55,7 @@ class BranchPriorityComponent(Component): pass def fit(self, training_instances, n_jobs=1): - for instance in training_instances: + for instance in tqdm(training_instances, desc="Fit (branch)"): if not hasattr(instance, "branch_priorities"): instance.branch_priorities = self.compute_priorities(instance) x, y = self.x(training_instances), self.y(training_instances)