RsBundle  Diff

Differences From Artifact [2240c2056b]:

  • File src/solver.rs — part of check-in [705a1cf52f] at 2017-03-03 15:46:03 on branch trunk — solver: fix adding new variables to master. (user: fifr size: 33324)

To Artifact [7348ac40b4]:

  • File src/solver.rs — part of check-in [8b9adfcbb9] at 2017-03-06 16:35:25 on branch trunk — solver: silence a clippy warning. (user: fifr size: 33389)

843
844
845
846
847
848
849

850
851
852
853
854
855
856
        let new_weight = self.weighter.weight(&current_state!(self, Step::Null), &self.params);
        self.master.set_weight(new_weight);
        self.cnt_null += 1;
        debug!("Null Step");
    }

    /// Perform one bundle iteration.

    pub fn step(&mut self) -> Result<Step> {
        self.iterinfos.clear();

        if !self.cur_valid {
            // current point needs new evaluation
            try!(self.init_master());
        }







>







843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
        let new_weight = self.weighter.weight(&current_state!(self, Step::Null), &self.params);
        self.master.set_weight(new_weight);
        self.cnt_null += 1;
        debug!("Null Step");
    }

    /// Perform one bundle iteration.
    #[cfg_attr(feature = "cargo-clippy", allow(collapsible_if))]
    pub fn step(&mut self) -> Result<Step> {
        self.iterinfos.clear();

        if !self.cur_valid {
            // current point needs new evaluation
            try!(self.init_master());
        }