From 20b6c8151d0c4a738173f08af913d8c32ad23aa8 Mon Sep 17 00:00:00 2001
From: Thomas <purcell@fhi-berlin.mpg.de>
Date: Fri, 14 May 2021 09:11:00 +0200
Subject: [PATCH] Update model eval tests to prevent spuradic errors
Hopefully this will stop the slight errors that pop up
---
.../test_feat_generation/test_mult_node.py | 4 ++--
.../test_model_eval/test_model_node/test_abs.py | 10 +++++-----
.../test_model_node/test_abs_diff.py | 14 +++++++-------
.../test_model_eval/test_model_node/test_add.py | 14 +++++++-------
.../test_model_node/test_binary_binary.py | 16 ++++++++--------
.../test_model_node/test_binary_unary.py | 16 ++++++++--------
.../test_model_eval/test_model_node/test_cb.py | 10 +++++-----
.../test_model_eval/test_model_node/test_cbrt.py | 14 +++++++-------
.../test_model_eval/test_model_node/test_cos.py | 10 +++++-----
.../test_model_eval/test_model_node/test_div.py | 14 +++++++-------
.../test_model_eval/test_model_node/test_exp.py | 10 +++++-----
.../test_model_eval/test_model_node/test_inv.py | 14 +++++++-------
.../test_model_eval/test_model_node/test_log.py | 14 +++++++-------
.../test_model_eval/test_model_node/test_mult.py | 14 +++++++-------
.../test_model_node/test_neg_exp.py | 10 +++++-----
.../test_model_eval/test_model_node/test_sin.py | 10 +++++-----
.../test_model_node/test_six_pow.py | 10 +++++-----
.../test_model_eval/test_model_node/test_sq.py | 10 +++++-----
.../test_model_eval/test_model_node/test_sqrt.py | 14 +++++++-------
.../test_model_eval/test_model_node/test_sub.py | 14 +++++++-------
.../test_model_node/test_unary_binary.py | 16 ++++++++--------
.../test_model_node/test_unary_unary.py | 16 ++++++++--------
.../test_param_model_node/test_abs_diff_param.py | 14 +++++++-------
.../test_param_model_node/test_abs_param.py | 10 +++++-----
.../test_param_model_node/test_add_param.py | 14 +++++++-------
.../test_binary_binary_param.py | 16 ++++++++--------
.../test_binary_unary_param.py | 16 ++++++++--------
.../test_param_model_node/test_cb_param.py | 10 +++++-----
.../test_param_model_node/test_cbrt_param.py | 14 +++++++-------
.../test_param_model_node/test_cos_param.py | 10 +++++-----
.../test_param_model_node/test_div_param.py | 14 +++++++-------
.../test_param_model_node/test_exp_param.py | 10 +++++-----
.../test_param_model_node/test_inv_param.py | 14 +++++++-------
.../test_param_model_node/test_log_param.py | 14 +++++++-------
.../test_param_model_node/test_mult_param.py | 14 +++++++-------
.../test_param_model_node/test_neg_exp_param.py | 10 +++++-----
.../test_param_model_node/test_sin_param.py | 10 +++++-----
.../test_param_model_node/test_six_pow_param.py | 10 +++++-----
.../test_param_model_node/test_sq_param.py | 10 +++++-----
.../test_param_model_node/test_sqrt_param.py | 14 +++++++-------
.../test_param_model_node/test_sub_param.py | 14 +++++++-------
.../test_unary_binary_param.py | 16 ++++++++--------
.../test_unary_unary_param.py | 16 ++++++++--------
43 files changed, 272 insertions(+), 272 deletions(-)
diff --git a/tests/pytest/test_feature_creation/test_feat_generation/test_mult_node.py b/tests/pytest/test_feature_creation/test_feat_generation/test_mult_node.py
index 15b7a9ca..e19ced01 100644
--- a/tests/pytest/test_feature_creation/test_feat_generation/test_mult_node.py
+++ b/tests/pytest/test_feature_creation/test_feat_generation/test_mult_node.py
@@ -23,8 +23,8 @@ def test_mult_node():
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
- data_3 = np.random.random(90) * 1e10 + 1e-5
- test_data_3 = np.random.random(10) * 1e10 + 1e-5
+ data_3 = np.abs(np.random.random(90) * 1e10) + 0.1
+ test_data_3 = np.abs(np.random.random(10) * 1e10) + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit("s"))
feat_2 = FeatureNode(1, "x_a", data_2, test_data_2, Unit("m"))
diff --git a/tests/pytest/test_model_eval/test_model_node/test_abs.py b/tests/pytest/test_model_eval/test_model_node/test_abs.py
index 853ff9e8..61651152 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_abs.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_abs.py
@@ -25,14 +25,14 @@ def test_abs_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_abs_diff.py b/tests/pytest/test_model_eval/test_model_node/test_abs_diff.py
index f3d12180..cb1f7755 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_abs_diff.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_abs_diff.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_abs_diff_model_eval():
initialize_values_arr(90, 10, 2, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -29,17 +29,17 @@ def test_abs_diff_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_1, data_2))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_add.py b/tests/pytest/test_model_eval/test_model_node/test_add.py
index e6d4d41d..b942d789 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_add.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_add.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_add_model_eval():
initialize_values_arr(90, 10, 2, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -29,17 +29,17 @@ def test_add_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-7
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_1, data_2))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_binary_binary.py b/tests/pytest/test_model_eval/test_model_node/test_binary_binary.py
index cf0d6751..2faeaa87 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_binary_binary.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_binary_binary.py
@@ -16,8 +16,8 @@ class InvalidFeatureMade(Exception):
def test_bin_bin_model_eval():
initialize_values_arr(90, 10, 3, 2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -33,26 +33,26 @@ def test_bin_bin_model_eval():
node_2 = AddNode(node_1, feat_2, 4, 1e-50, 1e50)
model_node = ModelNode(node_2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
data_3 = np.random.random(90) * 2e4 - 1e4
val_data = data_1 * data_3 + data_2
data_dict = {"t_a": data_1[0], "x_a": data_2[0], "m_a": data_3[0]}
- assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-7
- assert abs(model_node.eval([data_1[0], data_3[0], data_2[0]]) - val_data[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0], data_3[0], data_2[0]]) - val_data[0]) < 1e-5
assert (
abs(model_node.eval(np.array([data_1[0], data_3[0], data_2[0]])) - val_data[0])
- < 1e-7
+ < 1e-5
)
data_dict = {"t_a": data_1, "x_a": data_2, "m_a": data_3}
- assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.column_stack((data_1, data_3, data_2))) - val_data
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_binary_unary.py b/tests/pytest/test_model_eval/test_model_node/test_binary_unary.py
index 096d3446..8acfbc8d 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_binary_unary.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_binary_unary.py
@@ -16,8 +16,8 @@ class InvalidFeatureMade(Exception):
def test_bin_un_model_eval():
initialize_values_arr(90, 10, 2, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -29,20 +29,20 @@ def test_bin_un_model_eval():
node_2 = AddNode(node_1, feat_2, 2, 1e-50, 1e50)
model_node = ModelNode(node_2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
val_data = data_1 ** 2.0 + data_2
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval([data_1[0], data_2[0]]) - val_data[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - val_data[0]) < 1e-7
- assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-7
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-5
assert (
np.linalg.norm(model_node.eval_many(np.row_stack((data_1, data_2))) - val_data)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_cb.py b/tests/pytest/test_model_eval/test_model_node/test_cb.py
index 548aec48..b85ba0bf 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_cb.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_cb.py
@@ -25,14 +25,14 @@ def test_cb_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_cbrt.py b/tests/pytest/test_model_eval/test_model_node/test_cbrt.py
index 02786bac..d8c5124d 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_cbrt.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_cbrt.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_cbrt_model_eval():
initialize_values_arr(90, 10, 1, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -25,14 +25,14 @@ def test_cbrt_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_cos.py b/tests/pytest/test_model_eval/test_model_node/test_cos.py
index a03942f2..b22c01d5 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_cos.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_cos.py
@@ -25,14 +25,14 @@ def test_cos_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_div.py b/tests/pytest/test_model_eval/test_model_node/test_div.py
index f41ceec3..f73205af 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_div.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_div.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_div_model_eval():
initialize_values_arr(90, 10, 2, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -29,17 +29,17 @@ def test_div_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_2[0], data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_2[0], data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_2[0], data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_2[0], data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_2, data_1))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_exp.py b/tests/pytest/test_model_eval/test_model_node/test_exp.py
index 99ca6820..ce82bd5b 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_exp.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_exp.py
@@ -25,14 +25,14 @@ def test_exp_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_inv.py b/tests/pytest/test_model_eval/test_model_node/test_inv.py
index a1a34a3c..0865616c 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_inv.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_inv.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_inv_model_eval():
initialize_values_arr(90, 10, 1, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -25,14 +25,14 @@ def test_inv_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_log.py b/tests/pytest/test_model_eval/test_model_node/test_log.py
index 34c69b56..33bc0f3c 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_log.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_log.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_log_model_eval():
initialize_values_arr(90, 10, 1, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -25,14 +25,14 @@ def test_log_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_mult.py b/tests/pytest/test_model_eval/test_model_node/test_mult.py
index f8398c6a..aee077e1 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_mult.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_mult.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_mult_model_eval():
initialize_values_arr(90, 10, 2, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -29,17 +29,17 @@ def test_mult_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_1, data_2))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_neg_exp.py b/tests/pytest/test_model_eval/test_model_node/test_neg_exp.py
index 7203ea9a..c47ba4c0 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_neg_exp.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_neg_exp.py
@@ -25,14 +25,14 @@ def test_neg_exp_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_sin.py b/tests/pytest/test_model_eval/test_model_node/test_sin.py
index 0ed325f5..44cdafb4 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_sin.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_sin.py
@@ -25,14 +25,14 @@ def test_sin_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_six_pow.py b/tests/pytest/test_model_eval/test_model_node/test_six_pow.py
index 0dbeeb85..8d14756e 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_six_pow.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_six_pow.py
@@ -25,14 +25,14 @@ def test_six_pow_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_sq.py b/tests/pytest/test_model_eval/test_model_node/test_sq.py
index 4a709191..3a913981 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_sq.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_sq.py
@@ -25,14 +25,14 @@ def test_sq_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_sqrt.py b/tests/pytest/test_model_eval/test_model_node/test_sqrt.py
index 2b39c431..ef414cf2 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_sqrt.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_sqrt.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_sqrt_model_eval():
initialize_values_arr(90, 10, 1, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -25,14 +25,14 @@ def test_sqrt_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_sub.py b/tests/pytest/test_model_eval/test_model_node/test_sub.py
index 071bac95..404f09f0 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_sub.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_sub.py
@@ -15,8 +15,8 @@ class InvalidFeatureMade(Exception):
def test_sub_model_eval():
initialize_values_arr(90, 10, 2, 1)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -29,17 +29,17 @@ def test_sub_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_1, data_2))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_unary_binary.py b/tests/pytest/test_model_eval/test_model_node/test_unary_binary.py
index 5c101656..406e291c 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_unary_binary.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_unary_binary.py
@@ -16,8 +16,8 @@ class InvalidFeatureMade(Exception):
def test_un_bin_model_eval():
initialize_values_arr(90, 10, 2, 2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -29,20 +29,20 @@ def test_un_bin_model_eval():
node_2 = SqNode(node_1, 3, 1e-50, 1e50)
model_node = ModelNode(node_2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
val_data = (data_1 + data_2) ** 2.0
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval([data_1[0], data_2[0]]) - val_data[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - val_data[0]) < 1e-7
- assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-7
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-5
assert (
np.linalg.norm(model_node.eval_many(np.row_stack((data_1, data_2))) - val_data)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_model_node/test_unary_unary.py b/tests/pytest/test_model_eval/test_model_node/test_unary_unary.py
index 8bc16b90..526491cb 100644
--- a/tests/pytest/test_model_eval/test_model_node/test_unary_unary.py
+++ b/tests/pytest/test_model_eval/test_model_node/test_unary_unary.py
@@ -16,8 +16,8 @@ class InvalidFeatureMade(Exception):
def test_un_un_model_eval():
initialize_values_arr(90, 10, 1, 2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -26,17 +26,17 @@ def test_un_un_model_eval():
node_2 = InvNode(node_1, 3, 1e-50, 1e50)
model_node = ModelNode(node_2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
val_data = 1.0 / data_1 ** 2.0
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - val_data[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - val_data[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - val_data[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-7
- assert np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - val_data) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-5
+ assert np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - val_data) < 1e-5
if __name__ == "__main__":
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_abs_diff_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_abs_diff_param.py
index f8ceda58..4b283074 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_abs_diff_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_abs_diff_param.py
@@ -20,8 +20,8 @@ def test_abs_diff_param_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -36,17 +36,17 @@ def test_abs_diff_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_1, data_2))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_abs_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_abs_param.py
index 689fa74c..19452845 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_abs_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_abs_param.py
@@ -32,14 +32,14 @@ def test_abs_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_add_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_add_param.py
index 0d6c3407..c7501c23 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_add_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_add_param.py
@@ -20,8 +20,8 @@ def test_add_param_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -36,17 +36,17 @@ def test_add_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-7
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_1, data_2))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_binary_binary_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_binary_binary_param.py
index 6f3eadf5..15bf27ee 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_binary_binary_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_binary_binary_param.py
@@ -21,8 +21,8 @@ def test_bin_bin_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -42,26 +42,26 @@ def test_bin_bin_model_eval():
model_node = ModelNode(node_2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
data_3 = np.random.random(90) * 2e4 - 1e4
val_data = (data_1 * (3.0 * data_3 + 4.0)) + data_2 + 2.0
data_dict = {"t_a": data_1[0], "x_a": data_2[0], "m_a": data_3[0]}
- assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-7
- assert abs(model_node.eval([data_1[0], data_3[0], data_2[0]]) - val_data[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0], data_3[0], data_2[0]]) - val_data[0]) < 1e-5
assert (
abs(model_node.eval(np.array([data_1[0], data_3[0], data_2[0]])) - val_data[0])
- < 1e-7
+ < 1e-5
)
data_dict = {"t_a": data_1, "x_a": data_2, "m_a": data_3}
- assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.column_stack((data_1, data_3, data_2))) - val_data
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_binary_unary_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_binary_unary_param.py
index 788e99c5..cfa1c84c 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_binary_unary_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_binary_unary_param.py
@@ -21,8 +21,8 @@ def test_bin_un_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -38,20 +38,20 @@ def test_bin_un_model_eval():
model_node = ModelNode(node_2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
val_data = (3.0 * data_1 + 4.0) ** 2.0 + data_2 + 2.0
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval([data_1[0], data_2[0]]) - val_data[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - val_data[0]) < 1e-7
- assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-7
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-5
assert (
np.linalg.norm(model_node.eval_many(np.row_stack((data_1, data_2))) - val_data)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_cb_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_cb_param.py
index ea67feb4..a61ac903 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_cb_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_cb_param.py
@@ -32,14 +32,14 @@ def test_cb_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_cbrt_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_cbrt_param.py
index 53eac424..8553e554 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_cbrt_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_cbrt_param.py
@@ -20,8 +20,8 @@ def test_cbrt_param_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -32,14 +32,14 @@ def test_cbrt_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_cos_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_cos_param.py
index ce2900cb..504c75a6 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_cos_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_cos_param.py
@@ -32,14 +32,14 @@ def test_cos_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_div_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_div_param.py
index b4121b5e..ce0860c7 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_div_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_div_param.py
@@ -20,8 +20,8 @@ def test_div_param_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -36,17 +36,17 @@ def test_div_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_2[0], data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_2[0], data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_2[0], data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_2[0], data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_2, data_1))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_exp_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_exp_param.py
index 2139f082..74dd919b 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_exp_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_exp_param.py
@@ -32,14 +32,14 @@ def test_exp_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_inv_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_inv_param.py
index 3c9cd577..3959e0d8 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_inv_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_inv_param.py
@@ -20,8 +20,8 @@ def test_inv_param_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -32,14 +32,14 @@ def test_inv_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_log_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_log_param.py
index a3bd29e9..39e08fa0 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_log_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_log_param.py
@@ -20,8 +20,8 @@ def test_log_param_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -32,14 +32,14 @@ def test_log_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_mult_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_mult_param.py
index 8af1a039..1e9a4869 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_mult_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_mult_param.py
@@ -20,8 +20,8 @@ def test_mult_param_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -36,17 +36,17 @@ def test_mult_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_1, data_2))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_neg_exp_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_neg_exp_param.py
index 9847b615..b5447122 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_neg_exp_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_neg_exp_param.py
@@ -32,14 +32,14 @@ def test_neg_exp_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_sin_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_sin_param.py
index 376c7521..e236384c 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_sin_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_sin_param.py
@@ -32,14 +32,14 @@ def test_sin_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_six_pow_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_six_pow_param.py
index f0cd1dfb..975c9f5b 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_six_pow_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_six_pow_param.py
@@ -32,14 +32,14 @@ def test_six_pow_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_sq_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_sq_param.py
index e4e3cb76..022dad72 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_sq_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_sq_param.py
@@ -32,14 +32,14 @@ def test_sq_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_sqrt_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_sqrt_param.py
index d3ad750e..cd6ad6da 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_sqrt_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_sqrt_param.py
@@ -20,8 +20,8 @@ def test_sqrt_param_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -32,14 +32,14 @@ def test_sqrt_param_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
- np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-7
+ np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - node.value) < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_sub_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_sub_param.py
index f906427e..323c0929 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_sub_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_sub_param.py
@@ -20,8 +20,8 @@ def test_sub_parm_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -36,17 +36,17 @@ def test_sub_parm_model_eval():
model_node = ModelNode(node)
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-7
- assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - node.value[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - node.value[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - node.value[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - node.value) < 1e-5
assert (
np.linalg.norm(
model_node.eval_many(np.row_stack((data_1, data_2))) - node.value
)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_unary_binary_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_unary_binary_param.py
index f558c990..3b436583 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_unary_binary_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_unary_binary_param.py
@@ -21,8 +21,8 @@ def test_un_bin_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
test_data_2 = np.random.random(10) * 2e4 - 1e4
@@ -38,20 +38,20 @@ def test_un_bin_model_eval():
model_node = ModelNode(node_2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
data_2 = np.random.random(90) * 2e4 - 1e4
val_data = ((data_1 + 0.5 * data_2 + 4.0) + 2.0) ** 2.0
data_dict = {"t_a": data_1[0], "x_a": data_2[0]}
- assert abs(model_node.eval([data_1[0], data_2[0]]) - val_data[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - val_data[0]) < 1e-7
- assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-7
+ assert abs(model_node.eval([data_1[0], data_2[0]]) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0], data_2[0]])) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-5
data_dict = {"t_a": data_1, "x_a": data_2}
- assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-5
assert (
np.linalg.norm(model_node.eval_many(np.row_stack((data_1, data_2))) - val_data)
- < 1e-7
+ < 1e-5
)
diff --git a/tests/pytest/test_model_eval/test_param_model_node/test_unary_unary_param.py b/tests/pytest/test_model_eval/test_param_model_node/test_unary_unary_param.py
index e70c6a5e..b98f7f54 100644
--- a/tests/pytest/test_model_eval/test_param_model_node/test_unary_unary_param.py
+++ b/tests/pytest/test_model_eval/test_param_model_node/test_unary_unary_param.py
@@ -21,8 +21,8 @@ def test_un_un_model_eval():
initialize_param_storage()
optimizer = get_reg_optimizer([90], np.zeros(90), 2, 2, 0.5, False)
- data_1 = np.random.random(90) * 1e4 + 1e-10
- test_data_1 = np.random.random(10) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
+ test_data_1 = np.random.random(10) * 1e4 + 0.1
feat_1 = FeatureNode(0, "t_a", data_1, test_data_1, Unit())
feats = []
@@ -35,17 +35,17 @@ def test_un_un_model_eval():
model_node = ModelNode(node_2)
- data_1 = np.random.random(90) * 1e4 + 1e-10
+ data_1 = np.random.random(90) * 1e4 + 0.1
val_data = 1.0 / ((3.0 * data_1 + 4.0) ** 2.0 + 2.0)
data_dict = {"t_a": data_1[0]}
- assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-7
- assert abs(model_node.eval([data_1[0]]) - val_data[0]) < 1e-7
- assert abs(model_node.eval(np.array([data_1[0]])) - val_data[0]) < 1e-7
+ assert abs(model_node.eval(data_dict) - val_data[0]) < 1e-5
+ assert abs(model_node.eval([data_1[0]]) - val_data[0]) < 1e-5
+ assert abs(model_node.eval(np.array([data_1[0]])) - val_data[0]) < 1e-5
data_dict = {"t_a": data_1}
- assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-7
- assert np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - val_data) < 1e-7
+ assert np.linalg.norm(model_node.eval_many(data_dict) - val_data) < 1e-5
+ assert np.linalg.norm(model_node.eval_many(data_1.reshape(1, -1)) - val_data) < 1e-5
if __name__ == "__main__":
--
GitLab