Changeset fdfc52 for src/Potentials/SerializablePotential.cpp

Timestamp:

May 7, 2016, 7:03:56 AM (9 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_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:

086e30

Parents:

fd5440

git-author:

Frederik Heber <heber@…> (02/28/16 12:57:48)

git-committer:

Frederik Heber <heber@…> (05/07/16 07:03:56)

Message:

Renamed all SerializablePotential..Exceptions to Serializer..Exceptions.

• this makes it clearer that we also use them for particles and not only for potentials.

File:

• src/Potentials/SerializablePotential.cpp (modified) (5 diffs)

src/Potentials/SerializablePotential.cpp

@@ -64 +64 @@
   // check stream
   if (ost.bad())
-    throw SerializablePotentialException();
+    throw SerializerStreamException();
 
   /// print parameter key
@@ -104 +104 @@
   // check stream
   if (ist.bad())
-    throw SerializablePotentialException();
+    throw SerializerStreamException();
 
   // create copy of current parameters as line may contain not all required
@@ -117 +117 @@
   if ((strBegin == std::string::npos) || (colonpos == std::string::npos) ||
       (linestring.substr(strBegin, colonpos-strBegin) != getToken()))
-    throw SerializablePotentialMissingValueException()
-        << SerializablePotentialKey(getName());
+    throw SerializerMissingValueException()
+        << SerializerKey(getName());
 
   // tokenize by ","
@@ -146 +146 @@
       const size_t index = ConvertToIndex(indexstring);
       if(index == 0)
-          throw SerializablePotentialMissingValueException() << SerializablePotentialKey(key);
+          throw SerializerMissingValueException() << SerializerKey(key);
       // and set the type
       if (equalitypos == std::string::npos)
-        throw SerializablePotentialMissingValueException() << SerializablePotentialKey(key);
+        throw SerializerMissingValueException() << SerializerKey(key);
       setParticleType(index-1, ConvertToParticleType(value));
     } else {
@@ -156 +156 @@
       if (index != (size_t)-1) {
         if (equalitypos == std::string::npos)
-          throw SerializablePotentialMissingValueException() << SerializablePotentialKey(key);
+          throw SerializerMissingValueException() << SerializerKey(key);
         params[index] = ConvertToValue(value);
       } else {
-        throw SerializablePotentialIllegalKeyException() << SerializablePotentialKey(key);
+        throw SerializerIllegalKeyException() << SerializerKey(key);
       }
     }