RsBundle  Diff

Differences From Artifact [da260ba320]:

  • File src/solver.rs — part of check-in [40f31dd62c] at 2017-11-20 09:05:37 on branch trunk — solver: remove remaing `try!` (user: fifr size: 35124)

To Artifact [4aa50b81f7]:

  • File src/solver.rs — part of check-in [741fb52a85] at 2017-11-20 09:11:33 on branch trunk — Refactoring (user: fifr size: 35060)

729
730
731
732
733
734
735
736

737
738
739
740
741
742
743
744
745
746
729
730
731
732
733
734
735

736



737
738
739
740
741
742
743







-
+
-
-
-







            }
        }

        self.master.set_num_subproblems(m).map_err(SolverError::Master)?;
        self.master.set_vars(self.problem.num_variables(), lb, ub).map_err(SolverError::Master)?;
        self.master.set_max_updates(self.params.max_updates).map_err(SolverError::Master)?;

        self.minorants = Vec::with_capacity(m);
        self.minorants = (0..m).map(|_| vec![]).collect();
        for _ in 0..m {
            self.minorants.push(vec![]);
        }

        self.cur_val = 0.0;
        for i in 0..m {
            let result = self.problem
                .evaluate(i, &self.cur_y, INFINITY, 0.0)
                .map_err(SolverError::Evaluation)?;
            self.cur_vals[i] = result.objective();