|
46 | 46 | "metrics": [{"goal": "MAXIMIZE", "metric": "accuracy"}],
|
47 | 47 | "parameters": [
|
48 | 48 | {
|
| 49 | + "integer_value_spec": {"max_value": 4, "min_value": 1}, |
49 | 50 | "parameter": "units",
|
50 | 51 | "type": "INTEGER",
|
51 |
| - "integer_value_spec": {"min_value": 1, "max_value": 4}, |
52 |
| - "scale_type": "UNIT_LINEAR_SCALE", |
53 | 52 | }
|
54 | 53 | ],
|
55 | 54 | }
|
56 | 55 | STUDY_CONFIG_INT_STEP = {
|
57 | 56 | "metrics": [{"goal": "MAXIMIZE", "metric": "accuracy"}],
|
58 | 57 | "parameters": [
|
59 | 58 | {
|
| 59 | + "discrete_value_spec": {"values": [32, 64, 96, 128]}, |
60 | 60 | "parameter": "units",
|
61 | 61 | "type": "DISCRETE",
|
62 |
| - "discrete_value_spec": {"values": [32, 64, 96, 128]}, |
63 | 62 | }
|
64 | 63 | ],
|
65 | 64 | }
|
|
70 | 69 | "double_value_spec": {"max_value": 0.5, "min_value": 0.1},
|
71 | 70 | "parameter": "learning_rate",
|
72 | 71 | "type": "DOUBLE",
|
73 |
| - "scale_type": "UNIT_LINEAR_SCALE", |
74 | 72 | }
|
75 | 73 | ],
|
76 | 74 | }
|
|
121 | 119 | "metrics": [{"goal": "MAXIMIZE", "metric": "accuracy"}],
|
122 | 120 | "parameters": [
|
123 | 121 | {
|
| 122 | + "double_value_spec": {"max_value": 1.57, "min_value": 0.0}, |
124 | 123 | "parameter": "theta",
|
125 | 124 | "type": "DOUBLE",
|
126 |
| - "double_value_spec": {"min_value": 0.0, "max_value": 1.57}, |
127 |
| - "scale_type": "UNIT_LINEAR_SCALE", |
128 | 125 | },
|
129 | 126 | {
|
| 127 | + "double_value_spec": {"max_value": 1.0, "min_value": 0.0}, |
130 | 128 | "parameter": "r",
|
131 | 129 | "type": "DOUBLE",
|
132 |
| - "double_value_spec": {"min_value": 0.0, "max_value": 1.0}, |
133 |
| - "scale_type": "UNIT_LINEAR_SCALE", |
134 | 130 | },
|
135 | 131 | ],
|
136 | 132 | }
|
@@ -249,8 +245,8 @@ def test_convert_study_config_int(self, min_value, max_value, step,
|
249 | 245 | self._assert_hps_equal(actual_hps, hps)
|
250 | 246 |
|
251 | 247 | @parameterized.parameters(
|
252 |
| - (0.1, 0.5, None, "linear", STUDY_CONFIG_FLOAT), |
253 |
| - (1, 2, 0.25, "linear", STUDY_CONFIG_FLOAT_STEP), |
| 248 | + (0.1, 0.5, None, None, STUDY_CONFIG_FLOAT), |
| 249 | + (1, 2, 0.25, None, STUDY_CONFIG_FLOAT_STEP), |
254 | 250 | (0.1, 0.8, None, "linear", STUDY_CONFIG_FLOAT_LINEAR_SCALE),
|
255 | 251 | (1e-4, 1e-1, None, "log", STUDY_CONFIG_FLOAT_LOG_SCALE),
|
256 | 252 | (1e-4, 1e-1, None, "reverse_log", STUDY_CONFIG_FLOAT_REVERSE_LOG_SCALE))
|
|
0 commit comments