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

Generated Feature projection ind starts at _phi.size not STORE_FREATURES

Fixes a minor bug
parent 479fb761
No related branches found
No related tags found
No related merge requests found
...@@ -689,7 +689,7 @@ void FeatureSpace::project_generated(const double* prop, const int size, std::ve ...@@ -689,7 +689,7 @@ void FeatureSpace::project_generated(const double* prop, const int size, std::ve
{ {
std::vector<node_ptr> phi_sel_private(phi_sel); std::vector<node_ptr> phi_sel_private(phi_sel);
std::vector<double> scores_sel_private(scores_sel); std::vector<double> scores_sel_private(scores_sel);
int index_base = node_value_arrs::N_STORE_FEATURES + _n_sis_select * (omp_get_thread_num() + _mpi_comm->size()); int index_base = _phi.size() + _n_sis_select * (omp_get_thread_num() + _mpi_comm->size());
#ifdef PARAMETERIZE #ifdef PARAMETERIZE
std::shared_ptr<NLOptimizer> optimizer = nlopt_wrapper::get_optimizer(_project_type, _task_sizes, _prop, _max_phi, _max_param_depth); std::shared_ptr<NLOptimizer> optimizer = nlopt_wrapper::get_optimizer(_project_type, _task_sizes, _prop, _max_phi, _max_param_depth);
...@@ -698,7 +698,7 @@ void FeatureSpace::project_generated(const double* prop, const int size, std::ve ...@@ -698,7 +698,7 @@ void FeatureSpace::project_generated(const double* prop, const int size, std::ve
#pragma omp for schedule(dynamic) #pragma omp for schedule(dynamic)
for(auto feat = _phi.begin() + _start_gen.back() + _mpi_comm->rank(); feat < _phi.end(); feat += _mpi_comm->size()) for(auto feat = _phi.begin() + _start_gen.back() + _mpi_comm->rank(); feat < _phi.end(); feat += _mpi_comm->size())
{ {
unsigned long int feat_ind = node_value_arrs::N_STORE_FEATURES + _n_sis_select * (omp_get_num_threads() + _mpi_comm->size()); unsigned long int feat_ind = _phi.size() + _n_sis_select * (omp_get_num_threads() + _mpi_comm->size());
node_value_arrs::clear_temp_reg_thread(); node_value_arrs::clear_temp_reg_thread();
std::vector<node_ptr> generated_phi; std::vector<node_ptr> generated_phi;
...@@ -774,7 +774,7 @@ void FeatureSpace::project_generated(const double* prop, const int size, std::ve ...@@ -774,7 +774,7 @@ void FeatureSpace::project_generated(const double* prop, const int size, std::ve
#pragma omp critical #pragma omp critical
{ {
index_base = node_value_arrs::N_STORE_FEATURES + _n_sis_select * _mpi_comm->rank(); index_base = _phi.size() + _n_sis_select * _mpi_comm->rank();
worst_score_ind = std::max_element(scores_sel.begin(), scores_sel.end()) - scores_sel.begin(); worst_score_ind = std::max_element(scores_sel.begin(), scores_sel.end()) - scores_sel.begin();
for(int sc = 0; sc < scores_sel_private.size(); ++sc) for(int sc = 0; sc < scores_sel_private.size(); ++sc)
{ {
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment