Ignore:
Timestamp:
May 23, 2017, 8:58:02 PM (8 years ago)
Author:
Frederik Heber <frederik.heber@…>
Branches:
ForceAnnealing_tocheck
Children:
175543
Parents:
9190e6
Message:

tempcommit: Merge with 9190e6a

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/MoleculeAction/ForceAnnealingAction.def

    r9190e6 rb03d7d  
    1616// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    1717// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
    18 #define paramtypes (boost::filesystem::path)(unsigned int)(bool)
    19 #define paramtokens ("forces-file")("steps")("output-every-step")
    20 #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")
    21 #define paramdefaults (PARAM_DEFAULT(""))(NOPARAM_DEFAULT)(PARAM_DEFAULT("0"))
    22 #define paramreferences (forcesfile)(steps)(DoOutput)
     18#define paramtypes (boost::filesystem::path)(unsigned int)(bool)(int)
     19#define paramtokens ("forces-file")("steps")("output-every-step")("max-distance")
     20#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")
     21#define paramdefaults (PARAM_DEFAULT(""))(NOPARAM_DEFAULT)(PARAM_DEFAULT("0"))(PARAM_DEFAULT(0))
     22#define paramreferences (forcesfile)(steps)(DoOutput)(MaxDistance)
    2323#define paramvalids \
    2424(DummyValidator< boost::filesystem::path >()) \
    2525(NotZeroValidator< unsigned int >()) \
    26 (DummyValidator<bool>())
     26(DummyValidator<bool>()) \
     27(DummyValidator< int >())
    2728
    2829#define statetypes (std::vector<AtomicInfo>)(std::vector<AtomicInfo>)
Note: See TracChangeset for help on using the changeset viewer.