diff --git a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp index a0a3f803139dcec5649d2b475bef3b1b3efe6ead..1b916648831a7efd5d89ef540da474f2e191236a 100644 --- a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp +++ b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp @@ -10,10 +10,9 @@ SISSOClassifier::SISSOClassifier( std::vector<int> leave_out_inds, int n_dim, int n_residual, - int n_models_store, - bool fix_intercept + int n_models_store ): - SISSO_DI(feat_space, prop_unit, prop, prop_test, task_sizes_train, task_sizes_test, leave_out_inds, n_dim, n_residual, n_models_store, fix_intercept), + SISSO_DI(feat_space, prop_unit, prop, prop_test, task_sizes_train, task_sizes_test, leave_out_inds, n_dim, n_residual, n_models_store, false), _lp_elements((n_dim + 1) * _n_samp, 0.0), _lp_row_lower((n_dim + 1) * _n_samp, 1.0), _lp_row_upper((n_dim + 1) * _n_samp, 1.0), diff --git a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp index 223475a0207c96864b8ab4e4aa54434004b840e6..9ce400a5e4e4dc9d6cdf4450edb99d91134d3d71 100644 --- a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp +++ b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp @@ -74,9 +74,8 @@ public: * @param n_dim Maximum dimensionality of the generated models * @param n_residual Number of residuals to pass to the next SIS operation * @param n_models_store Number of features to store in files - * @param fix_intrecept If true fix intercept to 0 */ - SISSOClassifier(std::shared_ptr<FeatureSpace> feat_space, Unit prop_unit, std::vector<double> prop, std::vector<double> prop_test, std::vector<int> task_sizes_train, std::vector<int> task_sizes_test, std::vector<int> leave_out_inds, int n_dim, int n_residual, int n_models_store, bool fix_intercept=false); + SISSOClassifier(std::shared_ptr<FeatureSpace> feat_space, Unit prop_unit, std::vector<double> prop, std::vector<double> prop_test, std::vector<int> task_sizes_train, std::vector<int> task_sizes_test, std::vector<int> leave_out_inds, int n_dim, int n_residual, int n_models_store); /** * @brief Check to ensure all classes in prop_test are in prop @@ -186,8 +185,7 @@ public: py::list leave_out_inds, int n_dim, int n_residual, - int n_models_store, - bool fix_intercept=false + int n_models_store ); // DocString: sisso_class_init_list @@ -216,8 +214,7 @@ public: py::list leave_out_inds, int n_dim, int n_residual, - int n_models_store, - bool fix_intercept=false + int n_models_store ); // DocString: sisso_class_models_py diff --git a/src/python/descriptor_identifier/SISSOClassifier.cpp b/src/python/descriptor_identifier/SISSOClassifier.cpp index f4ef0d30404626622a7e89a764a379dd1edb0aed..e4c6af96b303c7ae8b02968b589ea78d12d00341 100644 --- a/src/python/descriptor_identifier/SISSOClassifier.cpp +++ b/src/python/descriptor_identifier/SISSOClassifier.cpp @@ -10,10 +10,9 @@ SISSOClassifier::SISSOClassifier( py::list leave_out_inds, int n_dim, int n_residual, - int n_models_store, - bool fix_intercept + int n_models_store ) : - SISSO_DI(feat_space, prop_unit, prop, prop_test, task_sizes_train, task_sizes_test, leave_out_inds, n_dim, n_residual, n_models_store, fix_intercept), + SISSO_DI(feat_space, prop_unit, prop, prop_test, task_sizes_train, task_sizes_test, leave_out_inds, n_dim, n_residual, n_models_store, false), _lp_elements((n_dim + 1) * _n_samp, 0.0), _lp_row_lower((n_dim + 1) * _n_samp, 1.0), _lp_row_upper((n_dim + 1) * _n_samp, 1.0), @@ -46,10 +45,9 @@ SISSOClassifier::SISSOClassifier( py::list leave_out_inds, int n_dim, int n_residual, - int n_models_store, - bool fix_intercept + int n_models_store ) : - SISSO_DI(feat_space, prop_unit, prop, prop_test, task_sizes_train, task_sizes_test, leave_out_inds, n_dim, n_residual, n_models_store, fix_intercept), + SISSO_DI(feat_space, prop_unit, prop, prop_test, task_sizes_train, task_sizes_test, leave_out_inds, n_dim, n_residual, n_models_store, false), _lp_elements((n_dim + 1) * _n_samp, 0.0), _lp_row_lower((n_dim + 1) * _n_samp, 1.0), _lp_row_upper((n_dim + 1) * _n_samp, 1.0),