Ignore:
Timestamp:
Apr 29, 2014, 12:42:44 PM (11 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:
af5384
Parents:
ec43a2
git-author:
Frederik Heber <heber@…> (08/27/13 00:08:29)
git-committer:
Frederik Heber <heber@…> (04/29/14 12:42:44)
Message:

OptionRegistry is now filled by ActionRegistry() not by Action's cstors.

  • otherwise we cannot instantiate new actions as they re-register options.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/Action.cpp

    rec43a2 r36053c  
    4343#include "Actions/ActionQueue.hpp"
    4444#include "Actions/ActionRegistry.hpp"
    45 #include "Actions/OptionRegistry.hpp"
    46 #include "Actions/OptionTrait.hpp"
    4745#include "UIElements/Dialog.hpp"
    4846#include "CodePatterns/Assert.hpp"
     
    7775Action::Action(const ActionTrait &_Traits) :
    7876    Traits(_Traits)
    79 {
    80   // register with OptionRegistry
    81   for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();
    82       optioniter != Traits.getEndIter();
    83       ++optioniter) {
    84     // options may have been re-used by other Actions, so check beforehand whether adding is needed
    85     if (!OptionRegistry::getInstance().isOptionPresentByName((optioniter->first))) {
    86       OptionRegistry::getInstance().registerInstance(optioniter->second);
    87     } else { // if present, ASSERT that types coincide
    88 #ifndef NDEBUG
    89       OptionTrait const * const PresentOption = OptionRegistry::getInstance().getOptionByName(optioniter->first);
    90 #endif
    91       ASSERT(PresentOption->getType() == optioniter->second->getType(),
    92           ("Action::Action() - option to add "+
    93               std::string(optioniter->first)+
    94               " of Action "+
    95               std::string(getName())+
    96               " is already present with different type: "
    97               +toString(PresentOption->getType())+" != "+toString(optioniter->second->getType())
    98           )
    99       );
    100       ASSERT(PresentOption->getDefaultValue() == optioniter->second->getDefaultValue(),
    101           ("Action::Action() - option to add "+
    102               std::string(optioniter->first)+
    103               " of Action "+
    104               std::string(getName())+
    105               " is already present with different default value: "
    106               +PresentOption->getDefaultValue()+" != "+optioniter->second->getDefaultValue()
    107           )
    108       );
    109       ASSERT(PresentOption->getShortForm() == optioniter->second->getShortForm(),
    110           ("Action::Action() - option to add "+
    111               std::string(optioniter->first)+
    112               " of Action "+
    113               std::string(getName())+
    114               " is already present with different short form: "
    115               +PresentOption->getShortForm()+" != "+optioniter->second->getShortForm()
    116           )
    117       );
    118     }
    119   }
    120 }
     77{}
    12178
    12279Action::~Action()
    123 {
    124   for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();
    125       optioniter != Traits.getEndIter();
    126       ++optioniter) {
    127     // unregister option if still registered
    128     if(OptionRegistry::getInstance().isOptionPresentByName((optioniter->first)))
    129       if (OptionRegistry::getInstance().getOptionByName((optioniter->first)) == optioniter->second) {
    130         OptionRegistry::getInstance().unregisterInstance(optioniter->second);
    131     }
    132   }
    133 }
     80{}
    13481
    13582const string Action::getName() const
Note: See TracChangeset for help on using the changeset viewer.