RsBundle  Diff

Differences From Artifact [a4056dd0b8]:

  • File src/solver/sync.rs — part of check-in [17e923d3b9] at 2020-07-20 19:50:31 on branch async-separate — Merge async (user: fifr size: 29036) [more...]

To Artifact [3669a1775e]:

  • File src/solver/sync.rs — part of check-in [043546e5db] at 2020-07-27 12:39:39 on branch async — sync: show number of subproblem evaluations in log output (user: fifr size: 29122) [more...]

845
846
847
848
849
850
851
852

853
854
855
856
857
858
859
860
861

862
863
864
865
866
867
868
845
846
847
848
849
850
851

852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869







-
+









+







    fn get_descent_bound(acceptance_factor: Real, data: &SolverData) -> Real {
        data.cur_val - acceptance_factor * (data.cur_val - data.nxt_mod)
    }

    fn show_info(&self, step: Step) {
        let time = self.start_time.elapsed();
        info!(
            "{} {:0>2}:{:0>2}:{:0>2}.{:0>2} {:4} {:4} {:4}{:1}  {:9.4} {:9.4} \
            "{} {:0>2}:{:0>2}:{:0>2}.{:0>2} {:4} {:4} {:4} {:4}{:1}  {:9.4} {:9.4} \
             {:12.6e}({:12.6e}) {:12.6e}",
            if step == Step::Term { "_endit" } else { "endit " },
            time.as_secs() / 3600,
            (time.as_secs() / 60) % 60,
            time.as_secs() % 60,
            time.subsec_nanos() / 10_000_000,
            self.cnt_descent,
            self.cnt_descent + self.cnt_null,
            self.data.cnt_updates,
            (self.cnt_descent + self.cnt_null) * self.problem.num_subproblems(),
            if step == Step::Descent { "*" } else { " " },
            self.data.cur_weight,
            self.data.expected_progress(),
            self.data.nxt_mod,
            self.data.nxt_val,
            self.data.cur_val
        );