Changeset 336e33 for src

Timestamp:

Apr 6, 2011, 1:50:42 PM (14 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:

3e2225f

Parents:

882678

git-author:

Frederik Heber <heber@…> (04/01/11 23:03:04)

git-committer:

Frederik Heber <heber@…> (04/06/11 13:50:42)

Message:

Removed MissingValueException from Exceptions.

• is now boost::exception-derived in ValueStorage.hpp.

Location:

src

Files:

• Actions/Action.cpp (modified) (1 diff)
• Actions/ValueStorage.cpp (modified) (8 diffs)
• Actions/ValueStorage.hpp (modified) (4 diffs)
• Exceptions/Makefile.am (modified) (1 diff)
• Exceptions/MissingValueException.cpp (deleted)
• Exceptions/MissingValueException.hpp (deleted)

src/Actions/Action.cpp

@@ -28 +28 @@
 #include "Actions/OptionRegistry.hpp"
 #include "Actions/OptionTrait.hpp"
-#include "Exceptions/MissingValueException.hpp"
+//#include "Actions/ValueStorage.hpp"
 #include "UIElements/Dialog.hpp"
 #include "CodePatterns/Assert.hpp"

src/Actions/ValueStorage.cpp

@@ -59 +59 @@
   if (typeid( atom *) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     atomID = lexical_cast<int>(CurrentValueMap[name].c_str());
     CurrentValueMap.erase(name);
   } else if (typeid( const atom *) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     atomID = lexical_cast<int>(CurrentValueMap[name].c_str());
     CurrentValueMap.erase(name);
@@ -80 +80 @@
   if (typeid(const element *) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     Z = lexical_cast<int>(CurrentValueMap[name].c_str());
     CurrentValueMap.erase(name);
@@ -96 +96 @@
   if (typeid( const molecule *) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     molID = lexical_cast<int>(CurrentValueMap[name].c_str());
     CurrentValueMap.erase(name);
@@ -113 +113 @@
   if (typeid( Box ) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     std::istringstream stream(CurrentValueMap[name]);
     stream >> tmp;
@@ -197 +197 @@
   if (typeid( std::vector<const atom *> ) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     std::istringstream stream(CurrentValueMap[name]);
     CurrentValueMap.erase(name);
@@ -228 +228 @@
   if (typeid( std::vector<const element *> ) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     std::istringstream stream(CurrentValueMap[name]);
     CurrentValueMap.erase(name);
@@ -258 +258 @@
   if (typeid( std::vector<const molecule *> ) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     std::istringstream stream(CurrentValueMap[name]);
     CurrentValueMap.erase(name);
@@ -287 +287 @@
   if (typeid( boost::filesystem::path ) == *(OptionRegistry_instance.getOptionByName(name)->getType())) {
     if (CurrentValueMap.find(name) == CurrentValueMap.end())
-      throw MissingValueException(__FILE__, __LINE__);
+      throw MissingValueException() << ValueStorageOptionName(name);
     std::istringstream stream(CurrentValueMap[name]);
     CurrentValueMap.erase(name);

src/Actions/ValueStorage.hpp

@@ -27 +27 @@
 #include "Actions/OptionTrait.hpp"
 #include "Actions/OptionRegistry.hpp"
-#include "Exceptions/MissingValueException.hpp"
 #include "CodePatterns/Assert.hpp"
 #include "CodePatterns/Singleton.hpp"
@@ -63 +62 @@
  */
 struct IllegalTypeException : virtual ValueStorageException { };
+
+/** Exception thrown when ValueStorage is missing a requested value.
+ */
+struct MissingValueException : virtual ValueStorageException { };
+
 
 class MapOfActionsTest;
@@ -123 +127 @@
     if (typeid( T ) == *(OptionRegistry_instance.getOptionByName(name)->getType())) { // constructor of type_info is private, hence can only store by ref or ptr
       if (CurrentValueMap.find(name) == CurrentValueMap.end())
-        throw MissingValueException(__FILE__, __LINE__);
+        throw MissingValueException() << ValueStorageOptionName(name);
       _T = lexical_cast<T>(CurrentValueMap[name].c_str());
       CurrentValueMap.erase(name);
@@ -138 +142 @@
     if (typeid( std::vector<T> ) == *(OptionRegistry_instance.getOptionByName(name)->getType())) { // constructor of type_info is private, hence can only store by ref or ptr
       if (CurrentValueMap.find(name) == CurrentValueMap.end())
-        throw MissingValueException(__FILE__, __LINE__);
+        throw MissingValueException() << ValueStorageOptionName(name);
       std::istringstream stream(CurrentValueMap[name]);
       CurrentValueMap.erase(name);

src/Exceptions/Makefile.am

@@ -8 +8 @@
 
 EXCEPTIONSOURCE = \
-  CustomException.cpp \
-  MissingValueException.cpp
+  CustomException.cpp
         
                                   
 EXCEPTIONHEADER = \
-  CustomException.hpp \
-  MissingValueException.hpp
+  CustomException.hpp