diff --git a/src/descriptor_identifier/Model/Model.cpp b/src/descriptor_identifier/Model/Model.cpp index b8968f25c69bc73abf59fa66ea1f1d10e434cde0..16fc590e77cf8e7253ab98d189d3af1b35aa5c8f 100644 --- a/src/descriptor_identifier/Model/Model.cpp +++ b/src/descriptor_identifier/Model/Model.cpp @@ -147,7 +147,7 @@ void Model::test_to_file(std::string filename, std::vector<int> test_inds) out_file_stream << "\n"; } - out_file_stream << "#Test Indexes: [ " << test_inds[0]; + out_file_stream << "# Test Indexes: [ " << test_inds[0]; for(int ii = 1; ii < test_inds.size(); ++ii) out_file_stream << ", " << test_inds[ii]; out_file_stream << " ]" << std::endl; diff --git a/src/feature_creation/feature_space/FeatureSpace.cpp b/src/feature_creation/feature_space/FeatureSpace.cpp index d78efeb0e1853fe8c22eb7cff5774203ece2820b..d3a296ef58d39eb1d05ec4272401da9c09c612a7 100644 --- a/src/feature_creation/feature_space/FeatureSpace.cpp +++ b/src/feature_creation/feature_space/FeatureSpace.cpp @@ -73,6 +73,7 @@ void FeatureSpace::generate_new_feats(std::vector<node_ptr>::iterator& feat, std { int phi_ind = feat - _phi.begin(); feat_set.reserve(feat_set.size() + _un_operators.size() + phi_ind * (_com_bin_operators.size() + 2 * _bin_operators.size())); + for(auto& op : _un_operators) { try @@ -363,7 +364,7 @@ void FeatureSpace::project_generated(double* prop, int size, std::vector<node_pt bool is_valid = valid_score_against_current(end_check, generated_phi[inds[ii]]->value_ptr(), scores[inds[ii]], scores_sel, scores_comp); // Check the feature against those selected from previous SIS iterations if((node_value_arrs::N_SELECTED > _n_sis_select) && is_valid) - is_valid = valid_score_against_past(_phi[inds[ii]]->value_ptr(), _scores[inds[ii]], scores_prev_sel, scores_comp); + is_valid = valid_score_against_past(generated_phi[inds[ii]]->value_ptr(), scores[inds[ii]], scores_prev_sel, scores_comp); if(is_valid) {