Skip to content

Commit

Permalink
Improve documentation in column generation procedure (Fixes coin-or#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
rowtricker committed Jun 21, 2017
1 parent 555c2b7 commit f46c6ac
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down

0 comments on commit f46c6ac

Please sign in to comment.