RsBundle  Diff

Differences From Artifact [a77fadbefc]:

  • File src/solver/sync.rs — part of check-in [fb8a269092] at 2022-06-11 18:12:56 on branch solver-state — Merge trunk (user: fifr size: 32071) [more...]

To Artifact [7446e76ed2]:

  • File src/solver/sync.rs — part of check-in [316d024643] at 2022-06-13 07:08:30 on branch solver-state — sync: add `num_iterations` method (user: fifr size: 32231)

883
884
885
886
887
888
889





890
891
892
893
894
895
896
            self.data.cur_weight,
            self.data.expected_progress(),
            self.data.nxt_mod,
            self.data.nxt_val,
            self.data.cur_val
        );
    }






    /// Return the aggregated primal of the given subproblem.
    pub fn aggregated_primal(&self, subproblem: usize) -> Result<<P::Minorant as Minorant>::Primal, P, M> {
        Ok(self
            .master_proc
            .as_ref()
            .ok_or(Error::NotSolved)?







>
>
>
>
>







883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
            self.data.cur_weight,
            self.data.expected_progress(),
            self.data.nxt_mod,
            self.data.nxt_val,
            self.data.cur_val
        );
    }

    /// Return the total number iterations in the last call to a `solve*` method.
    pub fn num_iterations(&self) -> usize {
        self.data.cnt_iter
    }

    /// Return the aggregated primal of the given subproblem.
    pub fn aggregated_primal(&self, subproblem: usize) -> Result<<P::Minorant as Minorant>::Primal, P, M> {
        Ok(self
            .master_proc
            .as_ref()
            .ok_or(Error::NotSolved)?