RsBundle  Diff

Differences From Artifact [00b1b4283a]:

  • File src/solver.rs — part of check-in [2314de719c] at 2019-07-15 12:32:57 on branch trunk — Solver: add `solve_with_limit` (user: fifr size: 36800)

To Artifact [e0c8d065be]:

  • File src/solver.rs — part of check-in [394e0533c6] at 2019-07-15 19:33:00 on branch trunk — Modernize some clippy warnings (user: fifr size: 36772)

931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
        self.master.set_weight(new_weight)?;
        self.cnt_null += 1;
        debug!("Null Step");
        Ok(())
    }

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

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







|







931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
        self.master.set_weight(new_weight)?;
        self.cnt_null += 1;
        debug!("Null Step");
        Ok(())
    }

    /// Perform one bundle iteration.
    #[allow(clippy::collapsible_if)]
    pub fn step(&mut self) -> Result<Step, SolverError<P::Err>> {
        self.iterinfos.clear();

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