RsBundle  Diff

Differences From Artifact [8090155e67]:

  • File src/parallel/solver.rs — part of check-in [4abcab25e2] at 2019-07-17 14:14:53 on branch async — parallel: initialize solver (user: fifr size: 9951)

To Artifact [5857b1bc16]:

  • File src/parallel/solver.rs — part of check-in [6186a4f7ed] at 2019-07-17 14:41:42 on branch async — solver: make master problem a type argument (user: fifr size: 9959)

252
253
254
255
256
257
258
259

260
261
262
263
264
265
266
252
253
254
255
256
257
258

259
260
261
262
263
264
265
266







-
+







        Ok(())
    }

    fn master_main(
        tx: &mut MasterSender<P::Err>,
        rx: MasterReceiver,
    ) -> std::result::Result<(), MasterProblemError<P::Err>> {
        let mut master = CplexMaster::new().map(BoxedMasterProblem::new)?;
        let mut master = CplexMaster::new().map(BoxedMasterProblem::with_master)?;
        for m in rx {
            match m {
                MasterTask::AddMinorant(i, m) => {
                    master.add_minorant(i, m)?;
                }
                MasterTask::MoveCenter(alpha, d) => {
                    master.move_center(alpha, &d);