From c4a33073cc2c0829e10e5e31ec93e456ed97ac4c Mon Sep 17 00:00:00 2001
From: Thomas Purcell <purcell@fhi-berlin.mpg.de>
Date: Mon, 15 Jun 2020 08:36:52 +0200
Subject: [PATCH] Bug fixes for checking valid features against past
used wrong variables.
---
src/descriptor_identifier/Model/Model.cpp | 2 +-
src/feature_creation/feature_space/FeatureSpace.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/descriptor_identifier/Model/Model.cpp b/src/descriptor_identifier/Model/Model.cpp
index b8968f25..16fc590e 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 d78efeb0..d3a296ef 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)
{
--
GitLab