RsBundle  Diff

Differences From Artifact [28dfff2517]:

  • File src/solver.rs — part of check-in [fb00b3c18e] at 2017-04-18 13:08:24 on branch trunk — solver: do not call `init` in `solver_iter`. (user: fifr size: 35704)

To Artifact [6e636361ef]:

  • File src/solver.rs — part of check-in [ff47afc279] at 2017-11-02 08:42:20 on branch trunk — Use digit separators in long integer literals (user: fifr size: 35707)

562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
        self.start_time = Instant::now();

        Ok(())
    }

    /// Solve the problem.
    pub fn solve(&mut self) -> Result<()> {
        const LIMIT: usize = 10000;

        if self.solve_iter(LIMIT)? {
            Ok(())
        } else {
            Err(Error::IterationLimit(LIMIT))
        }
    }







|







562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
        self.start_time = Instant::now();

        Ok(())
    }

    /// Solve the problem.
    pub fn solve(&mut self) -> Result<()> {
        const LIMIT: usize = 10_000;

        if self.solve_iter(LIMIT)? {
            Ok(())
        } else {
            Err(Error::IterationLimit(LIMIT))
        }
    }
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
                  "_endit"
              } else {
                  "endit "
              },
              time.as_secs() / 3600,
              (time.as_secs() / 60) % 60,
              time.as_secs() % 60,
              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,







|







716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
                  "_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.master.cnt_updates(),
              if step == Step::Descent { "*" } else { " " },
              self.master.weight(),
              self.expected_progress,
              self.nxt_mod,