Changeset fdfc52
- Timestamp:
- May 7, 2016, 7:03:56 AM (9 years ago)
- 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)
- Location:
- src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Actions/PotentialAction/ParsePotentialsAction.cpp
rfd5440 rfdfc52 65 65 PotentialDeserializer deserialize(returnstream); 66 66 deserialize(); 67 } catch (Serializ ablePotentialMissingValueException &e) {68 if (const std::string *key = boost::get_error_info<Serializ ablePotentialKey>(e))67 } catch (SerializerMissingValueException &e) { 68 if (const std::string *key = boost::get_error_info<SerializerKey>(e)) 69 69 STATUS("Missing value when parsing information for potential "+*key+"."); 70 70 else 71 71 STATUS("Missing value parsing information for potential with unknown key."); 72 72 return Action::failure; 73 } catch (Serializ ablePotentialIllegalKeyException &e) {74 if (const std::string *key = boost::get_error_info<Serializ ablePotentialKey>(e))73 } catch (SerializerIllegalKeyException &e) { 74 if (const std::string *key = boost::get_error_info<SerializerKey>(e)) 75 75 STATUS("Illegal key parsing information for potential "+*key+"."); 76 76 else -
src/Potentials/Exceptions.hpp
rfd5440 rfdfc52 17 17 #include <boost/exception/all.hpp> 18 18 19 /** Base type for all exceptions regarding linear algebra.19 /** type for all serializer exceptions on bad streams 20 20 * 21 21 */ 22 struct Serializ ablePotentialException : virtual std::exception, virtual boost::exception { };22 struct SerializerStreamException : virtual std::exception, virtual boost::exception { }; 23 23 24 24 /** ========================== General error information ================== */ … … 26 26 /** Exception information for ParserException: non-present key of an internal map. 27 27 */ 28 typedef boost::error_info< struct tag_Serializ ablePotentialKey, const std::string > SerializablePotentialKey;28 typedef boost::error_info< struct tag_SerializerKey, const std::string > SerializerKey; 29 29 30 30 /** ============================ Specific exceptions ====================== */ … … 32 32 /** Exception thrown when the given parameter name/key does not exist 33 33 */ 34 struct Serializ ablePotentialIllegalKeyException : virtual SerializablePotentialException { };34 struct SerializerIllegalKeyException : virtual SerializerStreamException { }; 35 35 36 36 /** Exception thrown when the value to parameter name/key is missing 37 37 */ 38 struct Serializ ablePotentialMissingValueException : virtual SerializablePotentialException { };38 struct SerializerMissingValueException : virtual SerializerStreamException { }; 39 39 40 40 #endif /* EXCEPTIONS_HPP_ */ -
src/Potentials/Particles/Particle.cpp
rfd5440 rfdfc52 119 119 // check stream 120 120 if (ost.bad()) 121 throw Serializ ablePotentialException();121 throw SerializerStreamException(); 122 122 123 123 /// print parameter key … … 150 150 // check stream 151 151 if (ist.bad()) 152 throw Serializ ablePotentialException();152 throw SerializerStreamException(); 153 153 154 154 // read in full line … … 160 160 if ((strBegin == std::string::npos) || (colonpos == std::string::npos) || 161 161 (linestring.substr(strBegin, colonpos-strBegin) != std::string("particle"))) 162 throw Serializ ablePotentialMissingValueException()163 << Serializ ablePotentialKey(std::string("particle"));162 throw SerializerMissingValueException() 163 << SerializerKey(std::string("particle")); 164 164 165 165 // tokenize by "," … … 180 180 181 181 if (equalitypos == std::string::npos) 182 throw Serializ ablePotentialMissingValueException() << SerializablePotentialKey(key);182 throw SerializerMissingValueException() << SerializerKey(key); 183 183 184 184 switch((parameters_t)index) { … … 211 211 break; 212 212 default: 213 throw Serializ ablePotentialMissingValueException() << SerializablePotentialKey(key);213 throw SerializerMissingValueException() << SerializerKey(key); 214 214 break; 215 215 } -
src/Potentials/SerializablePotential.cpp
rfd5440 rfdfc52 64 64 // check stream 65 65 if (ost.bad()) 66 throw Serializ ablePotentialException();66 throw SerializerStreamException(); 67 67 68 68 /// print parameter key … … 104 104 // check stream 105 105 if (ist.bad()) 106 throw Serializ ablePotentialException();106 throw SerializerStreamException(); 107 107 108 108 // create copy of current parameters as line may contain not all required … … 117 117 if ((strBegin == std::string::npos) || (colonpos == std::string::npos) || 118 118 (linestring.substr(strBegin, colonpos-strBegin) != getToken())) 119 throw Serializ ablePotentialMissingValueException()120 << Serializ ablePotentialKey(getName());119 throw SerializerMissingValueException() 120 << SerializerKey(getName()); 121 121 122 122 // tokenize by "," … … 146 146 const size_t index = ConvertToIndex(indexstring); 147 147 if(index == 0) 148 throw Serializ ablePotentialMissingValueException() << SerializablePotentialKey(key);148 throw SerializerMissingValueException() << SerializerKey(key); 149 149 // and set the type 150 150 if (equalitypos == std::string::npos) 151 throw Serializ ablePotentialMissingValueException() << SerializablePotentialKey(key);151 throw SerializerMissingValueException() << SerializerKey(key); 152 152 setParticleType(index-1, ConvertToParticleType(value)); 153 153 } else { … … 156 156 if (index != (size_t)-1) { 157 157 if (equalitypos == std::string::npos) 158 throw Serializ ablePotentialMissingValueException() << SerializablePotentialKey(key);158 throw SerializerMissingValueException() << SerializerKey(key); 159 159 params[index] = ConvertToValue(value); 160 160 } else { 161 throw Serializ ablePotentialIllegalKeyException() << SerializablePotentialKey(key);161 throw SerializerIllegalKeyException() << SerializerKey(key); 162 162 } 163 163 } -
src/Potentials/unittests/SerializablePotentialUnitTest.cpp
rfd5440 rfdfc52 105 105 CPPUNIT_ASSERT_THROW( 106 106 illegalkeystream >> mockpotential, 107 Serializ ablePotentialIllegalKeyException);107 SerializerIllegalKeyException); 108 108 CPPUNIT_ASSERT_EQUAL( 109 109 SerializablePotential::parameter_t(1), … … 116 116 CPPUNIT_ASSERT_THROW( 117 117 missingvaluestream >> mockpotential, 118 Serializ ablePotentialMissingValueException);118 SerializerMissingValueException); 119 119 CPPUNIT_ASSERT_EQUAL( 120 120 SerializablePotential::parameter_t(1),
Note:
See TracChangeset
for help on using the changeset viewer.