RsBundle  Diff

Differences From Artifact [57006d0aa4]:

  • File src/solver.rs — part of check-in [77d15f47e4] at 2016-09-28 21:15:32 on branch trunk — solver: Fix fractions in time output. (user: fifr size: 24551)

To Artifact [4b4877061c]:

  • File src/solver.rs — part of check-in [a475dc4e2d] at 2016-09-29 06:37:20 on branch trunk — solver: Handle error when setting the number of suproblems in the master. (user: fifr size: 24557)

527
528
529
530
531
532
533
534
535
536
537
538
539
540
541

        if let Some(ref x) = lb {
            if x.len() != self.problem.num_variables() {
                return Err(Error::Dimension("Dimension of lower bounds does not match number of variables"));
            }
        }

        self.master.set_num_subproblems(m);
        self.master.set_vars(self.problem.num_variables(), lb, ub);
        self.master.set_max_updates(self.params.max_updates);

        self.minorants = vec![vec![]; m];

        self.cur_val = 0.0;
        for i in 0..m {







|







527
528
529
530
531
532
533
534
535
536
537
538
539
540
541

        if let Some(ref x) = lb {
            if x.len() != self.problem.num_variables() {
                return Err(Error::Dimension("Dimension of lower bounds does not match number of variables"));
            }
        }

        try!(self.master.set_num_subproblems(m));
        self.master.set_vars(self.problem.num_variables(), lb, ub);
        self.master.set_max_updates(self.params.max_updates);

        self.minorants = vec![vec![]; m];

        self.cur_val = 0.0;
        for i in 0..m {