SearchLibrium 0.0.210__tar.gz → 0.0.211__tar.gz

{searchlibrium-0.0.210/src/SearchLibrium.egg-info → searchlibrium-0.0.211}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SearchLibrium
-Version: 0.0.210
+Version: 0.0.211
 Summary: Automated specification search for discrete choice models (logit, mixed logit, nested logit, RRM and more) using metaheuristic optimisation
 Author: Mario Fernando Taco Morales, Alexander Paz, Prithvi Beeramole, Robert Burdett
 Author-email: Zeke Ahern <z.ahern@qut.edu.au>

{searchlibrium-0.0.210 → searchlibrium-0.0.211}/pyproject.toml

@@ -100,7 +100,7 @@ Documentation = "https://pypi.org/project/SearchLibrium/"
 realpython = "SearchLibrium.__main__:main"
 
 [tool.bumpver]
-current_version = "0.0.210"
+current_version = "0.0.211"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "[skip ci] Bump version {old_version} -> {new_version}"
 commit = true

{searchlibrium-0.0.210 → searchlibrium-0.0.211}/src/SearchLibrium/hspbil.py

@@ -103,9 +103,9 @@ class HSPBIL(HarmonySearch):
             self.results_file = open(f"hspbil_results.txt", "w")
 
         try:
-            self.progress_file = open(f"{run_name}_progress.txt", "w")
+            self.progress_file = open(f"{run_name}_progress.csv", "w")
         except Exception:
-            self.progress_file = open(f"hspbil_progress.txt", "w")
+            self.progress_file = open(f"hspbil_progress.csv", "w")
 
         print("SearchLibrium - HS+PBIL Run", file=self.results_file)
         print(f"Run ID: {run_id}", file=self.results_file)
@@ -113,7 +113,8 @@ class HSPBIL(HarmonySearch):
         print("-" * 72, file=self.results_file)
         self.results_file.flush()
 
-        print("iteration,score", file=self.progress_file)
+        crit_names = [c[0] for c in self.param.criterions[:self.nb_crit]]
+        print("iteration," + ",".join(crit_names), file=self.progress_file)
         self.progress_file.flush()
 
     # ------------------------------------------------------------------
@@ -285,6 +286,21 @@ class HSPBIL(HarmonySearch):
                 except Exception:
                     pass
 
+            # Log per-iteration best objective values
+            try:
+                crit_names = [c[0] for c in self.param.criterions[:self.nb_crit]]
+                _best = {}
+                for sol in self.memory:
+                    for cn in crit_names:
+                        v = float(sol.get(cn, float('inf')))
+                        if cn not in _best or abs(v) < abs(_best[cn]):
+                            _best[cn] = v
+                _vals = ','.join(str(_best.get(cn, '')) for cn in crit_names)
+                print(f"{iter},{_vals}", file=self.progress_file)
+                self.progress_file.flush()
+            except Exception:
+                pass
+
         all_val, obj_val = self.log_convergence(self.memory)
         if self.generate_plots:
             try:

searchlibrium-0.0.211/src/SearchLibrium/version.txt

@@ -0,0 +1 @@
+0.0.211

{searchlibrium-0.0.210 → searchlibrium-0.0.211/src/SearchLibrium.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SearchLibrium
-Version: 0.0.210
+Version: 0.0.211
 Summary: Automated specification search for discrete choice models (logit, mixed logit, nested logit, RRM and more) using metaheuristic optimisation
 Author: Mario Fernando Taco Morales, Alexander Paz, Prithvi Beeramole, Robert Burdett
 Author-email: Zeke Ahern <z.ahern@qut.edu.au>

searchlibrium-0.0.210/src/SearchLibrium/version.txt

@@ -1 +0,0 @@
-0.0.210