Changeset 5ca6b5 for src/Actions/Reaction_impl_pre.hpp

Timestamp:

Aug 27, 2012, 11:36:58 AM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

a55e6f

Parents:

b2a7cc

git-author:

Michael Ankele <ankele@…> (08/10/12 13:15:34)

git-committer:

Michael Ankele <ankele@…> (08/27/12 11:36:58)

Message:

drop deprecated references to ValueStorage

File:

• src/Actions/Reaction_impl_pre.hpp (modified) (2 diffs)

src/Actions/Reaction_impl_pre.hpp

@@ -125 +125 @@
 
 // prints set/queryCurrentValue (command) for paramreferences and paramtokens
-#define value_print(z,n,command, prefix) \
-  ValueStorage::getInstance(). command (\
-  BOOST_PP_SEQ_ELEM(n, paramtokens)\
-  , \
-  prefix\
-  BOOST_PP_SEQ_ELEM(n, paramreferences)\
+#define value_print(z, n, container, prefix) \
+  prefix \
+  BOOST_PP_SEQ_ELEM(n, container)\
+  .set(\
+  BOOST_PP_SEQ_ELEM(n, container)\
   );
 
 // prints set/queryCurrentValue (command) for paramreferences and paramtokens
-#define valuetype_print(z,n,command, prefix) \
-  ValueStorage::getInstance(). command< \
-  BOOST_PP_SEQ_ELEM(n, paramtypes) \
-  > (\
-  BOOST_PP_SEQ_ELEM(n, paramtokens)\
-  , \
-  prefix\
-  BOOST_PP_SEQ_ELEM(n, paramreferences)\
+#define valuetype_print(z,n,container, types, prefix) \
+  prefix \
+  BOOST_PP_SEQ_ELEM(n, container) \
+  .setAsString( \
+  BOOST_PP_SEQ_ELEM(n, container) \
   );
 
@@ -225 +221 @@
 
   return static_cast<Reaction< RETURNTYPE > *>(ToCall)->getResult();
-};
-
-// =========== obtain parameters from Storage, used by performCall() ===========
-void REACTION::getParametersfromValueStorage() {
-#if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
-#define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, queryCurrentValue, params.)
-#define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
-#include BOOST_PP_LOCAL_ITERATE()
-#endif
 };