Changeset 2cbe97 for src

Timestamp:

Apr 30, 2010, 9:32:59 AM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

0e01b4

Parents:

3cdd16

Message:

Added exception specifiers to plane class

Location:

src

Files:

• Plane.cpp (modified) (5 diffs)
• Plane.hpp (modified) (2 diffs)

src/Plane.cpp

@@ -9 +9 @@
 #include "vector.hpp"
 #include "defs.hpp"
-#include "Exceptions/LinearDependenceException.hpp"
 #include "info.hpp"
 #include "log.hpp"
@@ -19 +18 @@
  * generates a plane from three given vectors defining three points in space
  */
-Plane::Plane(const Vector &y1, const Vector &y2, const Vector &y3) :
+Plane::Plane(const Vector &y1, const Vector &y2, const Vector &y3) throw(LinearDependenceException) :
   normalVector(new Vector())
 {
@@ -42 +41 @@
 }
 /**
- * Constructs a plane from two vectors and a offset.
+ * Constructs a plane from two direction vectors and a offset.
  * If no offset is given a plane through origin is assumed
  */
-Plane::Plane(const Vector &y1, const Vector &y2, double _offset):
+Plane::Plane(const Vector &y1, const Vector &y2, double _offset) throw(LinearDependenceException) :
     normalVector(new Vector()),
     offset(_offset)
@@ -67 +66 @@
 }
 
-Plane::Plane(const Vector &_normalVector, double _offset) :
+Plane::Plane(const Vector &_normalVector, double _offset) throw(ZeroVectorException):
   normalVector(new Vector(_normalVector)),
   offset(_offset)
 {
-  ASSERT(normalVector->Norm()>MYEPSILON,"Normalvector was zero when constructing a plane.");
+  if(normalVector->IsZero())
+    throw ZeroVectorException(__FILE__,__LINE__);
   double factor = 1/normalVector->Norm();
   // normalize the plane parameters
@@ -78 +78 @@
 }
 
-Plane::Plane(const Vector &_normalVector, const Vector &_offsetVector) :
+Plane::Plane(const Vector &_normalVector, const Vector &_offsetVector) throw(ZeroVectorException):
     normalVector(new Vector(_normalVector))
 {
+  if(normalVector->IsZero()){
+    throw ZeroVectorException(__FILE__,__LINE__);
+  }
   normalVector->Normalize();
   offset = normalVector->ScalarProduct(_offsetVector);

src/Plane.hpp

@@ -12 +12 @@
 #include <vector>
 #include "Space.hpp"
+#include "Exceptions/LinearDependenceException.hpp"
+#include "Exceptions/ZeroVectorException.hpp"
 
 class Vector;
@@ -19 +21 @@
   typedef std::auto_ptr<Vector> vec_ptr;
 public:
-  Plane(const Vector &y1, const Vector &y2, const Vector &y3);
-  Plane(const Vector &y1, const Vector &y2, double _offset);
-  Plane(const Vector &_normalVector, double _offset=0);
-  Plane(const Vector &_normalVector, const Vector &_offsetVector);
+  Plane(const Vector &y1, const Vector &y2, const Vector &y3) throw(LinearDependenceException);
+  Plane(const Vector &y1, const Vector &y2, double _offset) throw(LinearDependenceException);
+  Plane(const Vector &_normalVector, double _offset=0)  throw(ZeroVectorException);
+  Plane(const Vector &_normalVector, const Vector &_offsetVector) throw(ZeroVectorException);
   virtual ~Plane();