Merge pull request #1306 from YuliaProkopovych/opt-tools

NOT READY(optimization_tools): Fix failing tests
Wandalen · Apr 29, 2024 · a8a634d · a8a634d
2 parents 97ea2e7 + 837018b
commit a8a634d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/module/move/optimization_tools/Cargo.toml b/module/move/optimization_tools/Cargo.toml
@@ -48,16 +48,15 @@ rand = "0.8.5"
 statrs = "0.16.0"
 faer = { version = "0.16.0", features = [ "ndarray" ] }
 ndarray = "0.15.6"
-plotters = { git = "https://github.com/plotters-rs/plotters.git" }
-# plotters = { version = "0.3.5", default-features=false, features = [
-#   "bitmap_encoder",
-#   "ttf",
-#   "area_series",
-#   "point_series",
-#   "line_series",
-#   "full_palette",
-#   "bitmap_backend",
-# ] }
+plotters = { version = "0.3.5", default-features=false, features = [
+  "bitmap_encoder",
+  "ttf",
+  "area_series",
+  "point_series",
+  "line_series",
+  "full_palette",
+  "bitmap_backend",
+] }
 plotters-backend = { version = "0.3.5", optional = true }
 piston_window = { version = "0.120.0", optional = true }
 exmex = { version = "0.18.0", features = [ "partial" ], optional = true }

diff --git a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
@@ -4,7 +4,10 @@
 
 use std::
 {
-  collections::HashMap, fs::{ File, OpenOptions }, ops::{ Bound, RangeBounds }, sync::{ Arc, Mutex }
+  collections::HashMap,
+  fs::{ File, OpenOptions },
+  ops::{ Bound, RangeBounds },
+  sync::{ Arc, Mutex },
 };
 use deterministic_rand::{ Hrng, Seed, Rng };
 use iter_tools::Itertools;

diff --git a/module/move/optimization_tools/tests/simplex.rs b/module/move/optimization_tools/tests/simplex.rs
@@ -112,6 +112,8 @@ fn problem_5_vars()
   assert_eq!( solution[ 0 ].point, vec![ 300.0, 400.0, 300.0, 0.0, 0.0 ] )
 }
 
+// for issue https://github.com/plotters-rs/plotters/issues/573
+#[ cfg( not( all( debug_assertions, target_os = "linux" ) ) ) ]
 #[ test ]
 fn problem_draw() 
 {