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/ActionRegistry.cpp

    rec43a2 r36053c  
    3939
    4040#include "Actions/ActionRegistry.hpp"
     41#include "Actions/OptionRegistry.hpp"
     42#include "Actions/OptionTrait.hpp"
    4143#include "CodePatterns/Registry_impl.hpp"
    4244
     
    6062  //std::cout << "ActionRegistry::ActionRegistry() called, instance is " << this << "." << std::endl;
    6163  fillRegistry();
     64  fillOptionRegistry();
    6265  completely_instatiated = true;
    6366}
     
    6770ActionRegistry::~ActionRegistry()
    6871{
    69   // first clear each macro action that require presence of all primitive ones
     72  // first unregister all their options
     73  clearOptionRegistry();
     74
     75  // second clear each macro action that require presence of all primitive ones
    7076  {
    7177    MakroAction * presentAction =
     
    126132}
    127133
     134/** Registers every existing Action's option with the OptionRegistry.
     135 *
     136 */
     137void ActionRegistry::fillOptionRegistry() const
     138{
     139  for (const_iterator iter = getBeginIter(); iter != getEndIter(); ++iter) {
     140    // register with OptionRegistry
     141    Action &currenAction = *(iter->second);
     142    for (ActionTrait::options_const_iterator optioniter = currenAction.Traits.getBeginIter();
     143        optioniter != currenAction.Traits.getEndIter();
     144        ++optioniter) {
     145      // options may have been re-used by other Actions, so check beforehand whether adding is needed
     146      if (!OptionRegistry::getInstance().isOptionPresentByName((optioniter->first))) {
     147        OptionRegistry::getInstance().registerInstance(optioniter->second);
     148      } else { // if present, ASSERT that types coincide
     149#ifndef NDEBUG
     150        OptionTrait const * const PresentOption = OptionRegistry::getInstance().getOptionByName(optioniter->first);
     151#endif
     152        ASSERT(PresentOption->getType() == optioniter->second->getType(),
     153            ("Action::Action() - option to add "+
     154                std::string(optioniter->first)+
     155                " of Action "+
     156                std::string(currenAction.getName())+
     157                " is already present with different type: "
     158                +toString(PresentOption->getType())+" != "+toString(optioniter->second->getType())
     159            )
     160        );
     161        ASSERT(PresentOption->getDefaultValue() == optioniter->second->getDefaultValue(),
     162            ("Action::Action() - option to add "+
     163                std::string(optioniter->first)+
     164                " of Action "+
     165                std::string(currenAction.getName())+
     166                " is already present with different default value: "
     167                +PresentOption->getDefaultValue()+" != "+optioniter->second->getDefaultValue()
     168            )
     169        );
     170        ASSERT(PresentOption->getShortForm() == optioniter->second->getShortForm(),
     171            ("Action::Action() - option to add "+
     172                std::string(optioniter->first)+
     173                " of Action "+
     174                std::string(currenAction.getName())+
     175                " is already present with different short form: "
     176                +PresentOption->getShortForm()+" != "+optioniter->second->getShortForm()
     177            )
     178        );
     179      }
     180    }
     181  }
     182}
     183
     184/** Unregisters every existing Action's option from OptionRegistry.
     185 *
     186 */
     187void ActionRegistry::clearOptionRegistry() const
     188{
     189  for (const_iterator iter = getBeginIter(); iter != getEndIter(); ++iter) {
     190    Action &currenAction = *(iter->second);
     191    for (ActionTrait::options_const_iterator optioniter = currenAction.Traits.getBeginIter();
     192        optioniter != currenAction.Traits.getEndIter();
     193        ++optioniter) {
     194      // unregister option if still registered
     195      if(OptionRegistry::getInstance().isOptionPresentByName((optioniter->first)))
     196        if (OptionRegistry::getInstance().getOptionByName((optioniter->first)) == optioniter->second) {
     197          OptionRegistry::getInstance().unregisterInstance(optioniter->second);
     198      }
     199    }
     200  }
     201}
     202
    128203/** Just passes on call to Registry<Action>::getByName().
    129204 * \param name name of Action
Note: See TracChangeset for help on using the changeset viewer.