Merge branch 'hotfix/0.12.1'

Cargo.toml

@@ -7,7 +7,7 @@ categories = ["algorithms"]
 repository = "https://github.com/lucidfrontier45/localsearch"
 license-file = "LICENSE"
 readme = "README.md"
-version = "0.12.0"
+version = "0.12.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -19,6 +19,9 @@ rayon = "1.8.0"
 trait-set = "0.3.0"
 auto_impl = "1.1.0"
 
+[target.'cfg(target_family = "wasm")'.dependencies]
+web-time = "1.1.0"
+
 [dev-dependencies]
 approx = "0.5.1"
 indicatif = "0.17.7"

src/lib.rs

@@ -12,6 +12,9 @@ pub use callback::{OptCallbackFn, OptProgress};
 mod model;
 pub use model::OptModel;
 
+mod time_wrapper;
+pub use time_wrapper::{Duration, Instant};
+
 /// Crate verison string
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 

src/optim/base.rs

@@ -1,9 +1,7 @@
-use std::time::Duration;
-
 use auto_impl::auto_impl;
 use trait_set::trait_set;
 
-use crate::{callback::OptCallbackFn, OptModel};
+use crate::{callback::OptCallbackFn, Duration, OptModel};
 
 /// Optimizer that implements local search algorithm
 #[auto_impl(&, Box, Rc, Arc)]

src/optim/epsilon_greedy.rs

@@ -1,6 +1,4 @@
-use std::time::Duration;
-
-use crate::{callback::OptCallbackFn, OptModel};
+use crate::{callback::OptCallbackFn, Duration, OptModel};
 
 use super::{base::LocalSearchOptimizer, GenericLocalSearchOptimizer};
 

src/optim/generic.rs

@@ -1,16 +1,11 @@
-use std::{
-    cell::RefCell,
-    marker::PhantomData,
-    rc::Rc,
-    time::{Duration, Instant},
-};
+use std::{cell::RefCell, marker::PhantomData, rc::Rc};
 
 use rand::Rng;
 use rayon::prelude::*;
 
 use crate::{
     callback::{OptCallbackFn, OptProgress},
-    OptModel,
+    Duration, Instant, OptModel,
 };
 
 use super::{LocalSearchOptimizer, TransitionProbabilityFn};

src/optim/hill_climbing.rs

@@ -1,6 +1,4 @@
-use std::time::Duration;
-
-use crate::{callback::OptCallbackFn, OptModel};
+use crate::{callback::OptCallbackFn, Duration, OptModel};
 
 use super::{EpsilonGreedyOptimizer, LocalSearchOptimizer};
 

src/optim/logistic_annealing.rs

@@ -1,8 +1,6 @@
-use std::time::Duration;
-
 use ordered_float::NotNan;
 
-use crate::{callback::OptCallbackFn, OptModel};
+use crate::{callback::OptCallbackFn, Duration, OptModel};
 
 use super::{GenericLocalSearchOptimizer, LocalSearchOptimizer};
 

src/optim/relative_annealing.rs

@@ -1,8 +1,6 @@
-use std::time::Duration;
-
 use ordered_float::NotNan;
 
-use crate::{callback::OptCallbackFn, OptModel};
+use crate::{callback::OptCallbackFn, Duration, OptModel};
 
 use super::{GenericLocalSearchOptimizer, LocalSearchOptimizer};
 

src/optim/simulated_annealing.rs

@@ -1,16 +1,12 @@
-use std::{
-    cell::RefCell,
-    rc::Rc,
-    time::{Duration, Instant},
-};
+use std::{cell::RefCell, rc::Rc};
 
 use ordered_float::NotNan;
 use rand::Rng;
 use rayon::prelude::*;
 
 use crate::{
     callback::{OptCallbackFn, OptProgress},
-    OptModel,
+    Duration, Instant, OptModel,
 };
 
 use super::LocalSearchOptimizer;

src/optim/tabu_search.rs

@@ -1,16 +1,11 @@
-use std::{
-    cell::RefCell,
-    marker::PhantomData,
-    rc::Rc,
-    time::{Duration, Instant},
-};
+use std::{cell::RefCell, marker::PhantomData, rc::Rc};
 
 use auto_impl::auto_impl;
 use rayon::prelude::*;
 
 use crate::{
     callback::{OptCallbackFn, OptProgress},
-    OptModel,
+    Duration, Instant, OptModel,
 };
 
 use super::LocalSearchOptimizer;

src/time_wrapper.rs

@@ -0,0 +1,5 @@
+#[cfg(not(target_family = "wasm"))]
+pub use std::time::{Duration, Instant};
+
+#[cfg(target_family = "wasm")]
+pub use web_time::{Duration, Instant};