Merge pull request #1310 from YuliaProkopovych/opt-tools

READY(optimization_tools): Fix warnings

Cargo.toml

@@ -472,8 +472,3 @@ default-features = true
 version = "~0.3.0"
 path = "module/test/c"
 default-features = true
-
-
-[patch.crates-io]
-pathfinder_geometry = { git = "https://github.com/servo/pathfinder.git" }
-pathfinder_simd = { git = "https://github.com/servo/pathfinder.git" }

module/move/optimization_tools/.cargo/config.toml

@@ -0,0 +1,3 @@
+[patch.crates-io]
+pathfinder_geometry = { git = "https://github.com/servo/pathfinder.git" }
+pathfinder_simd = { git = "https://github.com/servo/pathfinder.git" }

module/move/optimization_tools/Cargo.toml

@@ -33,8 +33,8 @@ full = [
 enabled = []
 rapidity_6 = [] # to enable slow tests
 static_plot = []
-dynamic_plot = [ "static_plot", "plotters-backend", "piston_window" ]
-lp_parse = [ "exmex" ]
+dynamic_plot = [ "static_plot", "dep:plotters-backend", "dep:piston_window" ]
+lp_parse = [ "dep:exmex" ]
 
 [dependencies]
 derive_tools = { workspace = true, features = [ "derive_more", "full", "strum" ] }

module/move/optimization_tools/src/problems/sudoku/sudoku.rs

@@ -12,28 +12,11 @@ use iter_tools::Itertools;
 trait BoardExt
 {
   /// Validate that each bloack has at least one non-fixed cell.
-  fn validate_each_block_has_non_fixed_cell( &self ) -> bool;
   fn validate_block_has_non_fixed_cells( &self, block : BlockIndex ) -> bool;
 }
 
 impl BoardExt for Board
 {
-  fn validate_each_block_has_non_fixed_cell( &self ) -> bool
-  {
-    for block in self.blocks()
-    {
-      let fixed = self.block_cells( block )
-      .map( | cell | self.cell( cell ) )
-      .fold( 0, | acc, e | if e == 0.into() { acc + 1 } else { acc } )
-      ;
-      if fixed <= 1 || fixed >= 10
-      {
-        return false;
-      }
-    }
-    true
-  }
-
   fn validate_block_has_non_fixed_cells( &self, block : BlockIndex ) -> bool
   {
     let fixed = self.block_cells( block )

module/move/optimization_tools/tests/ga_optimization.rs

@@ -57,6 +57,7 @@ fn crossover()
 /// cargo test solve_with_ga --release --features rapidity_6
 ///
 #[ cfg( feature = "rapidity_6" ) ]
+#[ ignore ]
 #[ test ]
 fn solve_with_ga()
 {

module/move/optimization_tools/tests/optimization.rs

@@ -61,6 +61,7 @@ fn initial_temperature()
 /// cargo test solve_with_sa --release --features rapidity_6
 ///
 #[ cfg( feature = "rapidity_6" ) ]
+#[ ignore ]
 #[ test ]
 fn solve_with_sa()
 {
@@ -106,6 +107,7 @@ fn solve_with_sa()
 /// cargo test solve_empty_full_block --release --features rapidity_6
 ///
 #[ cfg( feature = "rapidity_6" ) ]
+#[ ignore ]
 #[ test ]
 fn solve_empty_full_block()
 {
@@ -182,6 +184,7 @@ fn solve_empty_full_block()
 /// cargo test time_measure --release --features rapidity_6
 ///
 #[ cfg( feature = "rapidity_6" ) ]
+#[ ignore ]
 #[ test ]
 fn time_measure()
 {

module/move/optimization_tools/tests/traveling_salesman.rs

@@ -82,6 +82,7 @@ fn tsp_person_mutate()
   a_id!( person.route.len() - 1, unique.len() );
 }
 
+#[ ignore ]
 #[ test ]
 fn find_route()
 {