Changeset 9b410d for src/LinearAlgebra/Plane.cpp

Timestamp:

Apr 6, 2011, 1:10:31 PM (15 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, Candidate_v1.7.0, 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:

06aedc

Parents:

1be8a5

git-author:

Frederik Heber <heber@…> (03/14/11 13:54:08)

git-committer:

Frederik Heber <heber@…> (04/06/11 13:10:31)

Message:

Replace MYEPSILON in LinearAlgebra/ by LINALG_MYEPSILON.

• this is preparatory for external use lib libmolecuilderLinearAlgebra.
• new file LinearAlgebra/defs.hpp.

File:

• src/LinearAlgebra/Plane.cpp (modified) (5 diffs)

src/LinearAlgebra/Plane.cpp

@@ -21 +21 @@
 
 #include <cmath>
-
-#include "Exceptions/MultipleSolutionsException.hpp"
+#include <limits>
+
 #include "CodePatterns/Assert.hpp"
-#include "Helpers/defs.hpp"
-#include "Helpers/helpers.hpp"
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Log.hpp"
 #include "CodePatterns/Verbose.hpp"
+#include "Exceptions/MultipleSolutionsException.hpp"
+#include "Helpers/defs.hpp"
+#include "Helpers/helpers.hpp"
+#include "LinearAlgebra/defs.hpp"
 #include "LinearAlgebra/Line.hpp"
 #include "LinearAlgebra/Plane.hpp"
@@ -41 +43 @@
   Vector x1 = y1 -y2;
   Vector x2 = y3 -y2;
-  if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON) || (fabs(x1.Angle(x2)) < MYEPSILON)) {
+  if ((fabs(x1.Norm()) <= LINALG_MYEPSILON) || (fabs(x2.Norm()) <= LINALG_MYEPSILON) || (fabs(x1.Angle(x2)) <= LINALG_MYEPSILON)) {
     throw LinearDependenceException(__FILE__,__LINE__);
   }
@@ -67 +69 @@
   Vector x1 = y1;
   Vector x2 = y2;
-  if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON)) {
+  if ((fabs(x1.Norm()) <= LINALG_MYEPSILON) || (fabs(x2.Norm()) <= LINALG_MYEPSILON)) {
     throw ZeroVectorException(__FILE__,__LINE__);
   }
 
-  if((fabs(x1.Angle(x2)) < MYEPSILON)) {
+  if((fabs(x1.Angle(x2)) <= LINALG_MYEPSILON)) {
     throw LinearDependenceException(__FILE__,__LINE__);
   }
@@ -178 +180 @@
 
   double factor1 = getNormal().ScalarProduct(line.getDirection());
-  if(fabs(factor1)<MYEPSILON){
+  if(fabs(factor1) <= LINALG_MYEPSILON){
     // the plane is parallel... under all circumstances this is bad luck
     // we no have either no or infinite solutions
@@ -224 +226 @@
 Vector Plane::getClosestPoint(const Vector &point) const{
   double factor = point.ScalarProduct(*normalVector)-offset;
-  if(fabs(factor) < MYEPSILON){
+  if(fabs(factor) <= LINALG_MYEPSILON){
     // the point itself lies on the plane
     return point;