RsBundle  Diff

Differences From Artifact [647352101b]:

  • File src/solver.rs — part of check-in [1f65b89c9e] at 2016-09-28 11:28:18 on branch trunk — solver: Allow larger bundle sizes when compressing bundles. (user: fifr size: 23388)

To Artifact [2c5245183b]:

  • File src/solver.rs — part of check-in [a89b3502b5] at 2016-09-28 15:02:26 on branch trunk — Add `MasterProblem::set_num_subproblems`. (user: fifr size: 23431)

514
515
516
517
518
519
520


521
522
523
524
525
526
527
528
529
530
531
532

        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_vars(self.problem.num_variables(), lb, ub);
        self.master.set_max_updates(self.params.max_updates);

        let m = self.problem.num_subproblems();

        self.cur_val = 0.0;
        for i in 0..m {
            let result = match self.problem.evaluate(i, &self.cur_y, INFINITY, 0.0) {
                Ok(r) => r,
                Err(err) => return Err(Error::Eval(Box::new(err))),
            };
            self.cur_vals[i] = result.objective();







>
>



<
<







514
515
516
517
518
519
520
521
522
523
524
525


526
527
528
529
530
531
532

        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"));
            }
        }

        let m = self.problem.num_subproblems();
        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.cur_val = 0.0;
        for i in 0..m {
            let result = match self.problem.evaluate(i, &self.cur_y, INFINITY, 0.0) {
                Ok(r) => r,
                Err(err) => return Err(Error::Eval(Box::new(err))),
            };
            self.cur_vals[i] = result.objective();