diff --git a/src/feature_creation/node/value_storage/nodes_value_containers.cpp b/src/feature_creation/node/value_storage/nodes_value_containers.cpp index 04a70109e4181074178c198d3fdf48dd897e7009..634fb7ff551c3a37d673e49157658674b3f19384 100644 --- a/src/feature_creation/node/value_storage/nodes_value_containers.cpp +++ b/src/feature_creation/node/value_storage/nodes_value_containers.cpp @@ -63,26 +63,6 @@ void node_value_arrs::initialize_values_arr( TEST_VALUES_ARR = std::vector<double>(N_STORE_FEATURES * N_SAMPLES_TEST); } -void node_value_arrs::initialize_values_arr( - const int n_samples, - const int n_samples_test, - const int n_primary_feat, - const int max_rung, - const bool set_task_sz, - const bool use_params -) -{ - initialize_values_arr(n_samples, n_samples_test, n_primary_feat); - - if(set_task_sz) - { - set_task_sz_train({n_samples}); - set_task_sz_test({n_samples_test}); - } - - set_max_rung(max_rung, use_params); -} - void node_value_arrs::initialize_values_arr( const std::vector<int> task_sz_train, const std::vector<int> task_sz_test, diff --git a/src/feature_creation/node/value_storage/nodes_value_containers.hpp b/src/feature_creation/node/value_storage/nodes_value_containers.hpp index 413fcf07e7d52d889bc14ae97bed593a4f55606b..18a88b27b6d4f2734cc07d73b054c0b2518d8acd 100644 --- a/src/feature_creation/node/value_storage/nodes_value_containers.hpp +++ b/src/feature_creation/node/value_storage/nodes_value_containers.hpp @@ -84,44 +84,6 @@ namespace node_value_arrs const int n_primary_feat ); - /** - * @brief Initialize all central storage vectors/descriptive variables - * - * @param n_samples The number of training samples for each feature (Sum of all elements in TASK_SZ_TRAIN) - * @param n_samples_test The number of test samples for each feature (Sum of all elements in TASK_SZ_TEST) - * @param n_primary_feat The number of primary features - * @param max_rung The maximum rung for all features - * @param set_test_task_sz If True reset the task_sz vectors - * @param use_params If True set up parameterized feature storage as well - */ - void initialize_values_arr( - const int n_samples, - const int n_samples_test, - const int n_primary_feat, - const int max_rung, - const bool set_task_sz, - const bool use_params - ); - - // DocString: node_vals_init_no_ts - /** - * @brief Initialize all central storage vectors/descriptive variables - * - * @param n_samples The number of training samples for each feature (Sum of all elements in TASK_SZ_TRAIN) - * @param n_samples_test The number of test samples for each feature (Sum of all elements in TASK_SZ_TEST) - * @param n_primary_feat The number of primary features - * @param max_rung The maximum rung for all features - */ - inline void initialize_values_arr( - const int n_samples, - const int n_samples_test, - const int n_primary_feat, - const int max_rung - ) - { - initialize_values_arr(n_samples, n_samples_test, n_primary_feat, max_rung, true, false); - } - /** * @brief Initialize all central storage vectors/descriptive variables * diff --git a/src/python/py_binding_cpp_def/bindings_docstring_keyed.cpp b/src/python/py_binding_cpp_def/bindings_docstring_keyed.cpp index 7883783bda7b214ea53423dc52a37987b9142f2d..51e663c2fd3b7b4f0f47d27afd014848d755d8c6 100644 --- a/src/python/py_binding_cpp_def/bindings_docstring_keyed.cpp +++ b/src/python/py_binding_cpp_def/bindings_docstring_keyed.cpp @@ -59,20 +59,12 @@ void sisso::register_all() sisso::feature_creation::node::registerSqrtNode(); sisso::feature_creation::node::registerSixPowNode(); - void (*init_val_ar)(int, int, int, int) = &node_value_arrs::initialize_values_arr; - def( "phi_selected_from_file", &str2node::phi_selected_from_file_py, (arg("filename"), arg("phi_0")), "@DocString_node_utils_phi_sel_from_file@" ); - def( - "initialize_values_arr", - init_val_ar, - (arg("n_samples"), arg("n_samples_test"), arg("n_primary_feat"), arg("max_rung")), - "@DocString_node_vals_init_no_ts@" - ); void (*init_val_ar_list)(py::list, py::list, int, int, bool) = &node_value_arrs::initialize_values_arr; void (*init_val_ar_arr)(np::ndarray, np::ndarray, int, int, bool) = &node_value_arrs::initialize_values_arr; diff --git a/src/python/py_binding_cpp_def/feature_creation/FeatureNode.cpp b/src/python/py_binding_cpp_def/feature_creation/FeatureNode.cpp index 61b100fc2135105f814e2a3c9c06dada05dcd91d..eff20559676fb04fb88f44299dc3699252c7df3b 100644 --- a/src/python/py_binding_cpp_def/feature_creation/FeatureNode.cpp +++ b/src/python/py_binding_cpp_def/feature_creation/FeatureNode.cpp @@ -31,7 +31,7 @@ FeatureNode::FeatureNode(unsigned long int feat_ind, std::string expr, np::ndarr // Automatically resize the storage arrays if(node_value_arrs::N_STORE_FEATURES == 0) { - node_value_arrs::initialize_values_arr(_n_samp, _n_samp_test, 1, 0); + node_value_arrs::initialize_values_arr(_n_samp, _n_samp_test, 1); } else if((_n_samp != node_value_arrs::N_SAMPLES) || (_n_samp_test != node_value_arrs::N_SAMPLES_TEST)) { @@ -65,7 +65,7 @@ FeatureNode::FeatureNode(unsigned long int feat_ind, std::string expr, py::list // Automatically resize the storage arrays if(node_value_arrs::N_STORE_FEATURES == 0) { - node_value_arrs::initialize_values_arr(_n_samp, _n_samp_test, 1, 0); + node_value_arrs::initialize_values_arr(_n_samp, _n_samp_test, 1); } else if((_n_samp != node_value_arrs::N_SAMPLES) || (_n_samp_test != node_value_arrs::N_SAMPLES_TEST)) { diff --git a/tests/googletest/utils/test_project.cc b/tests/googletest/utils/test_project.cc index e5b0c0d15e589fc5f6015ced1f1ea3f04276b1c8..0f4b70dc1c0eb8e242cfc670b222260d1589b78a 100644 --- a/tests/googletest/utils/test_project.cc +++ b/tests/googletest/utils/test_project.cc @@ -20,7 +20,7 @@ namespace { //test mean calculations TEST(Project, ProjectTest) { - node_value_arrs::initialize_values_arr({4}, {0}, 1, 0, true, false); + node_value_arrs::initialize_values_arr({4}, {0}, 1, 0, false); std::vector<double> prop = {1.0, 3.0, 5.0, 6.0}; std::vector<double> prop_class = {0.0, 0.0, 0.0, 1.0}; std::vector<double> val = {2.0, 2.0, 3.0, 4.0}; diff --git a/tests/pytest/test_descriptor_identifier/test_log_regressor.py b/tests/pytest/test_descriptor_identifier/test_log_regressor.py index e28f250d9846b6679bdd9c44284753f026b0730c..bb56c606ba77f3f97bf53b180fefe9b4eb927735 100644 --- a/tests/pytest/test_descriptor_identifier/test_log_regressor.py +++ b/tests/pytest/test_descriptor_identifier/test_log_regressor.py @@ -27,7 +27,7 @@ def test_sisso_log_regressor(): task_sizes_train = [90] task_sizes_test = [10] - initialize_values_arr(task_sizes_train[0], task_sizes_test[0], 10, 2) + initialize_values_arr(task_sizes_train, task_sizes_test, 10, 2) inputs = Inputs() inputs.phi_0 = [