Changeset b4fa106 for src/Actions


Ignore:
Timestamp:
Aug 28, 2010, 12:57:50 AM (15 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
e3e6e2
Parents:
9ee38b
git-author:
Frederik Heber <heber@…> (08/26/10 13:23:21)
git-committer:
Frederik Heber <heber@…> (08/28/10 00:57:50)
Message:

Extended action generating macro framework to create specialized ActionState, too.

  • types, tokens, references -> param...
  • new statetypes, statereferences that have to be defined for additional variables in the state
Location:
src/Actions
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/Action_impl_header.hpp

    r9ee38b rb4fa106  
    2323#define ACTION BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Action))
    2424#define COMMAND BOOST_PP_CAT(CATEGORY, ACTIONNAME)
    25 #define STATE BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, State))
    2625#define PARAMS BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Parameters))
    27 #define PARAMSDOT BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Parameters))
    2826
    2927// check if no lists given
    30 #ifndef types
    31 #define MAXNOTOKENS 0
     28#ifndef paramtypes
     29#define MAXPARAMTYPES 0
    3230#else
    33 #define MAXNOTOKENS BOOST_PP_SEQ_SIZE(types)
     31#define MAXPARAMTYPES BOOST_PP_SEQ_SIZE(paramtypes)
    3432#endif
    3533
    … …  
    4442
    4543// calculate numbers and check whether all have same size
    46 #ifdef tokens
    47 BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXNOTOKENS, BOOST_PP_SEQ_SIZE(tokens)),\
    48   ERROR: There are not the same number of "tokens" and "types" in: __FILE__ \
     44#ifdef paramtokens
     45BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramtokens)),\
     46  ERROR: There are not the same number of "paramtokens" and "paramtypes" in: __FILE__ \
    4947)
    5048#endif
    51 #ifdef references
    52 BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXNOTOKENS, BOOST_PP_SEQ_SIZE(references)),\
    53   ERROR: There are not the same number of "tokens" and "references" in: __FILE__ \
     49#ifdef paramreferences
     50BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramreferences)),\
     51  ERROR: There are not the same number of "paramtokens" and "paramreferences" in: __FILE__ \
    5452)
    5553#endif
    5654
    5755// print a list of type ref followed by a separator, i.e. "int i;"
    58 #define type_print(z,n,separator) \
    59   BOOST_PP_SEQ_ELEM(n, types) \
    60   BOOST_PP_SEQ_ELEM(n, references)\
     56#define type_print(z,n,TYPELIST, VARLIST, separator) \
     57  BOOST_PP_SEQ_ELEM(n, TYPELIST) \
     58  BOOST_PP_SEQ_ELEM(n, VARLIST)\
    6159  separator
    6260
    6361// print a list of type ref followed, i.e. "int i, double position"
    64 #define type_list(z,n,unused) \
     62#define type_list(z,n,TYPELIST, VARLIST) \
    6563  BOOST_PP_COMMA_IF(n)\
    66   BOOST_PP_SEQ_ELEM(n, types) \
    67   BOOST_PP_SEQ_ELEM(n, references)
     64  BOOST_PP_SEQ_ELEM(n, TYPELIST) \
     65  BOOST_PP_SEQ_ELEM(n, VARLIST)
    6866
    69 // prints dialog->query calls for types with tokens
    70 #define dialog_print(z,n,unused) \
    71   dialog->query<\
    72   BOOST_PP_SEQ_ELEM(n, types)\
    73   >(\
    74   BOOST_PP_SEQ_ELEM(n, tokens)\
    75   , ValueStorage::getInstance().getDescription(\
    76   BOOST_PP_SEQ_ELEM(n, tokens)\
    77   ));
    78 
    79 // prints set/queryCurrentValue (command) for references and tokens
    80 #define value_print(z,n,command) \
    81   ValueStorage::getInstance(). command (\
    82   BOOST_PP_SEQ_ELEM(n, tokens)\
    83   , \
    84   params.\
    85   BOOST_PP_SEQ_ELEM(n, references)\
    86   );
    87 
    88 #if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
    89 #define COMMANDFULL \
    90 void COMMAND( \
    91 BOOST_PP_REPEAT(MAXNOTOKENS, type_list, ~) \
    92 )
     67#if defined paramtypes && defined paramreferences
     68void COMMAND(
     69#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
     70#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
     71#include BOOST_PP_LOCAL_ITERATE()
     72    );
    9373# else
    94 #define COMMANDFULL void COMMAND()
     74void COMMAND();
    9575#endif
    9676
    97 COMMANDFULL;
     77class ACTION : public Action {
     78  friend
     79  #if defined paramtypes && defined paramreferences
     80  void COMMAND(
     81  #define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
     82  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
     83  #include BOOST_PP_LOCAL_ITERATE()
     84      );
     85  # else
     86  void COMMAND();
     87  #endif
    9888
    99 class ACTION : public Action {
    100   friend COMMANDFULL;
    10189public:
    10290  ACTION();
    … …  
    10997
    11098  struct PARAMS : ActionParameters {
    111   #if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
    112   #define BOOST_PP_LOCAL_MACRO(n) type_print(~, n, ;)
    113   #define BOOST_PP_LOCAL_LIMITS  (0, MAXNOTOKENS-1)
     99  #if defined paramtypes && defined paramreferences
     100  #define BOOST_PP_LOCAL_MACRO(n) type_print(~, n, paramtypes, paramreferences, ;)
     101  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
    114102  #include BOOST_PP_LOCAL_ITERATE()
    115   #undef BOOST_PP_LOCAL_MACRO
    116   #undef BOOST_PP_LOCAL_LIMITS
    117103  #endif
    118104  } params;
    … …  
    129115};
    130116
    131 #undef types
    132 #undef tokens
    133 #undef references
    134 #undef MAXNOTOKENS
     117#undef paramtypes
     118#undef paramtokens
     119#undef paramreferences
     120#undef MAXPARAMTYPES
     121#undef statetypes
     122#undef statereferences
     123#undef MAXSTATETYPES
    135124
    136125#undef ACTION
    137 #undef ACTIONNAME
    138 #undef CATEGORY
    139126#undef COMMAND
    140127#undef COMMANDFULL
    141128#undef PARAMS
    142 #undef STATE
     129
     130#undef ACTIONNAME
     131#undef CATEGORY
    143132#undef TOKEN

  • src/Actions/Action_impl_pre.hpp

    r9ee38b rb4fa106  
    1414 *
    1515 *  For this, the user has the define the following values, each with
    16  *  parenthesis:
    17  *  -# types, e.g. (int)(double)
    18  *  -# tokens, e.g. ("Z")("length")
    19  *  -# references, e.g. (Z)(length)
    20  *  and
     16 *  parenthesis, for the values/parameters the action needs
     17 *  -# paramtypes, e.g. (int)(double)
     18 *  -# paramtokens, e.g. ("Z")("length")
     19 *  -# paramreferences, e.g. (Z)(length)
     20 *  and for additional values/parameters to save in the state
     21 *  -# statetypes, e.g. (int)(double)
     22 *  -# statereferences, e.g. (Z)(length)
     23 *  and the name and category of the action
    2124 *  -# CATEGORY, e.g. Analysis
    2225 *  -# ACTIONNAME, e.g. MolecularVolume
    … …  
    2528
    2629#include <boost/preprocessor/cat.hpp>
     30#include <boost/preprocessor/expand.hpp>
    2731#include <boost/preprocessor/comparison/equal.hpp>
    2832#include <boost/preprocessor/comparison/not_equal.hpp>
    … …  
    4347#define STATE BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, State))
    4448#define PARAMS BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Parameters))
    45 #define PARAMSDOT BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Parameters))
    4649
    4750// check if no lists given
    48 #ifndef types
    49 #define MAXNOTOKENS 0
    50 #else
    51 #define MAXNOTOKENS BOOST_PP_SEQ_SIZE(types)
     51#ifndef paramtypes
     52#define MAXPARAMTYPES 0
     53#else
     54#define MAXPARAMTYPES BOOST_PP_SEQ_SIZE(paramtypes)
     55#endif
     56#ifndef statetypes
     57#define MAXSTATETYPES 0
     58#else
     59#define MAXSTATETYPES BOOST_PP_SEQ_SIZE(statetypes)
    5260#endif
    5361
    … …  
    6270
    6371// calculate numbers and check whether all have same size
    64 #ifdef tokens
    65 BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXNOTOKENS, BOOST_PP_SEQ_SIZE(tokens)),\
    66   ERROR: There are not the same number of "tokens" and "types" in: __FILE__ \
    67 )
    68 #endif
    69 #ifdef references
    70 BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXNOTOKENS, BOOST_PP_SEQ_SIZE(references)),\
    71   ERROR: There are not the same number of "tokens" and "references" in: __FILE__ \
     72#ifdef paramtokens
     73BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramtokens)),\
     74  ERROR: There are not the same number of "paramtokens" and "paramtypes" in: __FILE__ \
     75)
     76#endif
     77#ifdef paramreferences
     78BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramreferences)),\
     79  ERROR: There are not the same number of "paramtokens" and "paramreferences" in: __FILE__ \
     80)
     81#endif
     82
     83#ifdef statetypes
     84BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXSTATETYPES, BOOST_PP_SEQ_SIZE(statereferences)),\
     85  ERROR: There are not the same number of "statetypes" and "statereferences" in: __FILE__ \
    7286)
    7387#endif
    7488
    7589// print a list of type ref followed by a separator, i.e. "int i;"
    76 #define type_print(z,n,separator) \
    77   BOOST_PP_SEQ_ELEM(n, types) \
    78   BOOST_PP_SEQ_ELEM(n, references)\
     90#define initialiser_print(z,n,initialiserlist) \
     91  BOOST_PP_SEQ_ELEM(n, initialiserlist) \
     92  (BOOST_PP_CAT(_, BOOST_PP_SEQ_ELEM(n, initialiserlist))),
     93
     94// print a list of ref(_ref) followed by a separator, i.e. "id(_id),"
     95#define type_print(z,n,TYPELIST, VARLIST, separator) \
     96  BOOST_PP_SEQ_ELEM(n, TYPELIST) \
     97  BOOST_PP_SEQ_ELEM(n, VARLIST)\
    7998  separator
    8099
    81100// print a list of type ref followed, i.e. "int i, double position"
    82 #define type_list(z,n,unused) \
     101#define type_list(z,n,TYPELIST,VARLIST) \
    83102  BOOST_PP_COMMA_IF(n)\
    84   BOOST_PP_SEQ_ELEM(n, types) \
    85   BOOST_PP_SEQ_ELEM(n, references)
    86 
    87 // prints dialog->query calls for types with tokens
     103  BOOST_PP_SEQ_ELEM(n, TYPELIST) \
     104  BOOST_PP_SEQ_ELEM(n, VARLIST)
     105
     106// prints dialog->query calls for paramtypes with tokens
    88107#define dialog_print(z,n,unused) \
    89108  dialog->query<\
    90   BOOST_PP_SEQ_ELEM(n, types)\
     109  BOOST_PP_SEQ_ELEM(n, paramtypes)\
    91110  >(\
    92   BOOST_PP_SEQ_ELEM(n, tokens)\
     111  BOOST_PP_SEQ_ELEM(n, paramtokens)\
    93112  , ValueStorage::getInstance().getDescription(\
    94   BOOST_PP_SEQ_ELEM(n, tokens)\
     113  BOOST_PP_SEQ_ELEM(n, paramtokens)\
    95114  ));
    96115
    … …  
    98117#define value_print(z,n,command, prefix) \
    99118  ValueStorage::getInstance(). command (\
    100   BOOST_PP_SEQ_ELEM(n, tokens)\
     119  BOOST_PP_SEQ_ELEM(n, paramtokens)\
    101120  , \
    102121  prefix\
    103   BOOST_PP_SEQ_ELEM(n, references)\
     122  BOOST_PP_SEQ_ELEM(n, paramreferences)\
    104123  );
    105 
    106 #if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
    107 #define COMMANDFULL \
    108 void COMMAND( \
    109 BOOST_PP_REPEAT(MAXNOTOKENS, type_list, ~) \
    110 )
    111 # else
    112 #define COMMANDFULL void COMMAND()
    113 #endif
    114124
    115125#include "Actions/ActionRegistry.hpp"
    … …  
    118128
    119129
     130// =========== memento to remember the state when undoing ===========
     131class STATE : public ActionState {
     132public:
     133  STATE(
     134#if defined statetypes && defined statereferences // if we have parameters, we have to add "_" before each reference and add the params as the last one
     135#define OP(s,data,elem) BOOST_PP_CAT(data, elem)  // OP to add "_"
     136#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, BOOST_PP_SEQ_PUSH_BACK(statetypes, const ACTION::PARAMS &), BOOST_PP_SEQ_TRANSFORM(OP, _, BOOST_PP_SEQ_PUSH_BACK(statereferences, params)))
     137#else /// if not, params is only list
     138#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, (const ACTION::PARAMS &), (_params))
     139#endif
     140#define BOOST_PP_LOCAL_LIMITS  (0, MAXSTATETYPES)
     141#include BOOST_PP_LOCAL_ITERATE()
     142) :
     143#if defined statetypes && defined statereferences // do we have parameters at all?
     144BOOST_PP_REPEAT(MAXSTATETYPES, initialiser_print, statereferences)
     145#endif
     146params(_params)
     147  {}
     148
     149#if defined statetypes && defined statereferences // do we have parameters at all?
     150#define BOOST_PP_LOCAL_MACRO(n) type_print(~, n, statetypes, statereferences, ;)
     151#define BOOST_PP_LOCAL_LIMITS  (0, MAXSTATETYPES-1)
     152#include BOOST_PP_LOCAL_ITERATE()
     153#endif
     154  ACTION::PARAMS params;
     155};
     156
     157// =========== name of action ===========
    120158const char ACTION::NAME[] = TOKEN;
    121159
    122 // the actual functions constructed
    123 
     160// =========== constructor ===========
    124161ACTION::ACTION () :
    125162  Action(NAME)
    126163{}
    127164
     165// =========== destructor ===========
    128166ACTION::~ACTION ()
    129167{}
    130168
     169// =========== fill a dialog ===========
    131170Dialog* ACTION::fillDialog(Dialog *dialog) {
    132171        ASSERT(dialog,"No Dialog given when filling actionname's dialog");
    133 #if BOOST_PP_EQUAL(MAXNOTOKENS,0)
     172#if BOOST_PP_EQUAL(MAXPARAMTYPES,0)
    134173        dialog->queryEmpty(NAME, ValueStorage::getInstance().getDescription(NAME));
    135174#else
    136175#define BOOST_PP_LOCAL_MACRO(n) dialog_print(~, n, ~)
    137 #define BOOST_PP_LOCAL_LIMITS  (0, MAXNOTOKENS-1)
    138 #include BOOST_PP_LOCAL_ITERATE()
    139 #undef BOOST_PP_LOCAL_MACRO
    140 #undef BOOST_PP_LOCAL_LIMITS
     176#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
     177#include BOOST_PP_LOCAL_ITERATE()
    141178#endif
    142179        return dialog;
    143180};
    144181
    145 COMMANDFULL
     182// =========== command for calling action directly ===========
     183#if defined paramtypes && defined paramreferences
     184void COMMAND(
     185#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, paramtypes, paramreferences)
     186#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
     187#include BOOST_PP_LOCAL_ITERATE()
     188)
     189#else
     190void COMMAND()
     191#endif
    146192{
    147193  ACTION::PARAMS params;
    148194  Action *ToCall = ActionRegistry::getInstance().getActionByName( ACTION::NAME ); //->clone(params);
    149 #if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
     195#if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
    150196#define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, setCurrentValue, )
    151 #define BOOST_PP_LOCAL_LIMITS  (0, MAXNOTOKENS-1)
    152 #include BOOST_PP_LOCAL_ITERATE()
    153 #undef BOOST_PP_LOCAL_MACRO
    154 #undef BOOST_PP_LOCAL_LIMITS
     197#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
     198#include BOOST_PP_LOCAL_ITERATE()
    155199#endif
    156200  ToCall->call(Action::NonInteractive);
    157201};
    158202
     203// =========== obtain parameters from Storage, used by performCall() ===========
    159204void ACTION::getParametersfromValueStorage() {
    160 #if BOOST_PP_NOT_EQUAL(MAXNOTOKENS,0)
     205#if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
    161206#define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, queryCurrentValue, params.)
    162 #define BOOST_PP_LOCAL_LIMITS  (0, MAXNOTOKENS-1)
    163 #include BOOST_PP_LOCAL_ITERATE()
    164 #undef BOOST_PP_LOCAL_MACRO
    165 #undef BOOST_PP_LOCAL_LIMITS
    166 #endif
    167 };
    168 
    169 #undef types
    170 #undef tokens
    171 #undef references
    172 #undef MAXNOTOKENS
     207#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
     208#include BOOST_PP_LOCAL_ITERATE()
     209#endif
     210};
     211
     212// free up defines
     213#undef paramtypes
     214#undef paramtokens
     215#undef paramreferences
     216#undef MAXPARAMTYPES
     217#undef statetypes
     218#undef statereferences
     219#undef MAXSTATETYPES
    173220
    174221#undef ACTION
     222#undef COMMAND
     223#undef PARAMS
     224#undef STATE
     225
    175226#undef ACTIONNAME
    176227#undef CATEGORY
    177 #undef COMMAND
    178 #undef COMMANDFULL
    179 #undef PARAMS
    180 #undef STATE
    181228#undef TOKEN

  • src/Actions/AnalysisAction/MolecularVolumeAction.def

    r9ee38b rb4fa106  
    1111// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    1212// "undefine" if no parameters are required
    13 //#define types (int)
    14 //#define references (molID)
    15 //#define tokens (NAME)
     13//#define paramtypes (int)
     14//#define paramreferences (molID)
     15//#define paramtokens (NAME)
    1616
    1717// some defines for all the names, you may use ACTION, STATE and PARAMS

  • src/Actions/AnalysisAction/PairCorrelationAction.def

    r9ee38b rb4fa106  
    1414// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    1515// "undefine" if no parameters are required
    16 #define types (std::vector<const element *>)(double)(double)(double)(std::string)(std::string)(bool)
    17 #define references (elements)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
    18 #define tokens ("elements")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
     16#define paramtypes (std::vector<const element *>)(double)(double)(double)(std::string)(std::string)(bool)
     17#define paramreferences (elements)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
     18#define paramtokens ("elements")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
    1919
    2020// some defines for all the names, you may use ACTION, STATE and PARAMS

  • src/Actions/AnalysisAction/PointCorrelationAction.def

    r9ee38b rb4fa106  
    1616// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    1717// "undefine" if no parameters are required
    18 #define types (std::vector<const element *>)(Vector)(double)(double)(double)(std::string)(std::string)(bool)
    19 #define references (elements)(Point)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
    20 #define tokens ("elements")("position")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
     18#define paramtypes (std::vector<const element *>)(Vector)(double)(double)(double)(std::string)(std::string)(bool)
     19#define paramreferences (elements)(Point)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
     20#define paramtokens ("elements")("position")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
    2121
    2222// some defines for all the names, you may use ACTION, STATE and PARAMS

  • src/Actions/AnalysisAction/SurfaceCorrelationAction.def

    r9ee38b rb4fa106  
    1515// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    1616// "undefine" if no parameters are required
    17 #define types (std::vector<const element *>)(molecule *)(double)(double)(double)(std::string)(std::string)(bool)
    18 #define references (elements)(Boundary)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
    19 #define tokens ("elements")("molecule-by-id")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
     17#define paramtypes (std::vector<const element *>)(molecule *)(double)(double)(double)(std::string)(std::string)(bool)
     18#define paramreferences (elements)(Boundary)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
     19#define paramtokens ("elements")("molecule-by-id")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
    2020
    2121// some defines for all the names, you may use ACTION, STATE and PARAMS
Note: See TracChangeset for help on using the changeset viewer.