Skip to content
Snippets Groups Projects
Commit e53a09f5 authored by Thomas Purcell's avatar Thomas Purcell
Browse files

Update bindings/main/tests for the new no fix_intercept policy

Classification without fix_intercept now included in all files
parent a2145083
No related branches found
No related tags found
No related merge requests found
Pipeline #82905 passed
......@@ -57,7 +57,7 @@ int main(int argc, char const *argv[])
}
else if(IP._calc_type.compare("classification") == 0)
{
SISSOClassifier sisso(IP._feat_space, IP._prop_unit, IP._prop_train, IP._prop_test, IP._task_sizes_train, IP._task_sizes_test, IP._leave_out_inds, IP._n_dim, IP._n_residuals, IP._n_models_store, IP._fix_intercept);
SISSOClassifier sisso(IP._feat_space, IP._prop_unit, IP._prop_train, IP._prop_test, IP._task_sizes_train, IP._task_sizes_test, IP._leave_out_inds, IP._n_dim, IP._n_residuals, IP._n_models_store);
sisso.fit();
if(mpi_setup::comm->rank() == 0)
......
......@@ -438,8 +438,8 @@ void sisso::descriptor_identifier::registerSISSORegressor()
void sisso::descriptor_identifier::registerSISSOClassifier()
{
class_<SISSOClassifier, bases<SISSO_DI>>("SISSOClassifier", init<std::shared_ptr<FeatureSpace>, Unit, np::ndarray, np::ndarray, py::list, py::list, py::list, int, int, int, optional<bool>>())
.def(init<std::shared_ptr<FeatureSpace>, Unit, py::list, py::list, py::list, py::list, py::list, int, int, int, optional<bool>>())
class_<SISSOClassifier, bases<SISSO_DI>>("SISSOClassifier", init<std::shared_ptr<FeatureSpace>, Unit, np::ndarray, np::ndarray, py::list, py::list, py::list, int, int, int>())
.def(init<std::shared_ptr<FeatureSpace>, Unit, py::list, py::list, py::list, py::list, py::list, int, int, int>())
.def("fit", &SISSOClassifier::fit, "@DocString_sisso_class_fit@")
.add_property("models", &SISSOClassifier::models_py, "@DocString_sisso_class_models_py@")
;
......
......@@ -76,17 +76,7 @@ def test_sisso_classifier():
feat_space = generate_fs(phi_0, prop, [80], op_set, "classification", 1, 10)
sisso = SISSOClassifier(
feat_space,
Unit("m"),
prop,
prop_test,
[80],
[20],
list(range(10)),
2,
1,
1,
False,
feat_space, Unit("m"), prop, prop_test, [80], [20], list(range(10)), 2, 1, 1
)
sisso.fit()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment