SearchLibrium 0.0.95__tar.gz → 0.0.97__tar.gz

{searchlibrium-0.0.95 → searchlibrium-0.0.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SearchLibrium
-Version: 0.0.95
+Version: 0.0.97
 Summary: A Python package for econometric models driven by search
 Author: Alexander Paz Prithvi Beeramole, Robert Burdett
 Author-email: Zeke Ahern <z.ahern@qut.edu.au>

{searchlibrium-0.0.95 → searchlibrium-0.0.97}/pyproject.toml

@@ -60,7 +60,7 @@ Homepage = "https://github.com/zahern/HypothesisX"
 realpython = "SearchLibrium.__main__:main"
 
 [tool.bumpver]
-current_version = "0.0.95"
+current_version = "0.0.97"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "[skip ci] Bump version {old_version} -> {new_version}"
 commit = true

{searchlibrium-0.0.95 → searchlibrium-0.0.97}/src/SearchLibrium/call_meta.py

@@ -94,20 +94,20 @@ def estimate_ctrl(parameters, algorithm='sa'):
 
         if c < 50:
             tI, tF            = 500,   0.01
-            max_temp_steps    = 50
-            max_iter          = 10
+            max_temp_steps    = 100
+            max_iter          = 20
         elif c < 200:
             tI, tF            = 1000,  0.001
-            max_temp_steps    = 100
-            max_iter          = 15
+            max_temp_steps    = 200
+            max_iter          = 30
         elif c < 600:
             tI, tF            = 2000,  0.001
-            max_temp_steps    = 150
-            max_iter          = 20
+            max_temp_steps    = 250
+            max_iter          = 40
         else:
             tI, tF            = 5000,  0.0001
-            max_temp_steps    = 250
-            max_iter          = 30
+            max_temp_steps    = 300
+            max_iter          = 50
 
         ctrl = (tI, tF, max_temp_steps, max_iter)
 

{searchlibrium-0.0.95 → searchlibrium-0.0.97}/src/SearchLibrium/siman.py

@@ -335,8 +335,8 @@ class SA(Search):
 
         self.start_time = time.time()
         # Set parameters:
-        self.max_time = kwargs.get('max_time', 43200)    # Maximum Allowable Run Time (12 h default)
-        self.max_total_iter = kwargs.get('max_total_iter', 1000)
+        self.max_time = kwargs.get('max_time', float('inf'))          # Maximum Allowable Run Time (no limit by default)
+        self.max_total_iter = kwargs.get('max_total_iter', 100000)     # Maximum total temperature steps
         self.tI = tI                # Starting temperature
         self.tF = tF                # Final temperature
         self.max_temp_steps = max_temp_steps    # Maximum number of temperature steps
@@ -1194,8 +1194,8 @@ class SA(Search):
         #if (self.step) % 2:
         #    self.best_sol = self.improve(self.best_sol)  # Apply local improvement
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        self.report_progress(self.progress_file)  # Report current state
-        self.report_progress()  # Report to the screen
+        self.report_progress(self.results_file)  # text narrative → results.txt
+        self.report_progress()                   # CSV row → progress.csv + text to stdout
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         self.t = self.rate * self.t  # Reduce the temperature accordingly
 

searchlibrium-0.0.97/src/SearchLibrium/version.txt

@@ -0,0 +1 @@
+0.0.97

{searchlibrium-0.0.95 → searchlibrium-0.0.97}/src/SearchLibrium.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SearchLibrium
-Version: 0.0.95
+Version: 0.0.97
 Summary: A Python package for econometric models driven by search
 Author: Alexander Paz Prithvi Beeramole, Robert Burdett
 Author-email: Zeke Ahern <z.ahern@qut.edu.au>

searchlibrium-0.0.95/src/SearchLibrium/version.txt

@@ -1 +0,0 @@
-0.0.95