Changeset 8b9c43

Timestamp:

Apr 6, 2011, 1:50:41 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:

783e88

Parents:

a700c4

git-author:

Frederik Heber <heber@…> (04/01/11 20:27:13)

git-committer:

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

Message:

Removed Exceptions/ZeroVectorException.

• is now boost::exception-derived.
• new error_info LinearAlgebraVector.

Location:

src

Files:

• Exceptions/Makefile.am (modified) (2 diffs)
• Exceptions/ZeroVectorException.cpp (deleted)
• Exceptions/ZeroVectorException.hpp (deleted)
• LinearAlgebra/Exceptions.hpp (modified) (3 diffs)
• LinearAlgebra/Plane.cpp (modified) (4 diffs)
• LinearAlgebra/Plane.hpp (modified) (1 diff)
• LinearAlgebra/unittests/PlaneUnitTest.cpp (modified) (1 diff)

src/Exceptions/Makefile.am

@@ -15 +15 @@
   NotOnSurfaceException.cpp \
   ShapeException.cpp \
-  FormulaStringParseException.cpp \
-  ZeroVectorException.cpp
+  FormulaStringParseException.cpp
         
                                   
@@ -26 +25 @@
   MissingValueException.hpp \
   NotOnSurfaceException.hpp \
-  FormulaStringParseException.hpp \
-  ZeroVectorException.hpp
+  FormulaStringParseException.hpp
 
 

src/LinearAlgebra/Exceptions.hpp

@@ -18 +18 @@
 
 class MatrixContent;
+class Vector;
 
 struct LinearAlgebraException : virtual std::exception, virtual boost::exception { };
@@ -29 +30 @@
 /** Exception information for LinearAlgebraException: matrix.
  */
-typedef boost::error_info<struct tag_LinearAlgebraMatrix, const MatrixContent* const> LinearAlgebraMatrixContent;
+typedef boost::error_info<struct tag_LinearAlgebraMatrixContent, const MatrixContent* const> LinearAlgebraMatrixContent;
+
+/** Exception information for LinearAlgebraException: vector.
+ */
+typedef boost::error_info<struct tag_LinearAlgebraVector, const Vector* const> LinearAlgebraVector;
 
 /** ============================ Specific exceptions ====================== */
@@ -41 +46 @@
 struct NotInvertibleException : virtual LinearAlgebraException { };
 
+/** Exception thrown when a vector with only zero components is invalidly encountered.
+ */
+struct ZeroVectorException : virtual LinearAlgebraException { };
+
 #endif /* EXCEPTIONS_HPP_ */

src/LinearAlgebra/Plane.cpp

@@ -29 +29 @@
 #include "Exceptions/MultipleSolutionsException.hpp"
 #include "LinearAlgebra/defs.hpp"
+#include "LinearAlgebra/Exceptions.hpp"
 #include "LinearAlgebra/fast_functions.hpp"
 #include "LinearAlgebra/Line.hpp"
@@ -68 +69 @@
   Vector x1 = y1;
   Vector x2 = y2;
-  if ((fabs(x1.Norm()) <= LINALG_MYEPSILON()) || (fabs(x2.Norm()) <= LINALG_MYEPSILON())) {
-    throw ZeroVectorException(__FILE__,__LINE__);
-  }
-
+  if ((fabs(x1.Norm()) <= LINALG_MYEPSILON())) {
+    throw ZeroVectorException() << LinearAlgebraVector(&x1);
+  }
+  if ((fabs(x2.Norm()) <= LINALG_MYEPSILON())) {
+    throw ZeroVectorException() << LinearAlgebraVector(&x2);
+  }
   if((fabs(x1.Angle(x2)) <= LINALG_MYEPSILON())) {
     throw LinearDependenceException(__FILE__,__LINE__);
@@ -93 +96 @@
 {
   if(normalVector->IsZero())
-    throw ZeroVectorException(__FILE__,__LINE__);
+    throw ZeroVectorException() << LinearAlgebraVector(&(*normalVector));
   double factor = 1/normalVector->Norm();
   // normalize the plane parameters
@@ -104 +107 @@
 {
   if(normalVector->IsZero()){
-    throw ZeroVectorException(__FILE__,__LINE__);
+    throw ZeroVectorException() << LinearAlgebraVector(&(*normalVector));
   }
   normalVector->Normalize();

src/LinearAlgebra/Plane.hpp

@@ -18 +18 @@
 #include <vector>
 #include <iosfwd>
+
+#include "LinearAlgebra/Exceptions.hpp"
 #include "LinearAlgebra/Space.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
-#include "Exceptions/ZeroVectorException.hpp"
 
 class Vector;

src/LinearAlgebra/unittests/PlaneUnitTest.cpp

@@ -26 +26 @@
 
 #include "LinearAlgebra/defs.hpp"
+#include "LinearAlgebra/Exceptions.hpp"
 #include "LinearAlgebra/Line.hpp"
 #include "LinearAlgebra/Vector.hpp"