RsBundle  Diff

Differences From Artifact [71fa6c3352]:

  • File src/master/master.rs — part of check-in [7b213efa22] at 2016-10-01 07:49:00 on branch trunk — Aggregate primal information. For this, master problems must return the coefficients and the problem trait needs to implement an `aggregate` method. (user: fifr size: 3864)

To Artifact [775ddf0f88]:

  • File src/master/master.rs — part of check-in [814bd7230a] at 2016-10-05 16:54:25 on branch trunk — Add problem update callback. (user: fifr size: 4038)

57
58
59
60
61
62
63



64
65
66
67
68
69
70

    /// Set the maximal number of inner iterations.
    fn set_max_updates(&mut self, max_updates: usize);

    /// Return the current number of inner iterations.
    fn cnt_updates(&self) -> usize;




    /// Add a new minorant to the model.
    ///
    /// The function returns a unique (among all minorants of all
    /// subproblems) index of the minorant. This index must remain
    /// valid until the minorant is aggregated.
    fn add_minorant(&mut self, fidx: usize, minorant: Minorant) -> Result<Self::MinorantIndex>;








>
>
>







57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73

    /// Set the maximal number of inner iterations.
    fn set_max_updates(&mut self, max_updates: usize);

    /// Return the current number of inner iterations.
    fn cnt_updates(&self) -> usize;

    /// Add some variables with bounds.
    fn add_vars(&mut self, bounds: &[(Real,Real)], extend_subgradient: &mut FnMut(usize, Self::MinorantIndex, &[usize]) -> DVector);

    /// Add a new minorant to the model.
    ///
    /// The function returns a unique (among all minorants of all
    /// subproblems) index of the minorant. This index must remain
    /// valid until the minorant is aggregated.
    fn add_minorant(&mut self, fidx: usize, minorant: Minorant) -> Result<Self::MinorantIndex>;