SearchLibrium 0.0.96__tar.gz → 0.0.97__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/PKG-INFO +1 -1
  2. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/pyproject.toml +1 -1
  3. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/call_meta.py +8 -8
  4. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/siman.py +2 -2
  5. searchlibrium-0.0.97/src/SearchLibrium/version.txt +1 -0
  6. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium.egg-info/PKG-INFO +1 -1
  7. searchlibrium-0.0.96/src/SearchLibrium/version.txt +0 -1
  8. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/README.md +0 -0
  9. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/setup.cfg +0 -0
  10. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/Halton.py +0 -0
  11. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/MixedLogit.py +0 -0
  12. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/Mode_Activity_Nested.py +0 -0
  13. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/RandomP.py +0 -0
  14. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/SEARCH_SM_MARIO.py +0 -0
  15. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/Two_Level_Nest.py +0 -0
  16. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/__init__.py +0 -0
  17. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/__main__.py +0 -0
  18. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/_choice_model.py +0 -0
  19. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/_device.py +0 -0
  20. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/banditsa.py +0 -0
  21. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/bhhh/minimize.py +0 -0
  22. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/boxcox_functions.py +0 -0
  23. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/constraints_builder.py +0 -0
  24. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/harmony.py +0 -0
  25. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/latent_class.py +0 -0
  26. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/main.py +0 -0
  27. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/main_debug.py +0 -0
  28. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/mdcev.py +0 -0
  29. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/misc.py +0 -0
  30. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/mixed_logit.py +0 -0
  31. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/mixed_nested.py +0 -0
  32. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/mixedrrm.py +0 -0
  33. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/multinomial_logit.py +0 -0
  34. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/multinomial_nested.py +0 -0
  35. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/multinomial_probit.py +0 -0
  36. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/ordered_logit.py +0 -0
  37. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/ordered_logit_mixed.py +0 -0
  38. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/rrm.py +0 -0
  39. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/sapbil.py +0 -0
  40. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/search.py +0 -0
  41. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/selection_models.py +0 -0
  42. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/setup.py +0 -0
  43. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/test_lc_de.py +0 -0
  44. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/test_mario_searches.py +0 -0
  45. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/test_sapbil_vs_banditsa.py +0 -0
  46. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium/threshold.py +0 -0
  47. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium.egg-info/SOURCES.txt +0 -0
  48. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium.egg-info/dependency_links.txt +0 -0
  49. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium.egg-info/entry_points.txt +0 -0
  50. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium.egg-info/requires.txt +0 -0
  51. {searchlibrium-0.0.96 → searchlibrium-0.0.97}/src/SearchLibrium.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: SearchLibrium
3
- Version: 0.0.96
3
+ Version: 0.0.97
4
4
  Summary: A Python package for econometric models driven by search
5
5
  Author: Alexander Paz Prithvi Beeramole, Robert Burdett
6
6
  Author-email: Zeke Ahern <z.ahern@qut.edu.au>
@@ -60,7 +60,7 @@ Homepage = "https://github.com/zahern/HypothesisX"
60
60
  realpython = "SearchLibrium.__main__:main"
61
61
 
62
62
  [tool.bumpver]
63
- current_version = "0.0.96"
63
+ current_version = "0.0.97"
64
64
  version_pattern = "MAJOR.MINOR.PATCH"
65
65
  commit_message = "[skip ci] Bump version {old_version} -> {new_version}"
66
66
  commit = true
@@ -94,20 +94,20 @@ def estimate_ctrl(parameters, algorithm='sa'):
94
94
 
95
95
  if c < 50:
96
96
  tI, tF = 500, 0.01
97
- max_temp_steps = 50
98
- max_iter = 10
97
+ max_temp_steps = 100
98
+ max_iter = 20
99
99
  elif c < 200:
100
100
  tI, tF = 1000, 0.001
101
- max_temp_steps = 100
102
- max_iter = 15
101
+ max_temp_steps = 200
102
+ max_iter = 30
103
103
  elif c < 600:
104
104
  tI, tF = 2000, 0.001
105
- max_temp_steps = 150
106
- max_iter = 20
105
+ max_temp_steps = 250
106
+ max_iter = 40
107
107
  else:
108
108
  tI, tF = 5000, 0.0001
109
- max_temp_steps = 250
110
- max_iter = 30
109
+ max_temp_steps = 300
110
+ max_iter = 50
111
111
 
112
112
  ctrl = (tI, tF, max_temp_steps, max_iter)
113
113
 
@@ -1194,8 +1194,8 @@ class SA(Search):
1194
1194
  #if (self.step) % 2:
1195
1195
  # self.best_sol = self.improve(self.best_sol) # Apply local improvement
1196
1196
  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1197
- self.report_progress(self.progress_file) # Report current state
1198
- self.report_progress() # Report to the screen
1197
+ self.report_progress(self.results_file) # text narrative → results.txt
1198
+ self.report_progress() # CSV row → progress.csv + text to stdout
1199
1199
  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1200
1200
  self.t = self.rate * self.t # Reduce the temperature accordingly
1201
1201
 
@@ -0,0 +1 @@
1
+ 0.0.97
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: SearchLibrium
3
- Version: 0.0.96
3
+ Version: 0.0.97
4
4
  Summary: A Python package for econometric models driven by search
5
5
  Author: Alexander Paz Prithvi Beeramole, Robert Burdett
6
6
  Author-email: Zeke Ahern <z.ahern@qut.edu.au>
@@ -1 +0,0 @@
1
- 0.0.96
File without changes
File without changes