Changeset 6dfa37

Timestamp:

Jul 20, 2017, 9:38:38 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued

Children:

3a5de5

Parents:

8270be

git-author:

Frederik Heber <frederik.heber@…> (06/27/17 21:04:40)

git-committer:

Frederik Heber <frederik.heber@…> (07/20/17 09:38:38)

Message:

ForceAnnealing accepts option deltat.

Location:

src

Files:

• Actions/MoleculeAction/ForceAnnealingAction.cpp (modified) (1 diff)
• Actions/MoleculeAction/ForceAnnealingAction.def (modified) (2 diffs)
• Dynamics/ForceAnnealing.hpp (modified) (2 diffs)

src/Actions/MoleculeAction/ForceAnnealingAction.cpp

@@ -113 +113 @@
   ForceAnnealing<std::vector<atom *> > optimizer(
       set,
+      params.deltat.get(),
       true,
       params.steps.get(),

src/Actions/MoleculeAction/ForceAnnealingAction.def

@@ -9 +9 @@
 #include <boost/filesystem/path.hpp>
 
+#include <limits>
+
 #include "Parameters/Validators/DummyValidator.hpp"
 #include "Parameters/Validators/GenericValidators.hpp"
@@ -17 +19 @@
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
 // "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
-#define paramtypes (boost::filesystem::path)(unsigned int)(bool)(int)(double)(bool)
-#define paramtokens ("forces-file")("steps")("output-every-step")("max-distance")("damping-factor")("use-bondgraph")
-#define paramdescriptions ("file containing")("fixed number of optimization steps to be performed")("whether WorldTime should be increased and output written after every step, useful if optimization might hang")("maximum distance to which bond graph is taken into account")("damping factor for decreasing the shift with bond graph distance from the causing site")("whether annealing should take place focusing on atoms alone or on the bonds (faster)")
-#define paramdefaults (PARAM_DEFAULT(""))(NOPARAM_DEFAULT)(PARAM_DEFAULT("0"))(PARAM_DEFAULT(0))(PARAM_DEFAULT(0.5))(PARAM_DEFAULT(0))
-#define paramreferences (forcesfile)(steps)(DoOutput)(MaxDistance)(DampingFactor)(UseBondGraph)
+#define paramtypes (boost::filesystem::path)(double)(unsigned int)(bool)(int)(double)(bool)
+#define paramtokens ("forces-file")("deltat")("steps")("output-every-step")("max-distance")("damping-factor")("use-bondgraph")
+#define paramdescriptions ("file containing")("basic step width to be used")("fixed number of optimization steps to be performed")("whether WorldTime should be increased and output written after every step, useful if optimization might hang")("maximum distance to which bond graph is taken into account")("damping factor for decreasing the shift with bond graph distance from the causing site")("whether annealing should take place focusing on atoms alone or on the bonds (faster)")
+#define paramdefaults (PARAM_DEFAULT(""))(PARAM_DEFAULT(0.1))(NOPARAM_DEFAULT)(PARAM_DEFAULT("0"))(PARAM_DEFAULT(0))(PARAM_DEFAULT(0.5))(PARAM_DEFAULT(0))
+#define paramreferences (forcesfile)(deltat)(steps)(DoOutput)(MaxDistance)(DampingFactor)(UseBondGraph)
 #define paramvalids \
 (DummyValidator< boost::filesystem::path >()) \
+(RangeValidator< double >(std::numeric_limits<double>::min(), std::numeric_limits<double>::max())) \
 (NotZeroValidator< unsigned int >()) \
 (DummyValidator<bool>()) \

src/Dynamics/ForceAnnealing.hpp

@@ -70 +70 @@
   ForceAnnealing(
       AtomSetMixin<T> &_atoms,
+      const double _Deltat,
       bool _IsAngstroem,
       const size_t _maxSteps,
       const int _max_distance,
       const double _damping_factor) :
-    AtomicForceManipulator<T>(_atoms, 1., _IsAngstroem),
+    AtomicForceManipulator<T>(_atoms, _Deltat, _IsAngstroem),
     maxSteps(_maxSteps),
     max_distance(_max_distance),
     damping_factor(_damping_factor)
   {}
+
   /** Destructor of class ForceAnnealing.
    *
@@ -120 +122 @@
         anneal(_CurrentTimeStep, _offset, maxComponents);
     }
-
 
     LOG(1, "STATUS: Largest remaining force components at step #"