RsBundle  Diff

Differences From Artifact [1fd7985cd3]:

  • File src/solver.rs — part of check-in [4cd78f8116] at 2016-09-27 10:46:49 on branch trunk — Initial record (user: fifr size: 21603)

To Artifact [ea44ae6dda]:

  • File src/solver.rs — part of check-in [9768a88763] at 2016-09-28 06:10:25 on branch trunk — solver: Reformat info output. (user: fifr size: 21606)

442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458

459
460
461
462
463
464
465
            }
        }
        Ok(())
    }

    fn show_info(&self, step: Step) {
        let time = self.start_time.elapsed();
        info!("{} {:0>2}:{:0>2}:{:0>2}.{:0>2} {:4}{:1} {:4} {:4}  {:9.4} {:9.4} {:12.6}({:12.6}) {:12.6}",
              if step == Step::Term { "_endit" } else { "endit" },
              time.as_secs() / 3600,
              (time.as_secs() / 60) % 60,
              time.as_secs() % 60,
              time.subsec_nanos() / 1000000,
              self.cnt_descent,
              if step == Step::Descent { "*" } else { " " },
              self.cnt_descent + self.cnt_null,
              self.master.cnt_updates(),

              self.master.weight(),
              self.expected_progress,
              self.nxt_mod,
              self.nxt_val,
              self.cur_val);
    }








|






<


>







442
443
444
445
446
447
448
449
450
451
452
453
454
455

456
457
458
459
460
461
462
463
464
465
            }
        }
        Ok(())
    }

    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,
              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,
              self.nxt_val,
              self.cur_val);
    }