RsBundle  Diff

Differences From Artifact [0269277e04]:

  • File src/parallel/solver.rs — part of check-in [51dab0e14c] at 2019-07-22 12:53:28 on branch async — parallel: store `expected_progress` explicitely (user: fifr size: 21713)

To Artifact [7989c81c5b]:

  • File src/parallel/solver.rs — part of check-in [21a46cf2b2] at 2019-07-22 12:57:13 on branch async — parallel remove old weight initialization (user: fifr size: 21387)

544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
544
545
546
547
548
549
550








551
552
553
554
555
556
557







-
-
-
-
-
-
-
-







                    nxt_cutvals.resize(self.problem.num_subproblems(), -Real::infinity());
                    cnt_remaining_mins = self.problem.num_subproblems();

                    // Start evaluation of all subproblems at the new candidate.
                    for i in 0..self.problem.num_subproblems() {
                        self.problem.evaluate(i, nxt_y.clone(), i, client_tx.clone()) .map_err(Error::Evaluation)?;
                    }

                    // Compute the real initial weight.
                    if self.data.cur_weight.is_infinite() {
                        let weight = self.weighter.initial_weight(&self.data);
                        self.data.cur_weight = weight;
                        master.set_weight(weight)?;
                    }

                },
            }
        }

        Ok(false)
    }