RsBundle  Diff

Differences From Artifact [592e0262e8]:

• File src/solver.rs — part of check-in [cc9ce5ef15] at 2016-09-28 15:15:52 on branch trunk — solver: Use `CplexMaster` as default for large master problems. (user: fifr size: 23702)

To Artifact [6402964398]:

• File src/solver.rs — part of check-in [29f93aefac] at 2016-09-28 15:52:38 on branch trunk — Add `MinorantIndex` as reference to minorants to master problem. (user: fifr size: 23723)

361
362
363
364
365
366
367
368

369
370
371
372
373
374
375

361
362
363
364
365
366
367

368
369
370
371
372
373
374
375

-
+

     * Time when the solution process started.
     *
     * This is actually the time of the last call to `Solver::init`.
     */
    start_time : Instant,

    /// The master problem.
    master: Box<MasterProblem>,
    master: Box<MasterProblem<MinorantIndex=usize>>,
}


impl<P> Solver<P>
    where P : for <'a> FirstOrderProblem<'a>
{
    /**