RsBundle  Diff

Differences From Artifact [23abb366ec]:

  • File src/solver.rs — part of check-in [a86c952bc8] at 2016-09-28 21:05:48 on branch trunk — solver: Compress minorants with smallest multipliers. (user: fifr size: 24550)

To Artifact [57006d0aa4]:

  • File src/solver.rs — part of check-in [77d15f47e4] at 2016-09-28 21:15:32 on branch trunk — solver: Fix fractions in time output. (user: fifr size: 24551)

488
489
490
491
492
493
494
495

496
497
498
499
500
501
502
488
489
490
491
492
493
494

495
496
497
498
499
500
501
502







-
+







    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} {: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() / 1000000,
              time.subsec_nanos() / 10000000,
              self.cnt_descent,
              self.cnt_descent + self.cnt_null,
              self.master.cnt_updates(),
              if step == Step::Descent { "*" } else { " " },
              self.master.weight(),
              self.expected_progress,
              self.nxt_mod,