Changeset 882678 for src/Actions/ValueStorage.cpp

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:

336e33

Parents:

b94634

git-author:

Frederik Heber <heber@…> (04/01/11 22:29:00)

git-committer:

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

Message:

Removed IllegalTypeException from Exceptions.

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

File:

• src/Actions/ValueStorage.cpp (modified) (21 diffs)

src/Actions/ValueStorage.cpp

@@ -68 +68 @@
     CurrentValueMap.erase(name);
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
   _T = World::getInstance().getAtom(AtomById(atomID));
 }
@@ -80 +84 @@
     CurrentValueMap.erase(name);
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
   _T = World::getInstance().getPeriode()->FindElement(Z);
 }
@@ -92 +100 @@
     CurrentValueMap.erase(name);
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
   _T = World::getInstance().getMolecule(MoleculeById(molID));
 }
@@ -121 +133 @@
     CurrentValueMap.erase(name);
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -134 +150 @@
     }
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -147 +167 @@
     }
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -159 +183 @@
         "ValueStorage::queryCurrentValue() - RandomNumberDistribution_Parameters in value map has only no components!");
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -186 +214 @@
     }
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -212 +244 @@
     }
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -239 +275 @@
     }
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -255 +295 @@
     _T = tmp;
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -265 +309 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -275 +323 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -285 +337 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -301 +357 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -319 +379 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -330 +394 @@
     DoLog(0) && (Log() << Verbose(0) << "ValueStorage::setCurrentValue() for "+toString(name)+" to "+stream.str()+"." << std::endl);
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -342 +410 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -354 +426 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -366 +442 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }
 
@@ -376 +456 @@
     CurrentValueMap[name] = stream.str();
   } else
-    throw IllegalTypeException(__FILE__,__LINE__);
+    throw IllegalTypeException() << ValueStorageOptionName(name)
+        << ValueStoragePairTypeName(std::make_pair(
+            typeid(_T).name(),
+            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
+            );
 }