Changeset 19f59c

Timestamp:

Nov 7, 2017, 7:39:45 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued_betteresults

Children:

e9fa721

Parents:

1ea892

git-author:

Frederik Heber <frederik.heber@…> (07/18/17 21:42:07)

git-committer:

Frederik Heber <frederik.heber@…> (11/07/17 07:39:45)

Message:

FIX: unnecessary output iterator present in FunctionaApproximation::evaluate().

File:

• src/FunctionApproximation/FunctionApproximation.cpp (modified) (4 diffs)

src/FunctionApproximation/FunctionApproximation.cpp

@@ -134 +134 @@
     p = new double[m];
     size_t index = 0;
+    // cannot use std::copy here because of additional dereference
     for(FunctionModel::parameters_t::const_iterator paramiter = params.begin();
         paramiter != params.end();
@@ -148 +149 @@
     x = new double[n];
     size_t index = 0;
+    // cannot use std::copy here because of additional dereference
     for(outputs_t::const_iterator outiter = output_data.begin();
         outiter != output_data.end();
@@ -341 +343 @@
   if (!output_data.empty()) {
     filtered_inputs_t::const_iterator initer = input_data.begin();
-    outputs_t::const_iterator outiter = output_data.begin();
+//    outputs_t::const_iterator outiter = output_data.begin();
     size_t index = 0;
-    for (; initer != input_data.end(); ++initer, ++outiter) {
+    for (; initer != input_data.end(); ++initer /* , ++outiter */) {
       // result may be a vector, calculate L2 norm
       const FunctionModel::results_t functionvalue =
@@ -369 +371 @@
   if (!output_data.empty()) {
     filtered_inputs_t::const_iterator initer = input_data.begin();
-    outputs_t::const_iterator outiter = output_data.begin();
+//    outputs_t::const_iterator outiter = output_data.begin();
     size_t index = 0;
-    for (; initer != input_data.end(); ++initer, ++outiter) {
+    for (; initer != input_data.end(); ++initer /*, ++outiter */) {
       // result may be a vector, calculate L2 norm
       for (int paramindex = 0; paramindex < m; ++paramindex) {