Skip to content

Commit cc1a2a1

Browse files
Jammy2211Jammy2211
authored andcommitted
more iterations update fixes
1 parent 44dabba commit cc1a2a1

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

autofit/non_linear/search/abstract_search.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ def __init__(
209209
else:
210210
self.initializer = initializer
211211

212-
self.iterations_per_quick_update = (iterations_per_quick_update or
213-
conf.instance["general"]["updates"]["iterations_per_quick_update"])
212+
self.iterations_per_quick_update = float((iterations_per_quick_update or
213+
conf.instance["general"]["updates"]["iterations_per_quick_update"]))
214214

215215

216-
self.iterations_per_full_update = (iterations_per_quick_update or
217-
conf.instance["general"]["updates"]["iterations_per_full_update"])
216+
self.iterations_per_full_update = float((iterations_per_quick_update or
217+
conf.instance["general"]["updates"]["iterations_per_full_update"]))
218218

219219
if conf.instance["general"]["hpc"]["hpc_mode"]:
220220
self.iterations_per_quick_update = conf.instance["general"]["hpc"][

test_autofit/non_linear/search/nest/test_dynesty.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test__loads_from_config_file_if_not_input():
3636

3737
search = af.DynestyStatic()
3838

39-
assert search.iterations_per_full_update == 500
39+
assert search.iterations_per_full_update == 1e99
4040

4141
assert search.config_dict_search["nlive"] == 150
4242
assert search.config_dict_run["dlogz"] == None
@@ -57,7 +57,7 @@ def test__loads_from_config_file_if_not_input():
5757

5858
search = af.DynestyDynamic()
5959

60-
assert search.iterations_per_full_update == 501
60+
assert search.iterations_per_full_update == 1e99
6161

6262
assert search.config_dict_search["facc"] == 0.6
6363
assert search.config_dict_run["dlogz_init"] == 0.01

test_autofit/non_linear/search/optimize/test_lbfgs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ def test__loads_from_config_file_correct():
5151
assert search.config_dict_options["maxiter"] == 15000
5252
assert search.config_dict_options["disp"] == False
5353
assert isinstance(search.initializer, af.InitializerPrior)
54-
assert search.iterations_per_full_update == 11
54+
assert search.iterations_per_full_update == 1e99
5555

test_autofit/non_linear/search/optimize/test_pyswarms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test__loads_from_config_file_correct():
3232
assert search.config_dict_search["cognitive"] == 0.1
3333
assert search.config_dict_run["iters"] == 2000
3434
assert isinstance(search.initializer, af.InitializerPrior)
35-
assert search.iterations_per_full_update == 11
35+
assert search.iterations_per_full_update == 1e99
3636
assert search.number_of_cores == 1
3737

3838
search = af.PySwarmsLocal(
@@ -63,7 +63,7 @@ def test__loads_from_config_file_correct():
6363
assert search.config_dict_search["cognitive"] == 0.1
6464
assert search.config_dict_run["iters"] == 2000
6565
assert isinstance(search.initializer, af.InitializerPrior)
66-
assert search.iterations_per_full_update == 11
66+
assert search.iterations_per_full_update == 1e99
6767
assert search.number_of_cores == 1
6868

6969

test_autofit/non_linear/test_dict.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def make_dynesty_dict():
2020
"type": "instance",
2121
},
2222
"inplace": False,
23-
"iterations_per_full_update": 500,
23+
"iterations_per_full_update": 1e99,
2424
"max_move": 100,
2525
"name": "",
2626
"nlive": 150,

0 commit comments

Comments
 (0)