Changeset 3139b2 for src/Actions


Ignore:
Timestamp:
Nov 7, 2011, 12:24:02 PM (13 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:
6ca7b9
Parents:
c20b35
git-author:
Frederik Heber <heber@…> (09/26/11 13:38:55)
git-committer:
Frederik Heber <heber@…> (11/07/11 12:24:02)
Message:

Renamed ActionTrait and ActionTraits.

  • the specialized Trait contains multiple OptionTraits, hence is now called ActionTrait_s_, where its base class (that just has the OptionTrait for itself) is called ActionTrait.
  • This caused many changes in other Action related files.
Location:
src/Actions
Files:
1 added
25 edited
1 moved

Legend:

Unmodified
Added
Removed

  • src/Actions/Action.cpp

    rc20b35 r3139b2  
    4949Action::state_ptr Action::failure = getEmptyState();
    5050
    51 Action::Action(const ActionTraits &_Traits, bool _doRegister) :
     51Action::Action(const ActionTrait &_Traits, bool _doRegister) :
    5252    Traits(_Traits)
    5353{
    … …  
    5858
    5959  // register with OptionRegistry
    60   for (ActionTraits::options_const_iterator optioniter = Traits.getBeginIter();
     60  for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();
    6161      optioniter != Traits.getEndIter();
    6262      ++optioniter) {
    … …  
    106106      ActionRegistry::getInstance().unregisterInstance(this);
    107107
    108   for (ActionTraits::options_const_iterator optioniter = Traits.getBeginIter();
     108  for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();
    109109      optioniter != Traits.getEndIter();
    110110      ++optioniter) {
    … …  
    131131  }
    132132  outputstream << "Options available for action '" << getName() << "':" << std::endl;
    133   for (ActionTraits::options_const_iterator iter = Traits.getBeginIter();
     133  for (ActionTrait::options_const_iterator iter = Traits.getBeginIter();
    134134      iter != Traits.getEndIter();
    135135      ++iter) {

  • src/Actions/Action.hpp

    rc20b35 r3139b2  
    3131class Dialog;
    3232
    33 #include "Actions/ActionTraits.hpp"
     33#include "Actions/ActionTrait.hpp"
    3434
    3535
    … …  
    6868   * \param _doRegister whether to register with ActionRegistry
    6969   */
    70   Action(const ActionTraits &_Traits, bool _doRegister=true);
     70  Action(const ActionTrait &_Traits, bool _doRegister=true);
    7171  virtual ~Action();
    7272
    … …  
    126126   * Note that is important that we do not use a reference here. We want to copy the
    127127   * information in the Action's constructor and have it contained herein. Hence, we
    128    * also have our own copy constructor for ActionTraits. Information should be
     128   * also have our own copy constructor for ActionTrait. Information should be
    129129   * encapsulated in the Action, no more references to the outside than absolutely
    130130   * necessary.
    131131   */
    132   const ActionTraits Traits;
     132  const ActionTrait Traits;
    133133
    134134  /** Removes the static entities Action::success and Action::failure.

  • src/Actions/ActionTrait.cpp

    rc20b35 r3139b2  
    77
    88/*
    9  * ActionTraits.cpp
     9 * ActionTrait.cpp
    1010 *
    1111 *  Created on: Oct 26, 2010
    … …  
    2020#include "CodePatterns/MemDebug.hpp"
    2121
    22 #include "Actions/ActionTraits.hpp"
     22#include "Actions/ActionTrait.hpp"
    2323
    2424#include "CodePatterns/Assert.hpp"
    … …  
    3131using namespace MoleCuilder;
    3232
    33 /** Copy constructor for base class ActionTraits.
    34  * \param &_Traits source ActionTraits class to copy
     33/** Copy constructor for base class ActionTrait.
     34 * \param &_Traits source ActionTrait class to copy
    3535 */
    36 ActionTraits::ActionTraits(const std::string &_token) :
     36ActionTrait::ActionTrait(const std::string &_token) :
    3737  OptionTrait(_token,
    3838      &typeid(void),
    … …  
    4242  )
    4343{
    44   //std::cout << "ActionTraits::ActionTraits(string &) on instance " << this << " with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
     44  //std::cout << "ActionTrait::ActionTrait(string &) on instance " << this << " with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
    4545}
    4646
    47 /** Copy constructor for base class ActionTraits.
     47/** Copy constructor for base class ActionTrait.
    4848 * we have to make our own copy in order to avoid references and deep-copy everything.
    49  * \param &_Traits source ActionTraits class to copy
     49 * \param &_Traits source ActionTrait class to copy
    5050 */
    51 ActionTraits::ActionTraits(const ActionTraits &_Traits) :
     51ActionTrait::ActionTrait(const ActionTrait &_Traits) :
    5252  OptionTrait(_Traits),
    5353  MenuTitle(_Traits.MenuTitle),
    … …  
    6262    );
    6363  }
    64   //std::cout << "ActionTraits::ActionTraits(ActionTraits &) on instance " << this << " with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
     64  //std::cout << "ActionTrait::ActionTrait(ActionTrait &) on instance " << this << " with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
    6565}
    6666
    67 /** Copy constructor for base class ActionTraits.
     67/** Copy constructor for base class ActionTrait.
    6868 * we have to make our own copy in order to avoid references and deep-copy everything.
    6969 * \param &_Traits source OptionTrait class to copy
    7070 */
    71 ActionTraits::ActionTraits(const OptionTrait &_Traits, const std::string _MenuTitle, const int _MenuPosition) :
     71ActionTrait::ActionTrait(const OptionTrait &_Traits, const std::string _MenuTitle, const int _MenuPosition) :
    7272  OptionTrait(_Traits),
    7373  MenuTitle(_MenuTitle),
    7474  MenuPosition(_MenuPosition)
    7575{
    76   //std::cout << "ActionTraits::ActionTraits(OptionTrait &) on instance " << this << " with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
     76  //std::cout << "ActionTrait::ActionTrait(OptionTrait &) on instance " << this << " with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
    7777}
    7878
    79 /** Constructor for base class ActionTraits.
     79/** Constructor for base class ActionTrait.
    8080 * Deletes all present Options.
    8181 */
    82 ActionTraits::~ActionTraits()
     82ActionTrait::~ActionTrait()
    8383{
    84   //std::cout << "ActionTraits::~ActionTraits() on instance " << this << " with name " << getName() << " called." << std::endl;
     84  //std::cout << "ActionTrait::~ActionTrait() on instance " << this << " with name " << getName() << " called." << std::endl;
    8585  for (options_iterator iter = Options.begin(); iter != Options.end(); ++iter) {
    86     //std::cout << "ActionTraits::~ActionTraits() removes option instance " << iter->second << " with name " << iter->first << "." << std::endl;
     86    //std::cout << "ActionTrait::~ActionTrait() removes option instance " << iter->second << " with name " << iter->first << "." << std::endl;
    8787    delete iter->second;
    8888  }
    … …  
    9292
    9393/** Returns menu title for this ActionTrait.
    94  * \return ActionTraits::MenuTitle as std::string
     94 * \return ActionTrait::MenuTitle as std::string
    9595 */
    96 const std::string& ActionTraits::getMenuName() const
     96const std::string& ActionTrait::getMenuName() const
    9797{
    9898  return MenuTitle;
    … …  
    100100
    101101/** Returns menu title for this ActionTrait.
    102  * \return ActionTraits::MenuPosition as std::string
     102 * \return ActionTrait::MenuPosition as std::string
    103103 */
    104 int ActionTraits::getMenuPosition() const
     104int ActionTrait::getMenuPosition() const
    105105{
    106106  return MenuPosition;
    … …  
    111111 * \return reference to OptionTrait
    112112 */
    113 OptionTrait const & ActionTraits::getOption(const std::string &token) const
     113OptionTrait const & ActionTrait::getOption(const std::string &token) const
    114114{
    115115  ASSERT(Options.find(token) != Options.end(),
    116       "ActionTraits::getOption() - Option not found!");
     116      "ActionTrait::getOption() - Option not found!");
    117117  return *(Options.find(token)->second);
    118118}
    … …  
    122122 * \return true - option present, false - not
    123123 */
    124 bool ActionTraits::hasOption(const std::string &token) const
     124bool ActionTrait::hasOption(const std::string &token) const
    125125{
    126126  return (Options.find(token) != Options.end());
    … …  
    130130 * \return true - options present, false - no options
    131131 */
    132 bool ActionTraits::hasOptions() const
     132bool ActionTrait::hasOptions() const
    133133{
    134134  return (Options.begin() != Options.end());
    … …  
    138138 * \return iterator
    139139 */
    140 ActionTraits::options_iterator ActionTraits::getBeginIter()
     140ActionTrait::options_iterator ActionTrait::getBeginIter()
    141141{
    142142  return Options.begin();
    … …  
    146146 * \return iterator
    147147 */
    148 ActionTraits::options_iterator ActionTraits::getEndIter()
     148ActionTrait::options_iterator ActionTrait::getEndIter()
    149149{
    150150  return Options.end();
    … …  
    154154 * \return constant iterator
    155155 */
    156 ActionTraits::options_const_iterator ActionTraits::getBeginIter() const
     156ActionTrait::options_const_iterator ActionTrait::getBeginIter() const
    157157{
    158158  return Options.begin();
    … …  
    162162 * \return constant iterator
    163163 */
    164 ActionTraits::options_const_iterator ActionTraits::getEndIter() const
     164ActionTrait::options_const_iterator ActionTrait::getEndIter() const
    165165{
    166166  return Options.end();
    … …  
    171171 * \param &out stream to output to
    172172 */
    173 std::ostream &operator<<(std::ostream &out, const ActionTraits &a)
     173std::ostream &operator<<(std::ostream &out, const ActionTrait &a)
    174174{
    175175  out << "ActionTrait(" << &a << ") with " << static_cast<const OptionTrait &>(a) << " has the following options: " << std::endl;
    176   for (ActionTraits::options_const_iterator iter = a.getBeginIter();
     176  for (ActionTrait::options_const_iterator iter = a.getBeginIter();
    177177    iter != a.getEndIter();
    178178    ++iter) {

  • src/Actions/ActionTraits.hpp

    rc20b35 r3139b2  
    22 * ActionTraits.hpp
    33 *
    4  *  Created on: Oct 26, 2010
     4 *  Created on: Sep 26, 2011
    55 *      Author: heber
    66 */
    … …  
    1414#endif
    1515
    16 #include <iosfwd>
    17 #include <map>
    18 
    19 #include "Actions/OptionTrait.hpp"
     16#include "Actions/ActionTrait.hpp"
    2017
    2118namespace MoleCuilder {
    2219
    23 /** Interface for all ActionTraits.
    24  * This class defines the interface, i.e. the common set of information that
    25  * is stored in this traits for Action classes. It also defines a set of getter
    26  * functions.
     20/* Templated class for ActionTrait to specialize.
     21 * I.e. every action specializes its own ActionTraits and inherits the
     22 * ActionTrait class as interface , e.g. Action called SuperAction:
     23
     24 * ActionTraits<SuperAction> : public ActionTrait
    2725 *
    28  * Note that there are no setters. This is because the information is to be
    29  * given in a specialized form of the templated class ActionTrait that derives
    30  * from this interface.
    31  *
    32  */
    33 class ActionTraits : public OptionTrait {
    34 public:
    35   ActionTraits(const ActionTraits &_Traits);
    36   ActionTraits(const OptionTrait &_Traits, const std::string _MenuTitle = "", const int _MenuPosition = 0);
    37   explicit ActionTraits(const std::string &_token);
    38   virtual ~ActionTraits();
    39 
    40   typedef std::map< std::string, OptionTrait* > options_map;
    41   typedef options_map::iterator                 options_iterator;
    42   typedef options_map::const_iterator           options_const_iterator;
    43 
    44   const std::string& getMenuName() const;
    45   int getMenuPosition() const;
    46 
    47   // getter for its options
    48   OptionTrait const &getOption(const std::string &token) const;
    49 
    50   bool hasOption(const std::string &token) const;
    51   bool hasOptions() const;
    52 
    53   options_iterator getBeginIter();
    54   options_iterator getEndIter();
    55   options_const_iterator getBeginIter() const;
    56   options_const_iterator getEndIter() const;
    57 
    58 protected:
    59 
    60   // internal information this trait contains
    61   std::string MenuTitle;
    62   int MenuPosition;
    63   options_map Options;
    64 };
    65 
    66 /* Templated class for ActionTraits to specialize.
    67  * I.e. every action specializes its own ActionTrait and inherits the
    68  * ActionTraits class as interface , e.g. Action called SuperAction:
    69 
    70  * ActionTrait<SuperAction> : public ActionTraits
    71  *
    72  * within the constructor of said ActionTrait<SuperAction> the specific
     26 * within the constructor of said ActionTraits<SuperAction> the specific
    7327 * information for this derived Action class is then given.
    7428 */
    7529template <class T>
    76 class ActionTrait : public ActionTraits {
     30class ActionTraits : public ActionTrait {
    7731public:
    78   ActionTrait();
    79   virtual ~ActionTrait();
     32  ActionTraits();
     33  virtual ~ActionTraits();
    8034};
    8135
    8236}
    8337
    84 std::ostream &operator<<(std::ostream &out, const MoleCuilder::ActionTraits &a);
     38#endif /* ACTIONTRAITS_HPP_ */
    8539
    86 #endif /* ACTIONTRAITS_HPP_ */

  • src/Actions/Action_impl_header.hpp

    rc20b35 r3139b2  
    2929
    3030#include "Actions/ActionTraits.hpp"
    31 #include "Actions/OptionTrait.hpp"
    3231#include "Actions/ValueStorage.hpp"
    3332
    … …  
    150149
    151150template <>
    152 class ActionTrait<ACTION> : public ActionTraits {
     151class ActionTraits<ACTION> : public ActionTrait {
    153152public:
    154   ActionTrait() :
     153  ActionTraits() :
    155154#ifndef SHORTFORM
    156     ActionTraits(OptionTrait(TOKEN, &typeid(void), DESCRIPTION, std::string()))
    157 #else
    158     ActionTraits(OptionTrait(TOKEN, &typeid(void), DESCRIPTION, std::string(), SHORTFORM))
     155    ActionTrait(OptionTrait(TOKEN, &typeid(void), DESCRIPTION, std::string()))
     156#else
     157    ActionTrait(OptionTrait(TOKEN, &typeid(void), DESCRIPTION, std::string(), SHORTFORM))
    159158#endif /* SHORTFORM */
    160159  {
    … …  
    168167
    169168    // initialize action's options
    170     std::pair< ActionTraits::options_iterator, bool > tester;
     169    std::pair< ActionTrait::options_iterator, bool > tester;
    171170#ifdef paramtokens
    172171#define BOOST_PP_LOCAL_MACRO(n) option_print(~, n, ~, )
    … …  
    179178      Options[TOKEN]->setShortForm(std::string(SHORTFORM));
    180179#endif /* SHORTFORM */
    181     //std::cout << "ActionTrait<" << BOOST_PP_STRINGIZE(ACTION) << ">::ActionTrait() on instance " << this << " with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
     180    //std::cout << "ActionTraits<" << BOOST_PP_STRINGIZE(ACTION) << ">::ActionTraits() on instance " << this << " with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
    182181  }
    183182
    184   virtual ~ActionTrait() {}
     183  virtual ~ActionTraits() {
     184    //std::cout << "ActionTraits<" << BOOST_PP_STRINGIZE(ACTION) << ">::~ActionTraits() on instance " << this << " with name " << getName() << " called." << std::endl;
     185  }
    185186};
    186187

  • src/Actions/Action_impl_pre.hpp

    rc20b35 r3139b2  
    150150
    151151#include "Actions/ActionRegistry.hpp"
     152//#include "Actions/ActionTraits.hpp"
    152153#include "UIElements/Dialog.hpp"
    153154
    … …  
    196197// =========== constructor ===========
    197198ACTION::ACTION () :
    198   Action(ActionTrait< ACTION >(), false)
     199  Action(ActionTraits< ACTION >(), false)
    199200{}
    200201

  • src/Actions/AtomsCalculation.hpp

    rc20b35 r3139b2  
    2525{
    2626public:
    27   AtomsCalculation(boost::function<T(atom*)> op,const ActionTraits &_trait,AtomDescriptor descr);
     27  AtomsCalculation(boost::function<T(atom*)> op,const ActionTrait &_trait,AtomDescriptor descr);
    2828  virtual ~AtomsCalculation();
    2929

  • src/Actions/AtomsCalculation_impl.hpp

    rc20b35 r3139b2  
    2121
    2222template<typename T>
    23 AtomsCalculation<T>::AtomsCalculation(boost::function<T(atom*)> _op,const ActionTraits &_trait,AtomDescriptor _descr) :
     23AtomsCalculation<T>::AtomsCalculation(boost::function<T(atom*)> _op,const ActionTrait &_trait,AtomDescriptor _descr) :
    2424  Calculation<std::vector<T> >(0,_trait,false),
    2525  descr(_descr),

  • src/Actions/Calculation.hpp

    rc20b35 r3139b2  
    2929{
    3030public:
    31   Calculation(int _maxSteps, const ActionTraits &_trait, bool _doRegister=true);
     31  Calculation(int _maxSteps, const ActionTrait &_trait, bool _doRegister=true);
    3232  virtual ~Calculation();
    3333

  • src/Actions/Calculation_impl.hpp

    rc20b35 r3139b2  
    2222
    2323template<typename T>
    24 Calculation<T>::Calculation(int _maxSteps, const ActionTraits &_trait, bool _doRegister) :
     24Calculation<T>::Calculation(int _maxSteps, const ActionTrait &_trait, bool _doRegister) :
    2525  Process(_maxSteps,_trait,_doRegister),
    2626  result(0),

  • src/Actions/CommandAction/HelpAction.cpp

    rc20b35 r3139b2  
    2424
    2525#include "Actions/ActionRegistry.hpp"
    26 #include "Actions/ActionTraits.hpp"
     26#include "Actions/ActionTrait.hpp"
    2727#include "Actions/OptionRegistry.hpp"
    2828#include "Actions/OptionTrait.hpp"

  • src/Actions/ErrorAction.cpp

    rc20b35 r3139b2  
    2929using namespace MoleCuilder;
    3030
    31 ErrorAction::ErrorAction(const ActionTraits &_trait,const char * _errorMsg,bool _doRegister) :
     31ErrorAction::ErrorAction(const ActionTrait &_trait,const char * _errorMsg,bool _doRegister) :
    3232Action(_trait,_doRegister),
    3333errorMsg(_errorMsg)

  • src/Actions/ErrorAction.hpp

    rc20b35 r3139b2  
    2323{
    2424public:
    25   ErrorAction(const ActionTraits &_trait,const char * _errorMsg,bool _doRegister=true);
     25  ErrorAction(const ActionTrait &_trait,const char * _errorMsg,bool _doRegister=true);
    2626  virtual ~ErrorAction();
    2727

  • src/Actions/Makefile.am

    rc20b35 r3139b2  
    77  Actions/ActionRegistry.cpp \
    88  Actions/ActionSequence.cpp \
    9   Actions/ActionTraits.cpp \
     9  Actions/ActionTrait.cpp \
    1010  Actions/ErrorAction.cpp \
    1111  Actions/MakroAction.cpp \
    … …  
    2626  Actions/ActionRegistry.hpp \
    2727  Actions/ActionSequence.hpp \
    28   Actions/ActionTraits.hpp \
     28  Actions/ActionTrait.hpp \
    2929  Actions/AtomsCalculation.hpp \
    3030  Actions/AtomsCalculation_impl.hpp \

  • src/Actions/MakroAction.cpp

    rc20b35 r3139b2  
    4141};
    4242
    43 MakroAction::MakroAction(const ActionTraits &_trait,ActionSequence* _actions,bool _doRegister) :
     43MakroAction::MakroAction(const ActionTrait &_trait,ActionSequence* _actions,bool _doRegister) :
    4444Action(_trait,_doRegister),
    4545actions(_actions)

  • src/Actions/MakroAction.hpp

    rc20b35 r3139b2  
    3030{
    3131public:
    32   MakroAction(const ActionTraits &_trait,ActionSequence* _actions,bool _doRegister=true);
     32  MakroAction(const ActionTrait &_trait,ActionSequence* _actions,bool _doRegister=true);
    3333  virtual ~MakroAction();
    3434

  • src/Actions/ManipulateAtomsProcess.cpp

    rc20b35 r3139b2  
    3232    boost::function<void(atom*)> _operation,
    3333    AtomDescriptor _descr,
    34     const ActionTraits &_trait,
     34    const ActionTrait &_trait,
    3535    bool _doRegister) :
    3636  Process(0,_trait,_doRegister),

  • src/Actions/ManipulateAtomsProcess.hpp

    rc20b35 r3139b2  
    2828{
    2929public:
    30   ManipulateAtomsProcess(boost::function<void(atom*)> _operation, AtomDescriptor descr,const ActionTraits &_trait,bool _doRegister=true);
     30  ManipulateAtomsProcess(boost::function<void(atom*)> _operation, AtomDescriptor descr,const ActionTrait &_trait,bool _doRegister=true);
    3131  virtual ~ManipulateAtomsProcess();
    3232

  • src/Actions/MethodAction.cpp

    rc20b35 r3139b2  
    2929using namespace MoleCuilder;
    3030
    31 MethodAction::MethodAction(const ActionTraits &_trait,boost::function<void()> _executeMethod,bool _doRegister) :
     31MethodAction::MethodAction(const ActionTrait &_trait,boost::function<void()> _executeMethod,bool _doRegister) :
    3232   Action(_trait,_doRegister),
    3333executeMethod(_executeMethod)

  • src/Actions/MethodAction.hpp

    rc20b35 r3139b2  
    2727{
    2828public:
    29   MethodAction(const ActionTraits &_trait,boost::function<void()> _executeMethod,bool _doRegister=true);
     29  MethodAction(const ActionTrait &_trait,boost::function<void()> _executeMethod,bool _doRegister=true);
    3030  virtual ~MethodAction();
    3131  virtual bool canUndo();

  • src/Actions/OptionRegistry.cpp

    rc20b35 r3139b2  
    2424#include "Actions/Action.hpp"
    2525#include "Actions/ActionRegistry.hpp"
    26 #include "Actions/ActionTraits.hpp"
     26#include "Actions/ActionTrait.hpp"
    2727#include "Actions/OptionRegistry.hpp"
    2828#include "Actions/OptionTrait.hpp"
    … …  
    6161//      ++actioniter) {
    6262//    Action* const currentAction = actioniter->second;
    63 //    for (ActionTraits::options_const_iterator optioniter = currentAction->Traits.getBeginIter();
     63//    for (ActionTrait::options_const_iterator optioniter = currentAction->Traits.getBeginIter();
    6464//        optioniter != currentAction->Traits.getEndIter();
    6565//        ++optioniter) {
    … …  
    8787      actioniter != AR.getEndIter();
    8888      ++actioniter) {
    89     for (ActionTraits::options_const_iterator optioniter = (actioniter->second)->Traits.getBeginIter();
     89    for (ActionTrait::options_const_iterator optioniter = (actioniter->second)->Traits.getBeginIter();
    9090        optioniter != (actioniter->second)->Traits.getEndIter();
    9191        ++optioniter) {

  • src/Actions/Process.cpp

    rc20b35 r3139b2  
    2626using namespace MoleCuilder;
    2727
    28 Process::Process(int _maxSteps, const ActionTraits &_trait, bool _doRegister) :
     28Process::Process(int _maxSteps, const ActionTrait &_trait, bool _doRegister) :
    2929  Action(_trait,_doRegister),
    3030  Observable("Process"),

  • src/Actions/Process.hpp

    rc20b35 r3139b2  
    4848{
    4949public:
    50   Process(int _maxSteps, const ActionTraits &_trait, bool _doRegister=true);
     50  Process(int _maxSteps, const ActionTrait &_trait, bool _doRegister=true);
    5151  virtual ~Process();
    5252

  • src/Actions/unittests/ActionRegistryUnitTest.cpp

    rc20b35 r3139b2  
    2727
    2828#include "Actions/ActionRegistry.hpp"
    29 #include "Actions/ActionTraits.hpp"
     29#include "Actions/ActionTrait.hpp"
    3030#include "Actions/OptionRegistry.hpp"
    3131#include "Actions/OptionTrait.hpp"

  • src/Actions/unittests/ActionSequenceUnitTest.cpp

    rc20b35 r3139b2  
    4646{
    4747public:
    48   canUndoActionStub(const ActionTraits &_trait):
     48  canUndoActionStub(const ActionTrait &_trait):
    4949    Action(_trait,false){}
    5050  virtual ~canUndoActionStub(){}
    … …  
    7878{
    7979public:
    80   cannotUndoActionStub(const ActionTraits &_trait) :
     80  cannotUndoActionStub(const ActionTrait &_trait) :
    8181    Action(_trait,false){}
    8282  virtual ~cannotUndoActionStub(){}
    … …  
    110110{
    111111public:
    112   wasCalledActionStub(const ActionTraits &_trait) :
     112  wasCalledActionStub(const ActionTrait &_trait) :
    113113      Action(_trait,false),
    114114      called(false)
    … …  
    157157  UIFactory::makeUserInterface("Dummy");
    158158  // create some necessary stubs used in this test
    159   ActionTraits canUndoTrait("canUndoActionStub");
    160   ActionTraits cannotUndoTrait("cannotUndoActionStub");
     159  ActionTrait canUndoTrait("canUndoActionStub");
     160  ActionTrait cannotUndoTrait("cannotUndoActionStub");
    161161  positive1 = new canUndoActionStub(canUndoTrait);
    162162  positive2 = new canUndoActionStub(canUndoTrait);
    … …  
    164164  negative2 = new cannotUndoActionStub(cannotUndoTrait);
    165165
    166   ActionTraits wasCalledTrait("wasCalledActionStub");
     166  ActionTrait wasCalledTrait("wasCalledActionStub");
    167167  shouldCall1 = new wasCalledActionStub(wasCalledTrait);
    168168  shouldCall2 = new wasCalledActionStub(wasCalledTrait);
    … …  
    264264void ActionSequenceTest::doesUndoTest(){
    265265  ActionSequence *sequence = new ActionSequence();
    266   ActionTraits wasCalledTrait("wasCalledActionStub");
     266  ActionTrait wasCalledTrait("wasCalledActionStub");
    267267  wasCalledActionStub *wasCalled1 = new wasCalledActionStub(wasCalledTrait);
    268268  wasCalledActionStub *wasCalled2 = new wasCalledActionStub(wasCalledTrait);
    … …  
    270270  sequence->addAction(wasCalled2);
    271271
    272   ActionTraits MakroTrait("Test MakroAction");
     272  ActionTrait MakroTrait("Test MakroAction");
    273273  MakroAction act(MakroTrait,sequence,false);
    274274

  • src/Actions/unittests/AtomsCalculationUnitTest.cpp

    rc20b35 r3139b2  
    3131#include "Actions/AtomsCalculation_impl.hpp"
    3232#include "Actions/ActionRegistry.hpp"
    33 #include "Actions/ActionTraits.hpp"
     33#include "Actions/ActionTrait.hpp"
    3434
    3535#include "World.hpp"
    … …  
    9191
    9292void AtomsCalculationTest::testCalculateSimple(){
    93   ActionTraits FooTrait("FOO");
     93  ActionTrait FooTrait("FOO");
    9494  AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),FooTrait,AllAtoms());
    9595  std::vector<atomId_t> allIds = (*calc)();
    … …  
    9999
    100100void AtomsCalculationTest::testCalculateExcluded(){
    101   ActionTraits FooTrait("FOO");
     101  ActionTrait FooTrait("FOO");
    102102  atomId_t excluded = atomIds[ATOM_COUNT/2];
    103103  AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),FooTrait,AllAtoms() && !AtomById(excluded));
Note: See TracChangeset for help on using the changeset viewer.