[fix] simulated anneal always accepts first iter (#153)

* [fix] simulated anneal always accepts first iter * [mod] updated changelog
argmin-rs · Dec 2, 2021 · f5ffe75 · f5ffe75
1 parent 7484b20
commit f5ffe75
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## argmin unreleased (xx xxxxxx xxxx)
+
+- Fixed simulated annealing always accepting the first iteration (#153, @dariogoetz)
+
 ## argmin v0.4.7 (14 August 2021)
 
 - Moved to Github actions (#130, @stefan-k)

diff --git a/src/solver/simulatedannealing/mod.rs b/src/solver/simulatedannealing/mod.rs
@@ -234,17 +234,23 @@ where
     const NAME: &'static str = "Simulated Annealing";
     fn init(
         &mut self,
-        _op: &mut OpWrapper<O>,
-        _state: &IterState<O>,
+        op: &mut OpWrapper<O>,
+        state: &IterState<O>,
     ) -> Result<Option<ArgminIterData<O>>, Error> {
-        Ok(Some(ArgminIterData::new().kv(make_kv!(
-            "initial_temperature" => self.init_temp;
-            "stall_iter_accepted_limit" => self.stall_iter_accepted_limit;
-            "stall_iter_best_limit" => self.stall_iter_best_limit;
-            "reanneal_fixed" => self.reanneal_fixed;
-            "reanneal_accepted" => self.reanneal_accepted;
-            "reanneal_best" => self.reanneal_best;
-        ))))
+        let cost = op.apply(&state.get_param())?;
+        Ok(Some(
+            ArgminIterData::new()
+                .param(state.get_param())
+                .cost(cost)
+                .kv(make_kv!(
+                    "initial_temperature" => self.init_temp;
+                    "stall_iter_accepted_limit" => self.stall_iter_accepted_limit;
+                    "stall_iter_best_limit" => self.stall_iter_best_limit;
+                    "reanneal_fixed" => self.reanneal_fixed;
+                    "reanneal_accepted" => self.reanneal_accepted;
+                    "reanneal_best" => self.reanneal_best;
+                )),
+        ))
     }
 
     /// Perform one iteration of SA algorithm