diff --git a/tests/googletest/descriptor_identification/model/test_model_log_regressor_fit_c.cc b/tests/googletest/descriptor_identification/model/test_model_log_regressor_fit_c.cc index d4abfa579255219a38627a42d076d0f0a6adecf1..a36f5dff1d507dd657e74bf7410d5364d5edfa21 100644 --- a/tests/googletest/descriptor_identification/model/test_model_log_regressor_fit_c.cc +++ b/tests/googletest/descriptor_identification/model/test_model_log_regressor_fit_c.cc @@ -12,7 +12,7 @@ namespace _task_sizes_train = {10}; _task_sizes_test = {2}; - nlopt_wrapper::setup_data(_task_sizes_train, 2, 0); + nlopt_wrapper::setup_data(_task_sizes_train, 2, 0, false); std::vector<double> value_1 = {1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0}; std::vector<double> test_value_1 = {1.0, 7.0}; diff --git a/tests/googletest/descriptor_identification/sisso_regressor/test_sisso_log_regressor_fit_c.cc b/tests/googletest/descriptor_identification/sisso_regressor/test_sisso_log_regressor_fit_c.cc index b15f8169da2cfc4077de75fc2b465def2c4a79ba..4ee0b3acffb1925324af3cbebd75da3c599dbc82 100644 --- a/tests/googletest/descriptor_identification/sisso_regressor/test_sisso_log_regressor_fit_c.cc +++ b/tests/googletest/descriptor_identification/sisso_regressor/test_sisso_log_regressor_fit_c.cc @@ -19,7 +19,7 @@ namespace _task_sizes_train = {90}; _task_sizes_test = {10}; _leave_out_inds = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - nlopt_wrapper::setup_data(_task_sizes_train, 2, 0); + nlopt_wrapper::setup_data(_task_sizes_train, 2, 0, false); std::vector<double> value_1(90, 0.0); std::vector<double> value_2(90, 0.0); diff --git a/tests/googletest/feature_creation/parameterization/test_abs_diff_node.cc b/tests/googletest/feature_creation/parameterization/test_abs_diff_node.cc index df9d06f0f1b8d9d96fe0e920b9149dbf273f89e1..f2f32940bd4a2265463b2e3b42877b80be1b6951 100644 --- a/tests/googletest/feature_creation/parameterization/test_abs_diff_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_abs_diff_node.cc @@ -48,7 +48,7 @@ namespace allowed_op_funcs::abs_diff(90, _phi[0]->value_ptr(), _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_abs_node.cc b/tests/googletest/feature_creation/parameterization/test_abs_node.cc index f0ba7bfca73550528bb6a849e58d55c76e1ad2b6..c5113aaa1539898da8c848865ca4e8ac18c8e50c 100644 --- a/tests/googletest/feature_creation/parameterization/test_abs_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_abs_node.cc @@ -38,7 +38,7 @@ namespace _prop = std::vector<double>(900, 0.0); allowed_op_funcs::abs(900, _phi[0]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_add_node.cc b/tests/googletest/feature_creation/parameterization/test_add_node.cc index 2f2b9c34996e0298a5eb8f4c5db960fca0085308..b149c0a20d5aba2ea6ab5cd861043777ebd50942 100644 --- a/tests/googletest/feature_creation/parameterization/test_add_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_add_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::add(90, _phi[0]->value_ptr(), _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_cb_node.cc b/tests/googletest/feature_creation/parameterization/test_cb_node.cc index ada3cc8e09a7302896951d45f95407e3f92ca8e4..e505f2fb9692ffd824cdaea9aa79266906036aee 100644 --- a/tests/googletest/feature_creation/parameterization/test_cb_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_cb_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::cb(90, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_cbrt_node.cc b/tests/googletest/feature_creation/parameterization/test_cbrt_node.cc index 57e0055aaeb78a30d1ddd704e731344c53fdeb3c..7699bee35d682f6438eb97d02604a4661cb14715 100644 --- a/tests/googletest/feature_creation/parameterization/test_cbrt_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_cbrt_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(900, 0.0); allowed_op_funcs::cbrt(900, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_cos_node.cc b/tests/googletest/feature_creation/parameterization/test_cos_node.cc index 9f63b56e446abcbd7407085cd244d721245ac667..f47bed4d47b56e9d5168e664d699e11447509208 100644 --- a/tests/googletest/feature_creation/parameterization/test_cos_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_cos_node.cc @@ -52,7 +52,7 @@ namespace _prop = std::vector<double>(900, 0.0); allowed_op_funcs::cos(900, _phi[0]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_div_node.cc b/tests/googletest/feature_creation/parameterization/test_div_node.cc index 2cfc6b3d07d54d8a9bdf74964538432e9774cb43..0f0404f6bdce40ce85b0759278482263680fee94 100644 --- a/tests/googletest/feature_creation/parameterization/test_div_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_div_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::div(90, _phi[0]->value_ptr(), _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_exp_node.cc b/tests/googletest/feature_creation/parameterization/test_exp_node.cc index 7b7b07513a1a527924ee2e2681ac71ca7a40d82e..959e79ee52bc1e70a9801c03045408bef33bfd46 100644 --- a/tests/googletest/feature_creation/parameterization/test_exp_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_exp_node.cc @@ -55,7 +55,7 @@ namespace _prop = std::vector<double>(900, 0.0); allowed_op_funcs::exp(900, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_inv_node.cc b/tests/googletest/feature_creation/parameterization/test_inv_node.cc index dbf825ea72827dfe8f5e4c10d5e937968dbe86ef..0d8cad18258006a4e97d9e235ec5c57569d1375a 100644 --- a/tests/googletest/feature_creation/parameterization/test_inv_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_inv_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::inv(90, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_log_node.cc b/tests/googletest/feature_creation/parameterization/test_log_node.cc index 81e3cb5b79b74b254490694e1258c74dd63fe653..def50c0ddc0decd9dc7288a7e316bc8ff9ed2d6c 100644 --- a/tests/googletest/feature_creation/parameterization/test_log_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_log_node.cc @@ -55,7 +55,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::log(90, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_mult_node.cc b/tests/googletest/feature_creation/parameterization/test_mult_node.cc index 11004cea87940d9292d3bd959f07839bfc8a45aa..8db88335713a8a61553cadeeb5f8ad5bf1091561 100644 --- a/tests/googletest/feature_creation/parameterization/test_mult_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_mult_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(900, 0.0); allowed_op_funcs::mult(900, _phi[0]->value_ptr(), _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_neg_exp_node.cc b/tests/googletest/feature_creation/parameterization/test_neg_exp_node.cc index 4b1b471cd3a2f025a256663e48d7cf8c527eb02c..3aca13416e62db9c0c0e4143fa072fb74e2993e6 100644 --- a/tests/googletest/feature_creation/parameterization/test_neg_exp_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_neg_exp_node.cc @@ -55,7 +55,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::neg_exp(90, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_sin_node.cc b/tests/googletest/feature_creation/parameterization/test_sin_node.cc index 796e4c21c2c38fbbbc03f35e0e7c09fa7c28d3b5..4f2418d89670725763340aca8a5701f17e2cc8c6 100644 --- a/tests/googletest/feature_creation/parameterization/test_sin_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_sin_node.cc @@ -52,7 +52,7 @@ namespace _prop = std::vector<double>(900, 0.0); allowed_op_funcs::sin(900, _phi[0]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_six_pow_node.cc b/tests/googletest/feature_creation/parameterization/test_six_pow_node.cc index 424e73a9e168ad868ff78202e951a7626289001c..f1e3c20fdaa5247c4dc5627e7d2635cf726b7071 100644 --- a/tests/googletest/feature_creation/parameterization/test_six_pow_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_six_pow_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::sixth_pow(90, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_sq_node.cc b/tests/googletest/feature_creation/parameterization/test_sq_node.cc index 4b773d49aa42c1668a30a958259def25ef4ae8ce..fe80642ea16290b4f61423671a102f1a4f4cbf62 100644 --- a/tests/googletest/feature_creation/parameterization/test_sq_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_sq_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::sq(90, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_sqrt_node.cc b/tests/googletest/feature_creation/parameterization/test_sqrt_node.cc index 938ab6e4bb3465d7eaf5ebb2d3cd06a1d644e84b..bc560ea1226e903cebeed7337b0fa26c0b096599 100644 --- a/tests/googletest/feature_creation/parameterization/test_sqrt_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_sqrt_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::sqrt(90, _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/googletest/feature_creation/parameterization/test_sub_node.cc b/tests/googletest/feature_creation/parameterization/test_sub_node.cc index 2a112b60796ab0e0c668bd52378501e5ca85848e..7582e533d32efb957a8e805179f07bbd594cd243 100644 --- a/tests/googletest/feature_creation/parameterization/test_sub_node.cc +++ b/tests/googletest/feature_creation/parameterization/test_sub_node.cc @@ -47,7 +47,7 @@ namespace _prop = std::vector<double>(90, 0.0); allowed_op_funcs::sub(90, _phi[0]->value_ptr(), _phi[1]->value_ptr(), _alpha, _a, _prop.data()); - nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1); + nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, true); } node_ptr _feat_1; diff --git a/tests/pytest/test_descriptor_identifier/test_log_regressor_fit_c.py b/tests/pytest/test_descriptor_identifier/test_log_regressor_fit_c.py index 593077ab5660e83a0ea91896446a2bf4ebe0e5a5..a78c90dd591dee8ee03bfbfe948e82bfac78037b 100644 --- a/tests/pytest/test_descriptor_identifier/test_log_regressor_fit_c.py +++ b/tests/pytest/test_descriptor_identifier/test_log_regressor_fit_c.py @@ -36,7 +36,7 @@ def test_sisso_log_regressor_fit_c(): op_set = ["add", "sub", "mult", "sq", "cb", "sqrt", "cbrt"] - setup_data([90], 2, 0) + setup_data([90], 2, 0, True) feat_space = generate_fs( phi_0, prop, [90], op_set, [], "log_regression_fit_c", 0, 5 ) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_lorentizan.py b/tests/pytest/test_feature_creation/test_parameterize/test_lorentizan.py index 2700d3bd3b718b1dfbe50604f2f026fe21c96ada..f9ec0ca4d7f1952d88422f82d09068389ffcab39 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_lorentizan.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_lorentizan.py @@ -30,7 +30,7 @@ def test_lorentzian(): feat_node = InvParamNode(SqNode(feat_1, 2, 1e-50, 1e50), 3, 1e-50, 1e50) prop = 21.4 / ((data_1 - 0.25) ** 2.0 + 7.1) - 1.478 - set_objective("regression", prop, [900], 2) + set_objective("regression", prop, [900], 2, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_abs.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_abs.py index 5dd45aa6a0edf6556070ce1c2e5a9e00f5d83c8b..698af8e4c550fc459657d4b63545db748af19186 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_abs.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_abs.py @@ -31,7 +31,7 @@ def test_param_abs_node(): prop = -2.3 * np.abs(1.55 * data_1 + 0.8751) - 1.2 - set_objective("regression", prop, [900], 1) + set_objective("regression", prop, [900], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_abs_diff.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_abs_diff.py index 45e8106eb3afa606469ec3a4e6551907dd93c10f..e2cdd0fe7a7906aa53ade4612efe51171f3def76 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_abs_diff.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_abs_diff.py @@ -34,7 +34,7 @@ def test_param_abs_diff_node(): feat_node = AbsDiffParamNode(feat_1, feat_2, 2, 1e-50, 1e50) prop = -2.3 * np.abs(data_1 - (1.5 * data_2 + 0.8751)) - 1.2 - set_objective("regression", prop, [900], 1) + set_objective("regression", prop, [900], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_add.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_add.py index 28983c8b9753cd105b641a21914387b4e7a9960c..de5d697df5309fde7ca297ec123354be22158727 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_add.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_add.py @@ -35,7 +35,7 @@ def test_param_add_node(): prop = -2.3 * (data_1 + 1.5 * data_2) - 1.2 - set_objective("regression", prop, [90], 1) + set_objective("regression", prop, [90], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_cb.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_cb.py index 979c3a86b28a3979cae9ed6aada635d4941a4a03..49344208d7e16bb04f5be914284a3aba177c44d0 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_cb.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_cb.py @@ -31,7 +31,7 @@ def test_param_cb_node(): prop = np.power(1.55 * data_1 + 0.8751, 3.0) - 1.2 - set_objective("regression", prop, [90], 1) + set_objective("regression", prop, [90], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_cbrt.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_cbrt.py index 4d8d74bc5dad29fd001451ae59750820102c7bd9..0e3f672f8bb941c8ae580b397b3c944121bb3955 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_cbrt.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_cbrt.py @@ -31,7 +31,7 @@ def test_param_cbrt_node(): prop = np.cbrt(1.55 * data_1 + 0.8751) - 1.2 - set_objective("regression", prop, [90], 1) + set_objective("regression", prop, [90], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_cos.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_cos.py index 4669c7ed3c8b9d8d72a3c23bb7defa929923e0f6..86ca75196a19b20f972e8882566bf413497d1319 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_cos.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_cos.py @@ -31,7 +31,7 @@ def test_param_cos_node(): prop = -1.1 * np.cos(1.25 * data_1 + 2.13) + 0.01578 - set_objective("regression", prop, [900], 1) + set_objective("regression", prop, [900], 1, True) feat_node.get_parameters(prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_div.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_div.py index 3440ba24d766f1784066dcab4852f9ff332468cf..d937bf04bb410638ea7d16b579e3fb3d3adf49a5 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_div.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_div.py @@ -36,7 +36,7 @@ def test_param_div_node(): prop = 4.124 * data_1 / ((data_2 + 1.8751)) - 0.12 - set_objective("regression", prop, [900], 1) + set_objective("regression", prop, [900], 1, True) feat_node.get_parameters(prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_exp.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_exp.py index bd0b141f388ae8db928a8839a1e3bf60a4c5dd4c..1eda227b294ffd9806a9704f1ef412dd6b9cb06e 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_exp.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_exp.py @@ -31,7 +31,7 @@ def test_param_exp_node(): prop = np.exp(1.32 * data_1 + 0.8751) - 0.12 - set_objective("regression", prop, [900], 10) + set_objective("regression", prop, [900], 10, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_inv.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_inv.py index 253fd9d9c99119c5bd59fd837577b59846e5003b..67a3617ea4cfa9f151ac169ac7762978639844cb 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_inv.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_inv.py @@ -32,7 +32,7 @@ def test_param_inv_node(): prop = 1.0 / (1.55 * data_1 + 0.8751) - 1.2 - set_objective("regression", prop, [90], 1) + set_objective("regression", prop, [90], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_log.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_log.py index 4499f824590c39a8fe9877f9cf7393aa315cc14b..5458d29d2bbc3e6c6db2b9f9768774e586a072d6 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_log.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_log.py @@ -31,7 +31,7 @@ def test_param_log_node(): prop = -2.014 * np.log(1.15 * data_1 + 0.1387) - set_objective("regression", prop, [90], 1) + set_objective("regression", prop, [90], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_neg_exp.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_neg_exp.py index 71cf89e2bc275af19f9f959700ff8b5cef5a4249..7a91c74c9f51d5c3b401060c78166a27c8888f1a 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_neg_exp.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_neg_exp.py @@ -31,7 +31,7 @@ def test_param_neg_exp_node(): prop = np.exp(-1.55 * data_1 + 0.8751) - 0.12 - set_objective("regression", prop, [900], 1) + set_objective("regression", prop, [900], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_sin.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_sin.py index 5424a432124c83f61636924db7cf6e0f9f4a8b70..c1ba0c0cb584c59cdecee0ea16812fc52c921311 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_sin.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_sin.py @@ -31,7 +31,7 @@ def test_param_sin_node(): prop = -1.1 * np.sin(1.25 * data_1 + 2.13) + 0.01578 - set_objective("regression", prop, [900], 1) + set_objective("regression", prop, [900], 1, True) feat_node.get_parameters(prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_six_pow.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_six_pow.py index 950d2172dd28b44ac99f2158e54a57e922c7ed4e..bbdd4db1ecea8879c3219886dbbc21892cdfb005 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_six_pow.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_six_pow.py @@ -31,7 +31,7 @@ def test_param_six_pow_node(): prop = 1.55 * np.power(data_1 + 0.21, 6.0) - 0.12 - set_objective("regression", prop, [900], 1) + set_objective("regression", prop, [900], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_sq.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_sq.py index 4d54a05ab3330d25a181aa830376723c2128e852..02a085940fd95cbc089abfb38bede7035ed5e6b3 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_sq.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_sq.py @@ -31,7 +31,7 @@ def test_param_sq_node(): prop = np.power(1.55 * data_1 + 0.8751, 2.0) - 1.2 - set_objective("regression", prop, [90], 1) + set_objective("regression", prop, [90], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_sqrt.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_sqrt.py index 2ffc981a3cb1a638c6ac44785b6079022f46dd89..6e410d63520c95904a0899f0148ddb61ef2f3ca2 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_sqrt.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_sqrt.py @@ -31,7 +31,7 @@ def test_param_sqrt_node(): prop = np.sqrt(1.55 * data_1 + 0.8751) - 1.2 - set_objective("regression", prop, [90], 1) + set_objective("regression", prop, [90], 1, True) feat_node.get_parameters(prop) assert check_feat_parmeters(feat_node, prop) diff --git a/tests/pytest/test_feature_creation/test_parameterize/test_param_sub.py b/tests/pytest/test_feature_creation/test_parameterize/test_param_sub.py index 7de4ab9bc0d5faf8bf26aa93bec0114910999f38..11dbbc10ae90645e15d7a30a926be68c65baeeca 100644 --- a/tests/pytest/test_feature_creation/test_parameterize/test_param_sub.py +++ b/tests/pytest/test_feature_creation/test_parameterize/test_param_sub.py @@ -35,7 +35,7 @@ def test_param_sub_node(): prop = -2.3 * (data_1 - 1.5 * data_2) - 1.2 - set_objective("regression", prop, [90], 1) + set_objective("regression", prop, [90], 1, True) feat_node.get_parameters(prop) check_feat_parmeters(feat_node, prop)