Skip to content

Commit 97eef7b

Browse files
bartzbeielsteinbartzbeielstein
committed
0.24.5
1 parent 7d19b05 commit 97eef7b

5 files changed

Lines changed: 24 additions & 36 deletions

File tree

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
77

88
[project]
99
name = "spotpython"
10-
version = "0.24.4"
10+
version = "0.24.5"
1111
authors = [
1212
{ name="T. Bartz-Beielstein", email="tbb@bartzundbartz.de" }
1313
]

‎src/spotpython/fun/hyperlight.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def fun(self, X: np.ndarray, fun_control: dict = None) -> np.ndarray:
109109
from spotpython.hyperdict.light_hyper_dict import LightHyperDict
110110
from spotpython.fun.hyperlight import HyperLight
111111
from spotpython.utils.init import fun_control_init
112-
from spotpython.utils.eda import gen_design_table
112+
from spotpython.utils.eda import print_exp_table
113113
from spotpython.spot import spot
114114
from spotpython.hyperparameters.values import get_default_hyperparameters_as_array
115115
PREFIX="000"
@@ -127,7 +127,7 @@ def fun(self, X: np.ndarray, fun_control: dict = None) -> np.ndarray:
127127
TENSORBOARD_CLEAN=True,
128128
tensorboard_log=True,
129129
seed=42,)
130-
print(gen_design_table(fun_control))
130+
print_exp_table(fun_control)
131131
X = get_default_hyperparameters_as_array(fun_control)
132132
# set epochs to 2^8:
133133
X[0, 1] = 8

‎src/spotpython/hyperparameters/values.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,16 +1603,16 @@ def set_int_hyperparameter_values(fun_control, key, lower, upper) -> None:
16031603
>>> from spotriver.hyperdict.river_hyper_dict import RiverHyperDict
16041604
from spotpython.utils.init import fun_control_init
16051605
from spotpython.hyperparameters.values import set_int_hyperparameter_values
1606-
from spotpython.utils.eda import gen_design_table
1606+
from spotpython.utils.eda import print_exp_table
16071607
fun_control = fun_control_init(
16081608
core_model_name="forest.AMFRegressor",
16091609
hyperdict=RiverHyperDict,
16101610
)
16111611
print("Before modification:")
1612-
print(gen_design_table(fun_control))
1612+
print_exp_table(fun_control)
16131613
set_int_hyperparameter_values(fun_control, "n_estimators", 2, 5)
16141614
print("After modification:")
1615-
print(gen_design_table(fun_control))
1615+
print_exp_table(fun_control)
16161616
Seed set to 123
16171617
Before modification:
16181618
| name | type | default | lower | upper | transform |
@@ -1659,16 +1659,16 @@ def set_float_hyperparameter_values(fun_control, key, lower, upper) -> None:
16591659
>>> from spotriver.hyperdict.river_hyper_dict import RiverHyperDict
16601660
from spotpython.utils.init import fun_control_init
16611661
from spotpython.hyperparameters.values import set_float_hyperparameter_values
1662-
from spotpython.utils.eda import gen_design_table
1662+
from spotpython.utils.eda import print_exp_table
16631663
fun_control = fun_control_init(
16641664
core_model_name="forest.AMFRegressor",
16651665
hyperdict=RiverHyperDict,
16661666
)
16671667
print("Before modification:")
1668-
print(gen_design_table(fun_control))
1668+
print_exp_table(fun_control)
16691669
set_float_hyperparameter_values(fun_control, "step", 0.2, 5)
16701670
print("After modification:")
1671-
print(gen_design_table(fun_control))
1671+
print_exp_table(fun_control)
16721672
Seed set to 123
16731673
"""
16741674
set_control_hyperparameter_value(
@@ -1699,16 +1699,16 @@ def set_boolean_hyperparameter_values(fun_control, key, lower, upper):
16991699
>>> from spotriver.hyperdict.river_hyper_dict import RiverHyperDict
17001700
from spotpython.utils.init import fun_control_init
17011701
from spotpython.hyperparameters.values import set_boolean_hyperparameter_values
1702-
from spotpython.utils.eda import gen_design_table
1702+
from spotpython.utils.eda import print_exp_table
17031703
fun_control = fun_control_init(
17041704
core_model_name="forest.AMFRegressor",
17051705
hyperdict=RiverHyperDict,
17061706
)
17071707
print("Before modification:")
1708-
print(gen_design_table(fun_control))
1708+
print_exp_table(fun_control)
17091709
set_boolean_hyperparameter_values(fun_control, "use_aggregation", 0, 0)
17101710
print("After modification:")
1711-
print(gen_design_table(fun_control))
1711+
print_exp_table(fun_control)
17121712
Seed set to 123
17131713
Before modification:
17141714
| name | type | default | lower | upper | transform |
@@ -1753,17 +1753,17 @@ def set_factor_hyperparameter_values(fun_control, key, levels):
17531753
>>> from spotriver.hyperdict.river_hyper_dict import RiverHyperDict
17541754
from spotpython.utils.init import fun_control_init
17551755
from spotpython.hyperparameters.values import set_factor_hyperparameter_values
1756-
from spotpython.utils.eda import gen_design_table
1756+
from spotpython.utils.eda import print_exp_table
17571757
fun_control = fun_control_init(
17581758
core_model_name="tree.HoeffdingTreeRegressor",
17591759
hyperdict=RiverHyperDict,
17601760
)
17611761
print("Before modification:")
1762-
print(gen_design_table(fun_control))
1762+
print_exp_tablefun_control)
17631763
set_factor_hyperparameter_values(fun_control, "leaf_model", ['LinearRegression',
17641764
'Perceptron'])
17651765
print("After modification:")
1766-
print(gen_design_table(fun_control))
1766+
print_exp_table(fun_control))
17671767
Seed set to 123
17681768
Before modification:
17691769
| name | type | default | lower | upper | transform |

‎src/spotpython/light/trainmodel.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def train_model(config: dict, fun_control: dict, timestamp: bool = True) -> floa
7070
from spotpython.data.diabetes import Diabetes
7171
from spotpython.hyperdict.light_hyper_dict import LightHyperDict
7272
from spotpython.utils.init import fun_control_init
73-
from spotpython.utils.eda import gen_design_table
73+
from spotpython.utils.eda import print_exp_table
7474
from spotpython.hyperparameters.values import get_default_hyperparameters_as_array
7575
from spotpython.hyperparameters.values import assign_values, generate_one_config_from_var_dict, get_var_name
7676
from spotpython.light.trainmodel import train_model
@@ -90,7 +90,7 @@ def train_model(config: dict, fun_control: dict, timestamp: bool = True) -> floa
9090
TENSORBOARD_CLEAN=True,
9191
tensorboard_log=True,
9292
seed=42,)
93-
print(gen_design_table(fun_control))
93+
print_exp_table(fun_control)
9494
X = get_default_hyperparameters_as_array(fun_control)
9595
# set epochs to 2^8:
9696
# X[0, 1] = 8

‎src/spotpython/utils/eda.py‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def print_exp_table(fun_control: dict, tablefmt="github", print_tab=True) -> str
6161
(str):
6262
a table with the design variables, their default values, and their bounds.
6363
Use the `print` function to display the table.
64-
64+
6565
Examples:
6666
>>> from spotpython.data.diabetes import Diabetes
6767
from spotpython.hyperdict.light_hyper_dict import LightHyperDict
@@ -160,7 +160,7 @@ def print_res_table(spot: object = None, tablefmt="github", print_tab=True) -> s
160160
fun = HyperLight().fun
161161
S = Spot(fun=fun, fun_control=fun_control, design_control=design_control)
162162
S.run()
163-
print_res_table(S)
163+
print_res_table(S)
164164
| name | type | default | lower | upper | tuned | transform | importance | stars |
165165
|----------------|--------|-----------|---------|---------|----------------------|-----------------------|--------------|---------|
166166
| l1 | int | 3 | 1.0 | 2.0 | 2.0 | transform_power_2_int | 29.49 | * |
@@ -180,8 +180,11 @@ def print_res_table(spot: object = None, tablefmt="github", print_tab=True) -> s
180180
# try spot.print_results. If it fails, issue an error message that asked to run the spot object first
181181
try:
182182
res = spot.print_results(print_screen=False, dict=fun_control)
183-
except:
184-
print("Did you run the spot object?")
183+
except AttributeError as e:
184+
print(f"AttributeError: {e}. Did you run the spot object?")
185+
return
186+
except Exception as e:
187+
print(f"An unexpected error occurred: {e}")
185188
return
186189
tuned = [item[1] for item in res]
187190
importance = spot.get_importance()
@@ -223,21 +226,6 @@ def gen_design_table(fun_control: dict, spot: object = None, tablefmt="github")
223226
the table will also include the value and the importance of each hyperparameter.
224227
Use the `print` function to display the table.
225228
226-
Examples:
227-
>>> from spotpython.utils.eda import gen_design_table
228-
>>> from spotpython.hyperparameters.values import get_default_values
229-
>>> fun_control = {
230-
... "x1": {"type": "int", "default": 1, "lower": 1, "upper": 10},
231-
... "x2": {"type": "int", "default": 1, "lower": 1, "upper": 10},
232-
... "x3": {"type": "int", "default": 1, "lower": 1, "upper": 10},
233-
... "x4": {"type": "int", "default": 1, "lower": 1, "upper": 10},
234-
... "x5": {"type": "int", "default": 1, "lower": 1, "upper": 10},
235-
... "x6": {"type": "int", "default": 1, "lower": 1, "upper": 10},
236-
... "x7": {"type": "int", "default": 1, "lower": 1, "upper": 10},
237-
... "x8": {"type": "int", "default": 1, "lower": 1, "upper": 10},
238-
... "x9": {"type": "int", "default": 1, "lower": 1, "upper": 10},
239-
... "x10": {"type": "int", "default": 1, "lower": 1, "upper": 10},
240-
... }
241229
"""
242230
default_values = get_default_values(fun_control)
243231
defaults = list(default_values.values())

0 commit comments

Comments
 (0)