From f46c6acdb96d3791e0f5e6491f11ddea6a1ca20f Mon Sep 17 00:00:00 2001 From: Rowan Hoogervorst Date: Wed, 21 Jun 2017 11:28:49 +0200 Subject: [PATCH] Improve documentation in column generation procedure (Fixes coin-or/jorlib#30) --- .../frameworks/columngeneration/colgenmain/ColGen.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jorlib-core/src/main/java/org/jorlib/frameworks/columngeneration/colgenmain/ColGen.java b/jorlib-core/src/main/java/org/jorlib/frameworks/columngeneration/colgenmain/ColGen.java index f7cbfa10..26d84889 100644 --- a/jorlib-core/src/main/java/org/jorlib/frameworks/columngeneration/colgenmain/ColGen.java +++ b/jorlib-core/src/main/java/org/jorlib/frameworks/columngeneration/colgenmain/ColGen.java @@ -329,13 +329,13 @@ protected void invokeMaster(long timeLimit) } /** - * Invokes the solve methods of the algorithms which solve the Pricing Problem. In addition, - * after solving the Pricing Problems and before any new columns are added to the Master - * Problem, this method invokes the {@link #calculateBoundOnMasterObjective(Class solver) - * calculateBoundOnMasterObjective} method. + * Invokes the solve methods of the algorithms which solve the Pricing Problem and adds the found columns to the + * Master Problem. In addition, after solving the Pricing Problems and before any new columns are added to the + * Master Problem, this method invokes the {@link #calculateBoundOnMasterObjective(Class solver) + * calculateBoundOnMasterObjective} method. * * @param timeLimit Future point in time by which the Pricing Problem must be finished - * @return list of new columns which have to be added to the Master Problem, or an empty list if + * @return list of new columns which have been added to the Master Problem, or an empty list if * no columns could be identified * @throws TimeLimitExceededException TimeLimitExceededException */