rust version: old method comparable to method in main

.cargo/config.toml

@@ -1,3 +1,2 @@
 [build]
-target = "x86_64-unknown-linux-musl"
+rustflags = ["-C", "target-cpu=native", "-C", "target-feature=+crt-static"]
-rustflags = "-C target-cpu=native -C strip=symbols"

Cargo.toml

@@ -9,5 +9,6 @@ edition = "2021"
 [profile.release]
 lto = true
 debug = false
-codegen-units = 1
+strip = true
 panic = "abort"
+codegen-units = 1

src/main.rs

@@ -2,89 +2,29 @@ use std::time::Instant;
 
 const BLOCK_SIZE: usize = 3;
 const SIZE: usize = BLOCK_SIZE * BLOCK_SIZE;
+const NUM_FIELDS: usize = SIZE * SIZE;
 
 struct SField {
     field: Vec<u8>,
     fixed: Vec<bool>,
-    size: usize,
-    block_size: usize,
     pos: usize,
-    pos_last_placed: usize,
-    num_fields: usize,
     possible_values: Vec<Vec<u8>>,
 }
 
-/// Some test fields:
-///
-/// EMPTY FIELD
-/// let field = vec![0; SIZE * SIZE];
-///
-/// MANY SOLUTIONS
-/// #[rustfmt::skip]
-/// let field = vec![
-///     0,0,0,0,0,0,0,0,9,
-///     0,0,0,0,8,9,0,2,0,
-///     0,0,0,0,2,0,4,0,0,
-///     0,0,4,0,6,0,0,0,8,
-///     0,0,0,5,0,0,0,0,0,
-///     0,6,5,0,0,2,0,7,4,
-///     0,3,0,0,0,5,0,4,0,
-///     0,0,1,8,0,0,0,0,0,
-///     0,0,8,2,0,0,0,6,0,
-/// ];
-///
-/// HARD
-/// #[rustfmt::skip]
-/// let field = vec![
-///     8,4,0,0,6,0,5,0,1,
-///     0,0,0,0,0,3,0,4,0,
-///     0,0,6,9,0,0,0,0,7,
-///     0,2,0,7,1,0,0,0,6,
-///     0,0,0,6,3,0,0,0,0,
-///     9,0,0,0,0,0,0,5,0,
-///     0,0,0,0,4,0,0,6,0,
-///     2,0,0,0,0,0,1,8,0,
-///     0,0,5,0,0,0,3,0,0,
-/// ];
-///
-/// EASY
-/// #[rustfmt::skip]
-/// let field = vec![
-///     5,9,0,6,1,3,0,0,0,
-///     0,0,0,9,0,0,5,0,0,
-///     8,0,3,0,5,7,6,4,0,
-///     0,7,5,0,0,0,4,0,6,
-///     0,6,0,7,4,0,2,0,8,
-///     2,0,8,0,0,0,7,5,3,
-///     0,0,0,5,6,1,0,7,0,
-///     0,0,1,0,7,0,9,0,0,
-///     7,3,6,0,2,0,0,0,0,
-/// ];
-///
-/// // BLOCK_SIZE 4 MANY SOLUTIONS (DOESN'T FINISH)
-/// #[rustfmt::skip]
-/// let field = vec![
-///     0,15,0,0,0,0,11,4,0,5,0,0,0,0,12,8,
-///     12,0,0,9,0,1,0,5,0,0,8,15,0,0,0,13,
-///     0,0,3,0,0,10,13,0,0,11,4,0,15,0,6,0,
-///     13,10,0,11,0,0,0,14,0,3,2,0,0,9,0,0,
-///     0,0,15,10,8,0,0,0,0,0,14,0,0,6,2,0,
-///     0,0,14,0,0,0,6,0,0,0,0,0,1,0,0,0,
-///     0,11,0,8,3,0,15,1,6,0,0,0,0,0,0,7,
-///     0,6,0,7,0,0,0,0,8,13,0,0,10,0,0,0,
-///     0,14,0,2,0,0,0,0,3,0,5,0,11,15,9,0,
-///     0,0,0,12,11,0,2,0,0,0,0,0,0,0,0,0,
-///     0,8,0,0,6,14,1,0,13,15,0,0,0,0,0,10,
-///     10,0,0,3,9,0,7,0,0,1,0,0,13,12,8,0,
-///     7,0,0,0,0,0,14,0,0,0,0,0,0,0,0,9,
-///     0,3,0,14,0,0,9,6,0,0,0,0,0,4,0,0,
-///     0,4,6,0,0,7,0,0,0,0,0,0,0,0,0,0,
-///     5,2,0,0,0,4,10,15,1,0,3,0,0,0,7,0,
-/// ];
-
 impl SField {
     pub fn new() -> SField {
-        let field = vec![0; SIZE * SIZE];
+        #[rustfmt::skip]
+        let field = vec![
+            0,0,0,0,0,0,0,0,0,
+            0,0,0,0,8,9,0,0,0,
+            0,0,0,0,2,0,4,0,0,
+            0,0,4,0,6,0,0,0,8,
+            0,0,0,5,0,0,0,0,0,
+            0,6,5,0,0,2,0,7,4,
+            0,3,0,0,0,5,0,4,0,
+            0,0,1,8,0,0,0,0,0,
+            0,0,8,2,0,0,0,6,0,
+        ];
 
         let mut fixed = Vec::with_capacity(SIZE * SIZE);
         field.iter().for_each(|e| {
@@ -98,24 +38,20 @@ impl SField {
         SField {
             field,
             fixed,
-            size: SIZE,
-            block_size: BLOCK_SIZE,
             pos: 0,
-            pos_last_placed: 0,
-            num_fields: SIZE * SIZE,
             possible_values: vec![vec![]; SIZE * SIZE],
         }
     }
 
     fn build_possible_values_db(&mut self) {
-        for idx in 0..self.num_fields {
+        for idx in 0..NUM_FIELDS {
             if self.fixed[idx] {
                 continue;
             }
             self.pos = idx;
             // try all values between 1 and =self.size and remember the good ones
-            let mut good_ones = Vec::with_capacity(self.size);
+            let mut good_ones = Vec::with_capacity(SIZE);
-            for nr in 1..=(self.size as u8) {
+            for nr in 1..=(SIZE as u8) {
                 if self.ok(nr) {
                     good_ones.push(nr);
                 }
@@ -126,49 +62,16 @@ impl SField {
     }
 
     pub fn solve_backtracking(&mut self) -> bool {
-        let mut found_solution = false;
-
         let mut num_solutions = 0;
-        let mut last_num_solutions = num_solutions;
-
-        let mut loop_count = 0;
-        let mut last_loop_count = loop_count;
-
-        let mut now = Instant::now();
         loop {
-            loop_count += 1;
-            const MILLIS_PER_SEC: u128 = 1_000;
-            const UPDATE_DELAY_MS: u128 = 80;
-            if loop_count % 1000 == 0 {
-                let elapsed_ms = now.elapsed().as_millis();
-                if elapsed_ms <= UPDATE_DELAY_MS {
-                    continue;
-                }
-                self.print_clear();
-                self.print();
-                println!(
-                    "{} loops/sec",
-                    (loop_count - last_loop_count) * (MILLIS_PER_SEC / elapsed_ms)
-                );
-                println!(
-                    "{} solutions/sec",
-                    (num_solutions - last_num_solutions) * (MILLIS_PER_SEC / elapsed_ms)
-                );
-                last_loop_count = loop_count;
-                last_num_solutions = num_solutions;
-                now = Instant::now();
-            }
             if self.is_end() {
-                found_solution = true;
                 num_solutions += 1;
 
-                /*
+                if num_solutions % 10_000 == 0 {
-                if num_solutions % 100 == 0 {
                     self.print_clear();
-                    println!("Solutions: {}", num_solutions);
                     self.print();
+                    println!("Number of solutions: {}", num_solutions);
                 }
-                */
 
                 if self.is_fixed() {
                     continue;
@@ -188,8 +91,6 @@ impl SField {
                     self.next();
                     continue;
                 } else {
-                    //println!("put_valid_nr failed for pos {}", self.pos);
-                    //std::thread::sleep_ms(300);
                     self.clear_current_field();
                     if !self.prev() {
                         println!("Number of solutions: {}", num_solutions);
@@ -203,7 +104,7 @@ impl SField {
             }
         }
 
-        found_solution
+        num_solutions > 0
     }
 
     #[inline(always)]
@@ -216,11 +117,6 @@ impl SField {
         print!("\x1b\x5b\x31\x3b\x33\x32\x6d");
     }
 
-    #[inline(always)]
-    fn print_red(&self) {
-        print!("\x1b\x5b\x31\x3b\x33\x31\x6d");
-    }
-
     #[inline(always)]
     fn print_neutral(&self) {
         print!("\x1b\x5b\x31\x3b\x30\x6d");
@@ -233,14 +129,12 @@ impl SField {
 
     #[inline(always)]
     fn print(&self) {
-        for i in 0..self.num_fields {
+        for i in 0..NUM_FIELDS {
-            if i != 0 && i % self.size == 0 {
+            if i != 0 && i % SIZE == 0 {
                 println!();
             }
 
-            if i == self.pos_last_placed {
+            if i == self.pos {
-                self.print_red();
-            } else if i == self.pos {
                 self.print_green();
             } else if self.get_field_at_pos(i) == 0 {
                 self.print_gray();
@@ -248,7 +142,7 @@ impl SField {
 
             print!("{:2} ", self.get_field_at_pos(i));
 
-            if i == self.pos || i == self.pos_last_placed || self.get_field_at_pos(i) == 0 {
+            if i == self.pos || self.get_field_at_pos(i) == 0 {
                 self.print_neutral();
             }
         }
@@ -288,7 +182,7 @@ impl SField {
     fn _put_valid_nr(&mut self) -> bool {
         let current_nr = self.get_field_at_pos(self.pos);
 
-        for nr in current_nr..(self.size + 1) as u8 {
+        for nr in current_nr..(SIZE + 1) as u8 {
             if self.ok(nr) {
                 self.set(nr);
                 return true;
@@ -332,8 +226,8 @@ impl SField {
 
     #[inline(always)]
     fn _pos_to_xy(&self) -> (usize, usize) {
-        let y = self.pos / self.size;
+        let y = self.pos / SIZE;
-        let x = self.pos % self.size;
+        let x = self.pos % SIZE;
         (x + 1, y + 1)
     }
 
@@ -357,32 +251,31 @@ impl SField {
     #[inline(always)]
     fn set(&mut self, nr: u8) {
         self.field[self.pos] = nr;
-        self.pos_last_placed = self.pos;
     }
 
     #[inline(always)]
     fn get_row(&self, row: &mut [u8; SIZE]) {
         for (idx, row_elem) in row.iter_mut().enumerate() {
-            *row_elem = self.get_field_at_pos((self.pos / self.size) * self.size + idx);
+            *row_elem = self.get_field_at_pos((self.pos / SIZE) * SIZE + idx);
         }
     }
 
     #[inline(always)]
     fn get_col(&self, col: &mut [u8; SIZE]) {
         for (idx, col_elem) in col.iter_mut().enumerate() {
-            *col_elem = self.get_field_at_pos(idx * self.size + self.pos % self.size);
+            *col_elem = self.get_field_at_pos(idx * SIZE + self.pos % SIZE);
         }
     }
 
     #[inline(always)]
     fn get_block(&self, block: &mut [u8; SIZE]) {
-        let block_start_row = self.pos / self.size / self.block_size * self.block_size;
+        let block_start_row = self.pos / SIZE / BLOCK_SIZE * BLOCK_SIZE;
-        let block_start_col = self.pos % self.size / self.block_size * self.block_size;
+        let block_start_col = self.pos % SIZE / BLOCK_SIZE * BLOCK_SIZE;
 
-        for r in 0..self.block_size {
+        for r in 0..BLOCK_SIZE {
-            for c in 0..self.block_size {
+            for c in 0..BLOCK_SIZE {
-                block[r * self.block_size + c] =
+                block[r * BLOCK_SIZE + c] =
-                    self.get_field_at_pos(self.size * (block_start_row + r) + block_start_col + c);
+                    self.get_field_at_pos(SIZE * (block_start_row + r) + block_start_col + c);
             }
         }
     }
@@ -410,7 +303,7 @@ impl SField {
 
     #[inline(always)]
     fn next(&mut self) -> bool {
-        if self.pos == self.num_fields - 1 {
+        if self.pos == NUM_FIELDS - 1 {
             return false;
         }