Changeset ed2551 for src/LevMartester.cpp

Timestamp:

Feb 25, 2013, 5:29:09 PM (12 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:

0496af

Parents:

6efcae

git-author:

Frederik Heber <heber@…> (11/25/12 09:10:44)

git-committer:

Frederik Heber <heber@…> (02/25/13 17:29:09)

Message:

All Pair_.. and ManyBodyPotentials are now also derived from SerializablePotential.

• added static ParameterNames, skipping "energy_offset" which should not go to file.
• overrode operator<<() and ..>>() for SaturationPotential to print both potentials independently.
• adapted LevMartest and all unit tests.

File:

• src/LevMartester.cpp (modified) (3 diffs)

src/LevMartester.cpp

@@ -238 +238 @@
       params[PairPotential_Angle::spring_constant] =  1.;
       params[PairPotential_Angle::equilibrium_distance] =  0.2;
-      PairPotential_Angle angle;
+      PairPotential_Angle::ParticleTypes_t types =
+            boost::assign::list_of<PairPotential_Angle::ParticleType_t>
+            (8)(1)(1)
+          ;
+      PairPotential_Angle angle(types);
       LOG(0, "INFO: Initial parameters are " << params << ".");
       angle.setParameters(params);
@@ -282 +286 @@
       params[PairPotential_Morse::spring_constant] =  1.;
       params[PairPotential_Morse::equilibrium_distance] =  2.9;
-      PairPotential_Morse morse;
+      PairPotential_Morse::ParticleTypes_t types =
+            boost::assign::list_of<PairPotential_Morse::ParticleType_t>
+            (8)(1)
+          ;
+      PairPotential_Morse morse(types);
       LOG(0, "INFO: Initial parameters are " << params << ".");
       morse.setParameters(params);
@@ -335 +343 @@
       params[SaturationPotential::angle_equilibrium_distance] = 2e+0*rand()/(double)RAND_MAX - 1.;//3.487900e+00;
       LOG(0, "INFO: Initial parameters are " << params << ".");
-
-      SaturationPotential saturation(2.5, triplefunction);
+      SaturationPotential::ParticleTypes_t types =
+            boost::assign::list_of<SaturationPotential::ParticleType_t>
+            (8)(1)(1)
+          ;
+
+      SaturationPotential saturation(types, 2.5, triplefunction);
       saturation.setParameters(params);
       FunctionModel &model = saturation;