Changeset 71129f

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:

0a60ee

Parents:

5605793

git-author:

Frederik Heber <heber@…> (04/01/11 14:28:45)

git-committer:

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

Message:

Removed inclusion of Helpers/...hpp from LinearAlgebra.

• VectorContent needed replacing MYEPSILON by LINALG_MYEPSILON.
• LINALG_MYEPSILON is now function (defines are ugly!) that returns numeric_limits<double>::epsilon()

Location:

src/LinearAlgebra

Files:

• Line.cpp (modified) (5 diffs)
• MatrixContent.cpp (modified) (3 diffs)
• Plane.cpp (modified) (5 diffs)
• RealSpaceMatrix.cpp (modified) (1 diff)
• Space.cpp (modified) (2 diffs)
• Vector.cpp (modified) (7 diffs)
• VectorContent.cpp (modified) (5 diffs)
• defs.hpp (modified) (1 diff)
• fast_functions.hpp (modified) (2 diffs)
• unittests/LinearSystemOfEquationsUnitTest.cpp (modified) (1 diff)
• unittests/MatrixUnitTest.cpp (modified) (1 diff)
• unittests/PlaneUnitTest.cpp (modified) (1 diff)
• unittests/VectorUnitTest.cpp (modified) (3 diffs)

src/LinearAlgebra/Line.cpp

@@ -134 +134 @@
   //  cout << endl;
   //}
-  if (fabs(M->Determinant()) > LINALG_MYEPSILON) {
+  if (fabs(M->Determinant()) > LINALG_MYEPSILON()) {
     Log() << Verbose(1) << "Determinant of coefficient matrix is NOT zero." << endl;
     throw SkewException(__FILE__,__LINE__);
@@ -148 +148 @@
   Vector d = Line2b - Line1b;
   Log() << Verbose(1) << "INFO: a = " << a << ", b = " << b << ", c = " << c << "." << endl;
-  if ((a.NormSquared() <= LINALG_MYEPSILON) || (b.NormSquared() <= LINALG_MYEPSILON)) {
+  if ((a.NormSquared() <= LINALG_MYEPSILON()) || (b.NormSquared() <= LINALG_MYEPSILON())) {
    res.Zero();
    Log() << Verbose(1) << "At least one of the lines is ill-defined, i.e. offset equals second vector." << endl;
@@ -157 +157 @@
   Vector parallel;
   double factor = 0.;
-  if (fabs(a.ScalarProduct(b)*a.ScalarProduct(b)/a.NormSquared()/b.NormSquared() - 1.) <= LINALG_MYEPSILON) {
+  if (fabs(a.ScalarProduct(b)*a.ScalarProduct(b)/a.NormSquared()/b.NormSquared() - 1.) <= LINALG_MYEPSILON()) {
     parallel = Line1a - Line2a;
     factor = parallel.ScalarProduct(a)/a.Norm();
-    if ((factor > -LINALG_MYEPSILON) && (factor - 1. <= LINALG_MYEPSILON)) {
+    if ((factor > -LINALG_MYEPSILON()) && (factor - 1. <= LINALG_MYEPSILON())) {
       res = Line2a;
       Log() << Verbose(1) << "Lines conincide." << endl;
@@ -167 +167 @@
       parallel = Line1a - Line2b;
       factor = parallel.ScalarProduct(a)/a.Norm();
-      if ((factor > -LINALG_MYEPSILON) && (factor - 1. <= LINALG_MYEPSILON)) {
+      if ((factor > -LINALG_MYEPSILON()) && (factor - 1. <= LINALG_MYEPSILON())) {
         res = Line2b;
         Log() << Verbose(1) << "Lines conincide." << endl;
@@ -186 +186 @@
   temp2.VectorProduct(b);
   Log() << Verbose(1) << "INFO: temp1 = " << temp1 << ", temp2 = " << temp2 << "." << endl;
-  if (fabs(temp2.NormSquared()) > LINALG_MYEPSILON)
+  if (fabs(temp2.NormSquared()) > LINALG_MYEPSILON())
     s = temp1.ScalarProduct(temp2)/temp2.NormSquared();
   else

src/LinearAlgebra/MatrixContent.cpp

@@ -575 +575 @@
     size_t I=0;
     for (size_t i=0; i<greaterDimension; i++) { // only copy real space part
-      if (fabs(GSL_REAL(gsl_vector_complex_get(eval,i))) > LINALG_MYEPSILON) { // only take eigenvectors with value > 0
+      if (fabs(GSL_REAL(gsl_vector_complex_get(eval,i))) > LINALG_MYEPSILON()) { // only take eigenvectors with value > 0
         std::cout << i << "th eigenvalue is (" << GSL_REAL(gsl_vector_complex_get(eval,i)) << "," << GSL_IMAG(gsl_vector_complex_get(eval,i)) << ")" << std::endl;
         for (size_t j=0; j<greaterDimension; j++) {
-          if (fabs(GSL_IMAG(gsl_matrix_complex_get(evec,j,i))) > LINALG_MYEPSILON)
+          if (fabs(GSL_IMAG(gsl_matrix_complex_get(evec,j,i))) > LINALG_MYEPSILON())
             std::cerr << "MatrixContent::transformToEigenbasis() - WARNING: eigenvectors are complex-valued!" << std::endl;
           gsl_matrix_set(content, j,I, GSL_REAL(gsl_matrix_complex_get(evec,j,i)));
         }
-        if (fabs(GSL_IMAG(gsl_vector_complex_get(eval,I))) > LINALG_MYEPSILON)
+        if (fabs(GSL_IMAG(gsl_vector_complex_get(eval,I))) > LINALG_MYEPSILON())
           std::cerr << "MatrixContent::transformToEigenbasis() - WARNING: eigenvectors are complex-valued!" << std::endl;
         gsl_vector_set(eval_real, I, GSL_REAL(gsl_vector_complex_get(eval, i)));
@@ -805 +805 @@
 
 /** Equality operator.
- * Note that we use numerical sensible checking, i.e. with threshold LINALG_MYEPSILON.
+ * Note that we use numerical sensible checking, i.e. with threshold LINALG_MYEPSILON().
  * \param &rhs MatrixContent to checks against
  */
@@ -813 +813 @@
     for(int i=rows;i--;){
       for(int j=columns;j--;){
-        if(fabs(at(i,j)-rhs.at(i,j))>LINALG_MYEPSILON){
+        if(fabs(at(i,j)-rhs.at(i,j))>LINALG_MYEPSILON()){
           return false;
         }

src/LinearAlgebra/Plane.cpp

@@ -28 +28 @@
 #include "CodePatterns/Verbose.hpp"
 #include "Exceptions/MultipleSolutionsException.hpp"
-#include "Helpers/defs.hpp"
-#include "Helpers/helpers.hpp"
 #include "LinearAlgebra/defs.hpp"
 #include "LinearAlgebra/fast_functions.hpp"
@@ -44 +42 @@
   Vector x1 = y1 -y2;
   Vector x2 = y3 -y2;
-  if ((fabs(x1.Norm()) <= LINALG_MYEPSILON) || (fabs(x2.Norm()) <= LINALG_MYEPSILON) || (fabs(x1.Angle(x2)) <= LINALG_MYEPSILON)) {
+  if ((fabs(x1.Norm()) <= LINALG_MYEPSILON()) || (fabs(x2.Norm()) <= LINALG_MYEPSILON()) || (fabs(x1.Angle(x2)) <= LINALG_MYEPSILON())) {
     throw LinearDependenceException(__FILE__,__LINE__);
   }
@@ -70 +68 @@
   Vector x1 = y1;
   Vector x2 = y2;
-  if ((fabs(x1.Norm()) <= LINALG_MYEPSILON) || (fabs(x2.Norm()) <= LINALG_MYEPSILON)) {
+  if ((fabs(x1.Norm()) <= LINALG_MYEPSILON()) || (fabs(x2.Norm()) <= LINALG_MYEPSILON())) {
     throw ZeroVectorException(__FILE__,__LINE__);
   }
 
-  if((fabs(x1.Angle(x2)) <= LINALG_MYEPSILON)) {
+  if((fabs(x1.Angle(x2)) <= LINALG_MYEPSILON())) {
     throw LinearDependenceException(__FILE__,__LINE__);
   }
@@ -181 +179 @@
 
   double factor1 = getNormal().ScalarProduct(line.getDirection());
-  if(fabs(factor1) <= LINALG_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
@@ -227 +225 @@
 Vector Plane::getClosestPoint(const Vector &point) const{
   double factor = point.ScalarProduct(*normalVector)-offset;
-  if(fabs(factor) <= LINALG_MYEPSILON){
+  if(fabs(factor) <= LINALG_MYEPSILON()){
     // the point itself lies on the plane
     return point;

src/LinearAlgebra/RealSpaceMatrix.cpp

@@ -257 +257 @@
 RealSpaceMatrix RealSpaceMatrix::invert() const{
   double det = determinant();
-  if(fabs(det) <= LINALG_MYEPSILON){
+  if(fabs(det) <= LINALG_MYEPSILON()){
     throw NotInvertibleException(__FILE__,__LINE__);
   }

src/LinearAlgebra/Space.cpp

@@ -22 +22 @@
 #include <limits>
 
-#include "Helpers/defs.hpp"
 #include "LinearAlgebra/defs.hpp"
 #include "LinearAlgebra/Space.hpp"
@@ -43 +42 @@
 
 bool Space::isContained(const Vector &point) const{
-  return (distance(point)) <= LINALG_MYEPSILON;
+  return (distance(point)) <= LINALG_MYEPSILON();
 }

src/LinearAlgebra/Vector.cpp

@@ -280 +280 @@
 bool Vector::IsZero() const
 {
-  return (fabs(at(0))+fabs(at(1))+fabs(at(2)) < MYEPSILON);
+  return (fabs(at(0))+fabs(at(1))+fabs(at(2)) < LINALG_MYEPSILON());
 };
 
@@ -288 +288 @@
 bool Vector::IsOne() const
 {
-  return (fabs(Norm() - 1.) < MYEPSILON);
+  return (fabs(Norm() - 1.) < LINALG_MYEPSILON());
 };
 
@@ -296 +296 @@
 bool Vector::IsNormalTo(const Vector &normal) const
 {
-  if (ScalarProduct(normal) < MYEPSILON)
+  if (ScalarProduct(normal) < LINALG_MYEPSILON())
     return true;
   else
@@ -309 +309 @@
   bool status = true;
   for (int i=0;i<NDIM;i++) {
-    if (fabs(at(i) - a[i]) > MYEPSILON)
+    if (fabs(at(i) - a[i]) > LINALG_MYEPSILON())
       status = false;
   }
@@ -323 +323 @@
   double norm1 = Norm(), norm2 = y.Norm();
   double angle = -1;
-  if ((fabs(norm1) > MYEPSILON) && (fabs(norm2) > MYEPSILON))
+  if ((fabs(norm1) > LINALG_MYEPSILON()) && (fabs(norm2) > LINALG_MYEPSILON()))
     angle = this->ScalarProduct(y)/norm1/norm2;
-  // -1-MYEPSILON occured due to numerical imprecision, catch ...
-  //Log() << Verbose(2) << "INFO: acos(-1) = " << acos(-1) << ", acos(-1+MYEPSILON) = " << acos(-1+MYEPSILON) << ", acos(-1-MYEPSILON) = " << acos(-1-MYEPSILON) << "." << endl;
+  // -1-LINALG_MYEPSILON() occured due to numerical imprecision, catch ...
+  //Log() << Verbose(2) << "INFO: acos(-1) = " << acos(-1) << ", acos(-1+LINALG_MYEPSILON()) = " << acos(-1+LINALG_MYEPSILON()) << ", acos(-1-LINALG_MYEPSILON()) = " << acos(-1-LINALG_MYEPSILON()) << "." << endl;
   if (angle < -1)
     angle = -1;
@@ -525 +525 @@
   SubtractVector(x1);
   for (int i=NDIM;i--;)
-    result = result || (fabs(at(i)) > MYEPSILON);
+    result = result || (fabs(at(i)) > LINALG_MYEPSILON());
 
   return result;
@@ -550 +550 @@
   // find two components != 0
   for (j=0;j<NDIM;j++){
-    if (fabs(GivenVector[j]) > MYEPSILON)
+    if (fabs(GivenVector[j]) > LINALG_MYEPSILON())
       Components[Last++] = j;
     else

src/LinearAlgebra/VectorContent.cpp

@@ -27 +27 @@
 
 #include "CodePatterns/Assert.hpp"
-#include "Helpers/defs.hpp"
 #include "LinearAlgebra/defs.hpp"
 #include "LinearAlgebra/Vector.hpp"
@@ -257 +256 @@
   ASSERT(dimension == b.dimension, "Dimenions of VectorContents to compare differ");
   for (size_t i=0;i<dimension;i++)
-    status = status && (fabs(at(i) - b.at(i)) <= LINALG_MYEPSILON);
+    status = status && (fabs(at(i) - b.at(i)) <= LINALG_MYEPSILON());
   return status;
 };
@@ -376 +375 @@
   for (size_t i = dimension; i--; )
     result += fabs(at(i));
-  return (result <= LINALG_MYEPSILON);
+  return (result <= LINALG_MYEPSILON());
 };
 
@@ -387 +386 @@
   for (size_t i=dimension;--i;)
     NormValue += at(i)*at(i);
-  return (fabs(NormValue - 1.) <= LINALG_MYEPSILON);
+  return (fabs(NormValue - 1.) <= LINALG_MYEPSILON());
 };
 
@@ -452 +451 @@
   double norm1 = Norm(), norm2 = y.Norm();
   double angle = -1;
-  if ((fabs(norm1) > LINALG_MYEPSILON) && (fabs(norm2) > LINALG_MYEPSILON))
+  if ((fabs(norm1) > LINALG_MYEPSILON()) && (fabs(norm2) > LINALG_MYEPSILON()))
     angle = this->ScalarProduct(y)/norm1/norm2;
-  // -1-LINALG_MYEPSILON occured due to numerical imprecision, catch ...
-  //Log() << Verbose(2) << "INFO: acos(-1) = " << acos(-1) << ", acos(-1+LINALG_MYEPSILON) = " << acos(-1+LINALG_MYEPSILON) << ", acos(-1-LINALG_MYEPSILON) = " << acos(-1-LINALG_MYEPSILON) << "." << endl;
+  // -1-LINALG_MYEPSILON() occured due to numerical imprecision, catch ...
+  //Log() << Verbose(2) << "INFO: acos(-1) = " << acos(-1) << ", acos(-1+LINALG_MYEPSILON()) = " << acos(-1+LINALG_MYEPSILON()) << ", acos(-1-LINALG_MYEPSILON()) = " << acos(-1-LINALG_MYEPSILON()) << "." << endl;
   if (angle < -1)
     angle = -1;

src/LinearAlgebra/defs.hpp

@@ -18 +18 @@
 #include <limits>
 
-#define LINALG_MYEPSILON numeric_limits<double>::epsilon()*100.
+#ifdef HAVE_INLINE
+inline
+#endif
+double LINALG_MYEPSILON()
+{
+  return (std::numeric_limits<double>::epsilon()*100.);
+}
 
 enum { NDIM = 3 };   //!< number of spatial dimensions

src/LinearAlgebra/fast_functions.hpp

@@ -16 +16 @@
 #include <cmath>
 
-#include "Helpers/defs.hpp"
+#include "LinearAlgebra/defs.hpp"
 
 /**
@@ -42 +42 @@
 inline sign_t sign(double value)
 {
-  if(fabs(value)<MYEPSILON){
+  if(fabs(value)<LINALG_MYEPSILON()){
     return Zero;
   }

src/LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.cpp

@@ -118 +118 @@
   s->GetSolutionAsArray(array);
   for (int i=0;i<4;i++) {
-    CPPUNIT_ASSERT( fabs(x_array[i] - array[i]) <= LINALG_MYEPSILON );
+    CPPUNIT_ASSERT( fabs(x_array[i] - array[i]) <= LINALG_MYEPSILON() );
   }
   delete[](array);

src/LinearAlgebra/unittests/MatrixUnitTest.cpp

@@ -272 +272 @@
   // arbitrary rotation matrix has det = 1
   res.setRotation(M_PI/3.,1.,M_PI/7.);
-  CPPUNIT_ASSERT(fabs(fabs(res.determinant()) -1.) <= LINALG_MYEPSILON);
+  CPPUNIT_ASSERT(fabs(fabs(res.determinant()) -1.) <= LINALG_MYEPSILON());
 
   // inverse is rotation matrix with negative angles

src/LinearAlgebra/unittests/PlaneUnitTest.cpp

@@ -160 +160 @@
   {
     Vector t = (1./3.)*(unitVec[0]+unitVec[1]+unitVec[2]);
-    CPPUNIT_ASSERT(fabs(p1->distance(zeroVec)-t.Norm()) <= LINALG_MYEPSILON);
+    CPPUNIT_ASSERT(fabs(p1->distance(zeroVec)-t.Norm()) <= LINALG_MYEPSILON());
     CPPUNIT_ASSERT_EQUAL(t,p1->getClosestPoint(zeroVec));
   }
 
-  CPPUNIT_ASSERT(fabs(p2->distance(unitVec[2])-1) <= LINALG_MYEPSILON);
+  CPPUNIT_ASSERT(fabs(p2->distance(unitVec[2])-1) <= LINALG_MYEPSILON());
   CPPUNIT_ASSERT_EQUAL(zeroVec,p2->getClosestPoint(unitVec[2]));
-  CPPUNIT_ASSERT(fabs(p3->distance(unitVec[1])-1) <= LINALG_MYEPSILON);
+  CPPUNIT_ASSERT(fabs(p3->distance(unitVec[1])-1) <= LINALG_MYEPSILON());
   CPPUNIT_ASSERT_EQUAL(zeroVec,p3->getClosestPoint(unitVec[1]));
-  CPPUNIT_ASSERT(fabs(p4->distance(unitVec[0])-1) <= LINALG_MYEPSILON);
+  CPPUNIT_ASSERT(fabs(p4->distance(unitVec[0])-1) <= LINALG_MYEPSILON());
   CPPUNIT_ASSERT_EQUAL(zeroVec,p4->getClosestPoint(unitVec[0]));
 }

src/LinearAlgebra/unittests/VectorUnitTest.cpp

@@ -28 +28 @@
 #include "CodePatterns/Log.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
-#include "Helpers/defs.hpp"
 #include "LinearAlgebra/defs.hpp"
 #include "LinearAlgebra/Plane.hpp"
@@ -233 +232 @@
   CPPUNIT_ASSERT_EQUAL( M_PI, zero.Angle(unit) );
   CPPUNIT_ASSERT_EQUAL( 0., unit.Angle(unit) );
-  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/2. - otherunit.Angle(unit)) <= LINALG_MYEPSILON );
-  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/2. - unit.Angle(notunit)) <= LINALG_MYEPSILON );
-  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/4. - otherunit.Angle(notunit)) <= LINALG_MYEPSILON );
+  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/2. - otherunit.Angle(unit)) <= LINALG_MYEPSILON() );
+  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/2. - unit.Angle(notunit)) <= LINALG_MYEPSILON() );
+  CPPUNIT_ASSERT_EQUAL( true, fabs(M_PI/4. - otherunit.Angle(notunit)) <= LINALG_MYEPSILON() );
 };
 
@@ -258 +257 @@
   // first one-component system
   CPPUNIT_ASSERT(testVector.GetOneNormalVector(unit));
-  CPPUNIT_ASSERT(testVector.ScalarProduct(unit) <= LINALG_MYEPSILON);
+  CPPUNIT_ASSERT(testVector.ScalarProduct(unit) <= LINALG_MYEPSILON());
 
   // second one-component system
   CPPUNIT_ASSERT(testVector.GetOneNormalVector(otherunit));
-  CPPUNIT_ASSERT(testVector.ScalarProduct(otherunit) <= LINALG_MYEPSILON);
+  CPPUNIT_ASSERT(testVector.ScalarProduct(otherunit) <= LINALG_MYEPSILON());
 
   // first two-component system
   CPPUNIT_ASSERT(testVector.GetOneNormalVector(notunit));
-  CPPUNIT_ASSERT(testVector.ScalarProduct(notunit) <= LINALG_MYEPSILON);
+  CPPUNIT_ASSERT(testVector.ScalarProduct(notunit) <= LINALG_MYEPSILON());
 
   // second two-component system
   CPPUNIT_ASSERT(testVector.GetOneNormalVector(two));
-  CPPUNIT_ASSERT(testVector.ScalarProduct(two) <= LINALG_MYEPSILON);
+  CPPUNIT_ASSERT(testVector.ScalarProduct(two) <= LINALG_MYEPSILON());
 
   // three component system
   CPPUNIT_ASSERT(testVector.GetOneNormalVector(three));
-  CPPUNIT_ASSERT(testVector.ScalarProduct(three) <= LINALG_MYEPSILON);
-}
+  CPPUNIT_ASSERT(testVector.ScalarProduct(three) <= LINALG_MYEPSILON());
+}