Changeset a700c4

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:

8b9c43

Parents:

3bfd78

git-author:

Frederik Heber <heber@…> (04/01/11 20:02:47)

git-committer:

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

Message:

Removed Exceptions/NotInvertibleException.

• is now a boost::exception-derived LinearAlgebraException.
• error_info LinearAlgebraMatrixContent now takes const MatrixContent * const.

Location:

src

Files:

• Exceptions/Makefile.am (modified) (2 diffs)
• Exceptions/NotInvertibleException.cpp (deleted)
• Exceptions/NotInvertibleException.hpp (deleted)
• LinearAlgebra/Exceptions.hpp (modified) (2 diffs)
• LinearAlgebra/Line.cpp (modified) (1 diff)
• LinearAlgebra/MatrixContent.cpp (modified) (1 diff)
• LinearAlgebra/RealSpaceMatrix.cpp (modified) (2 diffs)
• LinearAlgebra/unittests/MatrixUnitTest.cpp (modified) (1 diff)

src/Exceptions/Makefile.am

@@ -13 +13 @@
   MathException.cpp \
   MissingValueException.cpp \
-  NotInvertibleException.cpp \
   NotOnSurfaceException.cpp \
   ShapeException.cpp \
@@ -26 +25 @@
   MathException.hpp \
   MissingValueException.hpp \
-  NotInvertibleException.hpp \
   NotOnSurfaceException.hpp \
   FormulaStringParseException.hpp \

src/LinearAlgebra/Exceptions.hpp

@@ -23 +23 @@
 /** ========================== General error information ================== */
 
-/** Exception information for SkewException: determinant that is not null.
+/** Exception information for LinearAlgebraException: determinant.
  */
-typedef boost::error_info<struct tag_LinearAlgebraDeterminant, double> LinearAlgebraDeterminant;
-/** Exception information for SkewException: determinant that is not null.
+typedef boost::error_info<struct tag_LinearAlgebraDeterminant, const double> LinearAlgebraDeterminant;
+
+/** Exception information for LinearAlgebraException: matrix.
  */
-typedef boost::error_info<struct tag_LinearAlgebraMatrix, MatrixContent*> LinearAlgebraMatrix;
+typedef boost::error_info<struct tag_LinearAlgebraMatrix, const MatrixContent* const> LinearAlgebraMatrixContent;
 
 /** ============================ Specific exceptions ====================== */
@@ -36 +37 @@
 struct SkewException : virtual LinearAlgebraException { };
 
+/** Exception thrown when are matrix is not invertiable, i.e. its determinant is NULL.
+ */
+struct NotInvertibleException : virtual LinearAlgebraException { };
+
 #endif /* EXCEPTIONS_HPP_ */

src/LinearAlgebra/Line.cpp

@@ -136 +136 @@
   if (fabs(M->Determinant()) > LINALG_MYEPSILON()) {
     Log() << Verbose(1) << "Determinant of coefficient matrix is NOT zero." << endl;
-    throw SkewException() << LinearAlgebraDeterminant(M->Determinant()) << LinearAlgebraMatrix(&(*M));
+    throw SkewException() << LinearAlgebraDeterminant(M->Determinant()) << LinearAlgebraMatrixContent(&(*M));
   }
 

src/LinearAlgebra/MatrixContent.cpp

@@ -15 +15 @@
 
 #include "CodePatterns/Assert.hpp"
-#include "Exceptions/NotInvertibleException.hpp"
 #include "LinearAlgebra/defs.hpp"
 #include "LinearAlgebra/fast_functions.hpp"

src/LinearAlgebra/RealSpaceMatrix.cpp

@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "Exceptions/NotInvertibleException.hpp"
 #include "CodePatterns/Assert.hpp"
 #include "LinearAlgebra/defs.hpp"
+#include "LinearAlgebra/Exceptions.hpp"
 #include "LinearAlgebra/fast_functions.hpp"
 #include "LinearAlgebra/MatrixContent.hpp"
@@ -250 +250 @@
   double det = determinant();
   if(fabs(det) <= LINALG_MYEPSILON()){
-    throw NotInvertibleException(__FILE__,__LINE__);
+    throw NotInvertibleException() << LinearAlgebraDeterminant(det) << LinearAlgebraMatrixContent(this->content);
   }
 

src/LinearAlgebra/unittests/MatrixUnitTest.cpp

@@ -27 +27 @@
 #include "MatrixUnitTest.hpp"
 
-#include "Exceptions/NotInvertibleException.hpp"
 #include "LinearAlgebra/defs.hpp"
+#include "LinearAlgebra/Exceptions.hpp"
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
 #include "LinearAlgebra/Vector.hpp"