Changeset c14c78 for src/RandomNumbers/RandomNumberEngine_Parameters.cpp

Timestamp:

Feb 10, 2011, 6:50:14 PM (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, Candidate_v1.7.0, 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:

0bfe73

Parents:

0275ad

git-author:

Frederik Heber <heber@…> (02/10/11 15:25:59)

git-committer:

Frederik Heber <heber@…> (02/10/11 18:50:14)

Message:

Some bugfixes for RandomNumber... stuff.

• BUGFIX: Asserts contained wrong variable name: params -> paramtokens.
• BUGFIX: replaced forward declarations in respective Factory's to ...Engine and ..Distribution by includes. Note that they are need in other files due to inclusion of ManipulatePrototypeFactory and alikes of CodePatterns.
• Added some additional ASSERTs to ...Engine... and ...Distribution_Parameters.
• TESTFIX: RandomNumberEngineFactoryUnitTest - Setting seed to 0 was not allowed for this engine.
• LEAKFIX: SetRandomNumbersDistributionAction::performCall() leaked a parameter set from prototype.

File:

• src/RandomNumbers/RandomNumberEngine_Parameters.cpp (modified) (1 diff)

src/RandomNumbers/RandomNumberEngine_Parameters.cpp

@@ -103 +103 @@
       tokenizer::iterator tok_valueiter = tok_paramiter;
       tokenizer::iterator tok_checkiter = ++tok_valueiter;
-      ASSERT(tok_valueiter == params.end(),
-          "operator<< on RandomNumberEngine_Parameters - missing value before ';'!");
+      ASSERT(tok_paramiter != paramtokens.end(),
+          "operator<< on RandomNumberEngine_Parameters - missing value before '=' in token"
+          +*tok_iter+"!");
+      ASSERT(tok_valueiter != paramtokens.end(),
+          "operator<< on RandomNumberEngine_Parameters - missing value after '=' in token"
+          +*tok_iter+"!");
       ++tok_checkiter;
-      ASSERT(tok_checkiter == params.end(),
-          "operator<< on RandomNumberEngine_Parameters - still tokens before ';'!");
+      ASSERT(tok_checkiter == paramtokens.end(),
+          "operator<< on RandomNumberEngine_Parameters - still tokens before ';' in token"
+          +*tok_iter+": "+*tok_checkiter+"!");
       DoLog(0) && (Log() << Verbose(0) << "INFO: Token pair is " << *tok_paramiter << "," << *tok_valueiter << std::endl);
       std::stringstream value(*tok_valueiter);