Changeset 03d40df for src/Dynamics/ForceAnnealing.hpp

Timestamp:

Nov 7, 2017, 7:35:32 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued_betteresults

Children:

e237c8c

Parents:

10b1ef

git-author:

Frederik Heber <frederik.heber@…> (08/08/17 20:43:42)

git-committer:

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

Message:

FIX: maxComponents was not chosen by absolute magnitude.

File:

• src/Dynamics/ForceAnnealing.hpp (modified) (2 diffs)

src/Dynamics/ForceAnnealing.hpp

@@ -167 +167 @@
       // extract largest components for showing progress of annealing
       for(size_t i=0;i<NDIM;++i)
-        if (currentGradient[i] > maxComponents[i])
-          maxComponents[i] = currentGradient[i];
+        maxComponents[i] = std::max(maxComponents[i], fabs(currentGradient[i]));
 
       // are we in initial step? Then don't check against velocity
@@ -312 +311 @@
       // extract largest components for showing progress of annealing
       for(size_t i=0;i<NDIM;++i)
-        if (currentGradient[i] > maxComponents[i])
-          maxComponents[i] = currentGradient[i];
+        maxComponents[i] = std::max(maxComponents[i], fabs(currentGradient[i]));
     }
     // apply the gathered updates