From 57789f05e4ded6b01717fa3effe1ee26b7a0e522 Mon Sep 17 00:00:00 2001
From: Thomas <purcell@fhi-berlin.mpg.de>
Date: Fri, 8 Jan 2021 14:41:11 +0100
Subject: [PATCH] Tests updated to match current top lev updates
---
.../feature_generation/test_abs_diff_node.cc | 2 +-
.../feature_generation/test_add_node.cc | 2 +-
.../feature_generation/test_cb_node.cc | 2 +-
.../feature_generation/test_cbrt_node.cc | 2 +-
.../feature_generation/test_cos_node.cc | 2 +-
.../feature_generation/test_exp_node.cc | 2 +-
.../feature_generation/test_inv_node.cc | 2 +-
.../feature_generation/test_log_node.cc | 2 +-
.../feature_generation/test_neg_exp_node.cc | 2 +-
.../feature_generation/test_sin_node.cc | 2 +-
.../feature_generation/test_six_pow_node.cc | 2 +-
.../feature_generation/test_sq_node.cc | 2 +-
.../feature_generation/test_sqrt_node.cc | 2 +-
.../parameterization/test_abs_diff_node.cc | 2 +-
.../parameterization/test_abs_node.cc | 2 +-
.../parameterization/test_add_node.cc | 2 +-
.../feature_creation/parameterization/test_cb_node.cc | 2 +-
.../parameterization/test_cbrt_node.cc | 2 +-
.../parameterization/test_cos_node.cc | 2 +-
.../parameterization/test_div_node.cc | 2 +-
.../parameterization/test_exp_node.cc | 2 +-
.../parameterization/test_inv_node.cc | 2 +-
.../parameterization/test_log_node.cc | 2 +-
.../parameterization/test_mult_node.cc | 2 +-
.../parameterization/test_neg_exp_node.cc | 2 +-
.../parameterization/test_sin_node.cc | 2 +-
.../parameterization/test_six_pow_node.cc | 2 +-
.../feature_creation/parameterization/test_sq_node.cc | 2 +-
.../parameterization/test_sqrt_node.cc | 2 +-
.../parameterization/test_sub_node.cc | 2 +-
tests/googletest/feature_creation/utils/test_utils.cc | 10 +++++-----
.../test_parameterize/test_lorentizan.py | 5 +++--
.../test_parameterize/test_param_abs.py | 7 +++----
.../test_parameterize/test_param_abs_diff.py | 8 ++++----
.../test_parameterize/test_param_add.py | 10 ++++------
.../test_parameterize/test_param_cb.py | 7 +++----
.../test_parameterize/test_param_cbrt.py | 7 +++----
.../test_parameterize/test_param_cos.py | 6 ++----
.../test_parameterize/test_param_div.py | 9 +++------
.../test_parameterize/test_param_exp.py | 7 +++----
.../test_parameterize/test_param_inv.py | 8 +++-----
.../test_parameterize/test_param_log.py | 7 +++----
.../test_parameterize/test_param_neg_exp.py | 7 +++----
.../test_parameterize/test_param_sin.py | 6 ++----
.../test_parameterize/test_param_six_pow.py | 7 +++----
.../test_parameterize/test_param_sq.py | 7 +++----
.../test_parameterize/test_param_sqrt.py | 7 +++----
.../test_parameterize/test_param_sub.py | 11 ++++-------
48 files changed, 87 insertions(+), 109 deletions(-)
diff --git a/tests/googletest/feature_creation/feature_generation/test_abs_diff_node.cc b/tests/googletest/feature_creation/feature_generation/test_abs_diff_node.cc
index c5b4b705..56abea85 100644
--- a/tests/googletest/feature_creation/feature_generation/test_abs_diff_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_abs_diff_node.cc
@@ -155,7 +155,7 @@ namespace
EXPECT_STREQ(_abs_diff_test->unit().toString().c_str(), "m");
- EXPECT_STREQ(_abs_diff_test->expr().c_str(), "||A - (B)| - (B)|");
+ EXPECT_STREQ(_abs_diff_test->expr().c_str(), "|(|(A) - (B)|) - (B)|");
EXPECT_STREQ(_abs_diff_test->postfix_expr().c_str(), "0|1|abd|1|abd");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_add_node.cc b/tests/googletest/feature_creation/feature_generation/test_add_node.cc
index e329fb8c..45607c4d 100644
--- a/tests/googletest/feature_creation/feature_generation/test_add_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_add_node.cc
@@ -153,7 +153,7 @@ namespace
EXPECT_STREQ(_add_test->unit().toString().c_str(), "m");
- EXPECT_STREQ(_add_test->expr().c_str(), "[[A + B] + B]");
+ EXPECT_STREQ(_add_test->expr().c_str(), "[([(A) + (B)]) + (B)]");
EXPECT_STREQ(_add_test->postfix_expr().c_str(), "0|1|add|1|add");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_cb_node.cc b/tests/googletest/feature_creation/feature_generation/test_cb_node.cc
index 83acfab4..53dd38d2 100644
--- a/tests/googletest/feature_creation/feature_generation/test_cb_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_cb_node.cc
@@ -140,7 +140,7 @@ namespace
EXPECT_STREQ(_cb_test->unit().toString().c_str(), "m^3");
- EXPECT_STREQ(_cb_test->expr().c_str(), "(A)^3");
+ EXPECT_STREQ(_cb_test->expr().c_str(), "[A]^3");
EXPECT_STREQ(_cb_test->postfix_expr().c_str(), "0|cb");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_cbrt_node.cc b/tests/googletest/feature_creation/feature_generation/test_cbrt_node.cc
index 2576dfad..dbcee494 100644
--- a/tests/googletest/feature_creation/feature_generation/test_cbrt_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_cbrt_node.cc
@@ -165,7 +165,7 @@ namespace
EXPECT_STREQ(_cbrt_test->unit().toString().c_str(), "m^0.333333");
- EXPECT_STREQ(_cbrt_test->expr().c_str(), "cbrt(A)");
+ EXPECT_STREQ(_cbrt_test->expr().c_str(), "cbrt[A]");
EXPECT_STREQ(_cbrt_test->postfix_expr().c_str(), "0|cbrt");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_cos_node.cc b/tests/googletest/feature_creation/feature_generation/test_cos_node.cc
index 55818c6e..1f15d336 100644
--- a/tests/googletest/feature_creation/feature_generation/test_cos_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_cos_node.cc
@@ -141,7 +141,7 @@ namespace
EXPECT_STREQ(_cos_test->unit().toString().c_str(), "Unitless");
- EXPECT_STREQ(_cos_test->expr().c_str(), "cos(A)");
+ EXPECT_STREQ(_cos_test->expr().c_str(), "cos[A]");
EXPECT_STREQ(_cos_test->postfix_expr().c_str(), "0|cos");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_exp_node.cc b/tests/googletest/feature_creation/feature_generation/test_exp_node.cc
index 53243180..49597681 100644
--- a/tests/googletest/feature_creation/feature_generation/test_exp_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_exp_node.cc
@@ -170,7 +170,7 @@ namespace
EXPECT_STREQ(_exp_test->unit().toString().c_str(), "Unitless");
- EXPECT_STREQ(_exp_test->expr().c_str(), "exp(A)");
+ EXPECT_STREQ(_exp_test->expr().c_str(), "exp[A]");
EXPECT_STREQ(_exp_test->postfix_expr().c_str(), "0|exp");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_inv_node.cc b/tests/googletest/feature_creation/feature_generation/test_inv_node.cc
index 18433247..3a90fed9 100644
--- a/tests/googletest/feature_creation/feature_generation/test_inv_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_inv_node.cc
@@ -164,7 +164,7 @@ namespace
EXPECT_STREQ(_inv_test->unit().toString().c_str(), "m^-1");
- EXPECT_STREQ(_inv_test->expr().c_str(), "1.0 / (A)");
+ EXPECT_STREQ(_inv_test->expr().c_str(), "1.0 / [A]");
EXPECT_STREQ(_inv_test->postfix_expr().c_str(), "0|inv");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_log_node.cc b/tests/googletest/feature_creation/feature_generation/test_log_node.cc
index 19ccd194..575308fc 100644
--- a/tests/googletest/feature_creation/feature_generation/test_log_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_log_node.cc
@@ -264,7 +264,7 @@ namespace
EXPECT_STREQ(_log_test->unit().toString().c_str(), "Unitless");
- EXPECT_STREQ(_log_test->expr().c_str(), "log(A)");
+ EXPECT_STREQ(_log_test->expr().c_str(), "ln[A]");
EXPECT_STREQ(_log_test->postfix_expr().c_str(), "0|log");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_neg_exp_node.cc b/tests/googletest/feature_creation/feature_generation/test_neg_exp_node.cc
index d8c9a87c..e1d6e02c 100644
--- a/tests/googletest/feature_creation/feature_generation/test_neg_exp_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_neg_exp_node.cc
@@ -170,7 +170,7 @@ namespace
EXPECT_STREQ(_neg_exp_test->unit().toString().c_str(), "Unitless");
- EXPECT_STREQ(_neg_exp_test->expr().c_str(), "exp[-1.0*(A)]");
+ EXPECT_STREQ(_neg_exp_test->expr().c_str(), "exp[-1.0 * (A)]");
EXPECT_STREQ(_neg_exp_test->postfix_expr().c_str(), "0|nexp");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_sin_node.cc b/tests/googletest/feature_creation/feature_generation/test_sin_node.cc
index 69483e0d..b80960aa 100644
--- a/tests/googletest/feature_creation/feature_generation/test_sin_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_sin_node.cc
@@ -141,7 +141,7 @@ namespace
EXPECT_STREQ(_sin_test->unit().toString().c_str(), "Unitless");
- EXPECT_STREQ(_sin_test->expr().c_str(), "sin(A)");
+ EXPECT_STREQ(_sin_test->expr().c_str(), "sin[A]");
EXPECT_STREQ(_sin_test->postfix_expr().c_str(), "0|sin");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_six_pow_node.cc b/tests/googletest/feature_creation/feature_generation/test_six_pow_node.cc
index 19288a34..24cb76b0 100644
--- a/tests/googletest/feature_creation/feature_generation/test_six_pow_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_six_pow_node.cc
@@ -167,7 +167,7 @@ namespace
EXPECT_STREQ(_six_pow_test->unit().toString().c_str(), "m^6");
- EXPECT_STREQ(_six_pow_test->expr().c_str(), "(A)^6");
+ EXPECT_STREQ(_six_pow_test->expr().c_str(), "[A]^6");
EXPECT_STREQ(_six_pow_test->postfix_expr().c_str(), "0|sp");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_sq_node.cc b/tests/googletest/feature_creation/feature_generation/test_sq_node.cc
index 44691a6e..9591decb 100644
--- a/tests/googletest/feature_creation/feature_generation/test_sq_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_sq_node.cc
@@ -127,7 +127,7 @@ namespace
EXPECT_STREQ(_sq_test->unit().toString().c_str(), "m^2");
- EXPECT_STREQ(_sq_test->expr().c_str(), "(A)^2");
+ EXPECT_STREQ(_sq_test->expr().c_str(), "[A]^2");
EXPECT_STREQ(_sq_test->postfix_expr().c_str(), "0|sq");
}
}
diff --git a/tests/googletest/feature_creation/feature_generation/test_sqrt_node.cc b/tests/googletest/feature_creation/feature_generation/test_sqrt_node.cc
index 31659139..e832f811 100644
--- a/tests/googletest/feature_creation/feature_generation/test_sqrt_node.cc
+++ b/tests/googletest/feature_creation/feature_generation/test_sqrt_node.cc
@@ -178,7 +178,7 @@ namespace
EXPECT_STREQ(_sqrt_test->unit().toString().c_str(), "m^0.5");
- EXPECT_STREQ(_sqrt_test->expr().c_str(), "sqrt(A)");
+ EXPECT_STREQ(_sqrt_test->expr().c_str(), "sqrt[A]");
EXPECT_STREQ(_sqrt_test->postfix_expr().c_str(), "0|sqrt");
}
}
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 f2f32940..15cfb063 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 c5113aaa..6dffbe7c 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 b149c0a2..5c4d53e1 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 e505f2fb..d5337cf6 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 7699bee3..cd4bec4c 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 f47bed4d..b8479157 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 0f0404f6..67a59973 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 959e79ee..4b46bc6e 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 0d8cad18..5ad24ba5 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 def50c0d..93823d21 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 8db88335..b7b80fc2 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 3aca1341..ad102244 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 4f2418d8..2dbc59ce 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 f1e3c20f..a2e3e104 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 fe80642e..f8504353 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 bc560ea1..649bf1e6 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
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 7582e533..37ca1085 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, true);
+ nlopt_wrapper::set_objective("regression", _prop.data(), _task_sizes_train, 1, 1);
}
node_ptr _feat_1;
diff --git a/tests/googletest/feature_creation/utils/test_utils.cc b/tests/googletest/feature_creation/utils/test_utils.cc
index 637753e1..653fa411 100644
--- a/tests/googletest/feature_creation/utils/test_utils.cc
+++ b/tests/googletest/feature_creation/utils/test_utils.cc
@@ -38,7 +38,7 @@ namespace
EXPECT_EQ(test->type(), NODE_TYPE::ADD);
EXPECT_EQ(test->rung(), 3);
EXPECT_LT(abs(test->value()[1] - (std::exp(2.0) + 2.0)), 1e-10);
- EXPECT_STREQ(test->expr().c_str(), "[exp([(A) / (C)]) + B]");
+ EXPECT_STREQ(test->expr().c_str(), "[(exp[[(A) / (C)]]) + (B)]");
}
TEST_F(FeatCreationUtilsTest, TestPhiSelFromFile)
@@ -72,12 +72,12 @@ namespace
EXPECT_EQ(phi_sel[0]->type(), NODE_TYPE::MODEL_FEATURE);
EXPECT_EQ(phi_sel[0]->rung(), 3);
EXPECT_LT(abs(phi_sel[0]->value()[1] - (std::exp(2.0) + 2.0)), 1e-10);
- EXPECT_STREQ(phi_sel[0]->expr().c_str(), "[exp([(A) / (C)]) + B]");
+ EXPECT_STREQ(phi_sel[0]->expr().c_str(), "[(exp[[(A) / (C)]]) + (B)]");
EXPECT_EQ(phi_sel[5]->type(), NODE_TYPE::MODEL_FEATURE);
EXPECT_EQ(phi_sel[5]->rung(), 3);
EXPECT_LT(abs(phi_sel[5]->value()[1] - (std::exp(2.0) - 2.0)), 1e-10);
- EXPECT_STREQ(phi_sel[5]->expr().c_str(), "[(exp([(A) / (C)])) - (B)]");
+ EXPECT_STREQ(phi_sel[5]->expr().c_str(), "[(exp[[(A) / (C)]]) - (B)]");
boost::filesystem::remove("phi_sel.txt");
}
@@ -106,12 +106,12 @@ namespace
EXPECT_EQ(phi[0]->type(), NODE_TYPE::ADD);
EXPECT_EQ(phi[0]->rung(), 3);
EXPECT_LT(abs(phi[0]->value()[1] - (std::exp(2.0) + 2.0)), 1e-10);
- EXPECT_STREQ(phi[0]->expr().c_str(), "[exp([(A) / (C)]) + B]");
+ EXPECT_STREQ(phi[0]->expr().c_str(), "[(exp[[(A) / (C)]]) + (B)]");
EXPECT_EQ(phi[5]->type(), NODE_TYPE::SUB);
EXPECT_EQ(phi[5]->rung(), 3);
EXPECT_LT(abs(phi[5]->value()[1] - (std::exp(2.0) - 2.0)), 1e-10);
- EXPECT_STREQ(phi[5]->expr().c_str(), "[(exp([(A) / (C)])) - (B)]");
+ EXPECT_STREQ(phi[5]->expr().c_str(), "[(exp[[(A) / (C)]]) - (B)]");
boost::filesystem::remove("phi.txt");
}
}
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 f9ec0ca4..18a0d281 100644
--- a/tests/pytest/test_feature_creation/test_parameterize/test_lorentizan.py
+++ b/tests/pytest/test_feature_creation/test_parameterize/test_lorentizan.py
@@ -27,11 +27,12 @@ def test_lorentzian():
test_data_1 = np.linspace(-19.99, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20, 20]"), Unit())
- 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, 2)
- set_objective("regression", prop, [900], 2, True)
+ feat_node = InvParamNode(SqNode(feat_1, 2, 1e-50, 1e50), 3, 1e-50, 1e50)
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 698af8e4..e79719c3 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
@@ -27,13 +27,12 @@ def test_param_abs_node():
test_data_1 = np.linspace(-19.99, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20, 20]"), Unit())
- feat_node = AbsParamNode(feat_1, 2, 1e-50, 1e50)
-
prop = -2.3 * np.abs(1.55 * data_1 + 0.8751) - 1.2
+ set_objective("regression", prop, [900], 1, 1)
- set_objective("regression", prop, [900], 1, True)
-
+ feat_node = AbsParamNode(feat_1, 2, 1e-50, 1e50)
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 e2cdd0fe..82fa8227 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
@@ -25,18 +25,18 @@ def test_param_abs_diff_node():
data_1 = np.linspace(-20, 20, 900)
test_data_1 = np.linspace(-19.99, 19.99, 100)
+ feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20.0, 20.0]"), Unit())
data_2 = np.linspace(-14.256, 18.6523, 900)
test_data_2 = np.linspace(-16.256, 17.6523, 100)
-
- feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20.0, 20.0]"), Unit())
feat_2 = FeatureNode(1, "x_a", data_2, test_data_2, Domain("[-20.0, 20.0]"), Unit())
- 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, True)
+ set_objective("regression", prop, [900], 1, 1)
+ feat_node = AbsDiffParamNode(feat_1, feat_2, 2, 1e-50, 1e50)
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 de5d697d..259a2a7e 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
@@ -24,20 +24,18 @@ def test_param_add_node():
data_1 = np.linspace(-20, 20, 90)
test_data_1 = np.linspace(-19.99, 19.99, 10)
+ feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20.0, 20.0]"), Unit())
data_2 = np.linspace(-14.256, 18.6523, 90)
test_data_2 = np.linspace(-16.256, 17.6523, 10)
-
- feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20.0, 20.0]"), Unit())
feat_2 = FeatureNode(1, "x_a", data_2, test_data_2, Domain("[-20.0, 20.0]"), Unit())
- feat_node = AddParamNode(feat_1, feat_2, 2, 1e-50, 1e50)
-
prop = -2.3 * (data_1 + 1.5 * data_2) - 1.2
+ set_objective("regression", prop, [90], 1, 1)
- set_objective("regression", prop, [90], 1, True)
-
+ feat_node = AddParamNode(feat_1, feat_2, 2, 1e-50, 1e50)
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 49344208..c8e95fba 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
@@ -27,13 +27,12 @@ def test_param_cb_node():
test_data_1 = np.linspace(-19.99, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20, 20]"), Unit())
- feat_node = CbParamNode(feat_1, 2, 1e-50, 1e50)
-
prop = np.power(1.55 * data_1 + 0.8751, 3.0) - 1.2
+ set_objective("regression", prop, [90], 1, 1)
- set_objective("regression", prop, [90], 1, True)
-
+ feat_node = CbParamNode(feat_1, 2, 1e-50, 1e50)
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 0e3f672f..d6ed3165 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
@@ -27,13 +27,12 @@ def test_param_cbrt_node():
test_data_1 = np.linspace(0.52145, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[0.5, 20]"), Unit())
- feat_node = CbrtParamNode(feat_1, 2, 1e-50, 1e50)
-
prop = np.cbrt(1.55 * data_1 + 0.8751) - 1.2
+ set_objective("regression", prop, [90], 1, 1)
- set_objective("regression", prop, [90], 1, True)
-
+ feat_node = CbrtParamNode(feat_1, 2, 1e-50, 1e50)
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 86ca7519..06d1825c 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
@@ -27,12 +27,10 @@ def test_param_cos_node():
test_data_1 = np.linspace(-1.994 * np.pi, 1.994 * np.pi, 100)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("(-6.3, 6.3)"), Unit())
- feat_node = CosParamNode(feat_1, 1, 1e-50, 1e50)
-
prop = -1.1 * np.cos(1.25 * data_1 + 2.13) + 0.01578
+ set_objective("regression", prop, [900], 1, 1)
- set_objective("regression", prop, [900], 1, True)
-
+ feat_node = CosParamNode(feat_1, 1, 1e-50, 1e50)
feat_node.get_parameters(prop)
assert check_feat_parmeters(feat_node, 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 d937bf04..cdfc0c59 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
@@ -25,19 +25,16 @@ def test_param_div_node():
data_1 = np.random.uniform(-2.50, 2.50, 900)
test_data_1 = np.linspace(0.52145, 19.99, 10)
+ feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-2.5, 20.5]"), Unit())
data_2 = np.random.uniform(0.5, 5.0, 900)
test_data_2 = np.linspace(0.41, 19.8432, 10)
-
- feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-2.5, 20.5]"), Unit())
feat_2 = FeatureNode(1, "x_a", data_2, test_data_2, Domain("[0.5, 5.0]"), Unit())
- feat_node = DivParamNode(feat_1, feat_2, 2, 1e-50, 1e50)
-
prop = 4.124 * data_1 / ((data_2 + 1.8751)) - 0.12
+ set_objective("regression", prop, [900], 1, 1)
- set_objective("regression", prop, [900], 1, True)
-
+ feat_node = DivParamNode(feat_1, feat_2, 2, 1e-50, 1e50)
feat_node.get_parameters(prop)
assert check_feat_parmeters(feat_node, 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 1eda227b..fefc4f16 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
@@ -27,13 +27,12 @@ def test_param_exp_node():
test_data_1 = np.linspace(-19.99, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-5.0, 5.0]"), Unit())
- feat_node = ExpParamNode(feat_1, 1, 1e-50, 1e50)
-
prop = np.exp(1.32 * data_1 + 0.8751) - 0.12
+ set_objective("regression", prop, [900], 10, 1)
- set_objective("regression", prop, [900], 10, True)
-
+ feat_node = ExpParamNode(feat_1, 1, 1e-50, 1e50)
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 67a3617e..60b70a09 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
@@ -25,16 +25,14 @@ def test_param_inv_node():
data_1 = np.linspace(0.5, 20, 90)
test_data_1 = np.linspace(0.52145, 19.99, 10)
-
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[0.5, 20]"), Unit())
- feat_node = InvParamNode(feat_1, 2, 1e-50, 1e50)
-
prop = 1.0 / (1.55 * data_1 + 0.8751) - 1.2
+ set_objective("regression", prop, [90], 1, 1)
- set_objective("regression", prop, [90], 1, True)
-
+ feat_node = InvParamNode(feat_1, 2, 1e-50, 1e50)
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 5458d29d..3935cbfb 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
@@ -27,13 +27,12 @@ def test_param_log_node():
test_data_1 = np.linspace(0.52145, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[0.5, 20]"), Unit())
- feat_node = LogParamNode(feat_1, 2, 1e-50, 1e50)
-
prop = -2.014 * np.log(1.15 * data_1 + 0.1387)
+ set_objective("regression", prop, [90], 1, 1)
- set_objective("regression", prop, [90], 1, True)
-
+ feat_node = LogParamNode(feat_1, 2, 1e-50, 1e50)
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 7a91c74c..c559cb98 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
@@ -27,13 +27,12 @@ def test_param_neg_exp_node():
test_data_1 = np.linspace(-19.99, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-10, 10]"), Unit())
- feat_node = NegExpParamNode(feat_1, 2, 1e-50, 1e50)
-
prop = np.exp(-1.55 * data_1 + 0.8751) - 0.12
+ set_objective("regression", prop, [900], 1, 1)
- set_objective("regression", prop, [900], 1, True)
-
+ feat_node = NegExpParamNode(feat_1, 2, 1e-50, 1e50)
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 c1ba0c0c..60bee756 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
@@ -27,12 +27,10 @@ def test_param_sin_node():
test_data_1 = np.linspace(-1.994 * np.pi, 1.994 * np.pi, 100)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("(-6.3, 6.3)"), Unit())
- feat_node = SinParamNode(feat_1, 1, 1e-50, 1e50)
-
prop = -1.1 * np.sin(1.25 * data_1 + 2.13) + 0.01578
+ set_objective("regression", prop, [900], 1, 1)
- set_objective("regression", prop, [900], 1, True)
-
+ feat_node = SinParamNode(feat_1, 1, 1e-50, 1e50)
feat_node.get_parameters(prop)
assert check_feat_parmeters(feat_node, 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 bbdd4db1..e4c82ac9 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
@@ -27,13 +27,12 @@ def test_param_six_pow_node():
test_data_1 = np.random.uniform(-19.99, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-5.0, 5.0]"), Unit())
- feat_node = SixPowParamNode(feat_1, 1, 1e-50, 1e50)
-
prop = 1.55 * np.power(data_1 + 0.21, 6.0) - 0.12
+ set_objective("regression", prop, [900], 1, 1)
- set_objective("regression", prop, [900], 1, True)
-
+ feat_node = SixPowParamNode(feat_1, 1, 1e-50, 1e50)
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 02a08594..2f0acb4b 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
@@ -27,13 +27,12 @@ def test_param_sq_node():
test_data_1 = np.linspace(-19.99, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20, 20]"), Unit())
- feat_node = SqParamNode(feat_1, 2, 1e-50, 1e50)
-
prop = np.power(1.55 * data_1 + 0.8751, 2.0) - 1.2
+ set_objective("regression", prop, [90], 1, 1)
- set_objective("regression", prop, [90], 1, True)
-
+ feat_node = SqParamNode(feat_1, 2, 1e-50, 1e50)
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 6e410d63..1bf2ee47 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
@@ -27,13 +27,12 @@ def test_param_sqrt_node():
test_data_1 = np.linspace(0.52145, 19.99, 10)
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[0.5, 20]"), Unit())
- feat_node = SqrtParamNode(feat_1, 2, 1e-50, 1e50)
-
prop = np.sqrt(1.55 * data_1 + 0.8751) - 1.2
+ set_objective("regression", prop, [90], 1, 1)
- set_objective("regression", prop, [90], 1, True)
-
+ feat_node = SqrtParamNode(feat_1, 2, 1e-50, 1e50)
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 11dbbc10..5be22c52 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
@@ -24,22 +24,19 @@ def test_param_sub_node():
data_1 = np.linspace(-20, 20, 90)
test_data_1 = np.linspace(-19.99, 19.99, 10)
+ feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20.0, 20.0]"), Unit())
data_2 = np.linspace(-14.256, 18.6523, 90)
test_data_2 = np.linspace(-16.256, 17.6523, 10)
-
- feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Domain("[-20.0, 20.0]"), Unit())
feat_2 = FeatureNode(1, "x_a", data_2, test_data_2, Domain("[-20.0, 20.0]"), Unit())
- feat_node = SubParamNode(feat_1, feat_2, 2, 1e-50, 1e50)
-
prop = -2.3 * (data_1 - 1.5 * data_2) - 1.2
+ set_objective("regression", prop, [90], 1, 1)
- set_objective("regression", prop, [90], 1, True)
-
+ feat_node = SubParamNode(feat_1, feat_2, 2, 1e-50, 1e50)
feat_node.get_parameters(prop)
- check_feat_parmeters(feat_node, prop)
+ assert check_feat_parmeters(feat_node, prop)
if __name__ == "__main__":
test_param_sub_node()
--
GitLab