RsBundle  Check-in [9768a88763]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:solver: Reformat info output.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9768a88763e17b0ad58395cbab7f46d8653478b6
User & Date: fifr 2016-09-28 06:10:25.438
Context
2016-09-28
06:10
Add `Vector::new_sparse`. check-in: a254a6472f user: fifr tags: trunk
06:10
solver: Reformat info output. check-in: 9768a88763 user: fifr tags: trunk
06:09
minimal: Fix sign error in solve. check-in: 4ca5012f37 user: fifr tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/solver.rs.
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);
    }