Changes in / [47191b:1ac51b]

Location:

src

Files:

• Exceptions/SkewException.cpp (deleted)
• Exceptions/SkewException.hpp (deleted)
• Makefile.am (modified) (2 diffs)
• atom.cpp (modified) (1 diff)
• tesselation.cpp (modified) (2 diffs)
• vector_ops.cpp (modified) (2 diffs)

src/Makefile.am

@@ -88 +88 @@
                                   Exceptions/LinearDependenceException.cpp \
                                   Exceptions/MathException.cpp \
-                                  Exceptions/SkewException.cpp \
                                   Exceptions/ZeroVectorException.cpp
                                   
@@ -94 +93 @@
                                   Exceptions/LinearDependenceException.hpp \
                                   Exceptions/MathException.hpp \
-                                  Exceptions/SkewException.hpp \
                                   Exceptions/ZeroVectorException.hpp
 

src/atom.cpp

@@ -68 +68 @@
 atom *atom::GetTrueFather()
 {
-  if(father == this){ // top most father is the one that points on itself
-    return this;
-  }
-  else if(!father) {
-    return 0;
-  }
-  else {
-    return father->GetTrueFather();
-  }
+  atom *walker = this;
+  do {
+    if (walker == walker->father) // top most father is the one that points on itself
+      break;
+    walker = walker->father;
+  } while (walker != NULL);
+  return walker;
 };
 

src/tesselation.cpp

@@ -442 +442 @@
   try {
     *Intersection = Plane(NormalVector, *(endpoints[0]->node->node)).GetIntersection(*MolCenter, *x);
-
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Triangle is " << *this << "." << endl);
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Line is from " << *MolCenter << " to " << *x << "." << endl);
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Intersection is " << *Intersection << "." << endl);
-
-    if (Intersection->DistanceSquared(*endpoints[0]->node->node) < MYEPSILON) {
-      DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with first endpoint." << endl);
-      return true;
-    }   else if (Intersection->DistanceSquared(*endpoints[1]->node->node) < MYEPSILON) {
-      DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with second endpoint." << endl);
-      return true;
-    }   else if (Intersection->DistanceSquared(*endpoints[2]->node->node) < MYEPSILON) {
-      DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with third endpoint." << endl);
-      return true;
-    }
-    // Calculate cross point between one baseline and the line from the third endpoint to intersection
-    int i = 0;
-    do {
+  }
+  catch (LinearDependenceException &excp) {
+    Log() << Verbose(1) << excp;
+    DoeLog(1) && (eLog() << Verbose(1) << "Alas! Intersection with plane failed - at least numerically - the intersection is not on the plane!" << endl);
+    return false;
+  }
+
+  DoLog(1) && (Log() << Verbose(1) << "INFO: Triangle is " << *this << "." << endl);
+  DoLog(1) && (Log() << Verbose(1) << "INFO: Line is from " << *MolCenter << " to " << *x << "." << endl);
+  DoLog(1) && (Log() << Verbose(1) << "INFO: Intersection is " << *Intersection << "." << endl);
+
+  if (Intersection->DistanceSquared(*endpoints[0]->node->node) < MYEPSILON) {
+    DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with first endpoint." << endl);
+    return true;
+  }   else if (Intersection->DistanceSquared(*endpoints[1]->node->node) < MYEPSILON) {
+    DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with second endpoint." << endl);
+    return true;
+  }   else if (Intersection->DistanceSquared(*endpoints[2]->node->node) < MYEPSILON) {
+    DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with third endpoint." << endl);
+    return true;
+  }
+  // Calculate cross point between one baseline and the line from the third endpoint to intersection
+  int i = 0;
+  do {
+    try {
       CrossPoint = GetIntersectionOfTwoLinesOnPlane(*(endpoints[i%3]->node->node),
                                                     *(endpoints[(i+1)%3]->node->node),
@@ -470 +477 @@
       if ((s < -MYEPSILON) || ((s-1.) > MYEPSILON)) {
         DoLog(1) && (Log() << Verbose(1) << "INFO: Crosspoint " << CrossPoint << "outside of triangle." << endl);
-        return false;
+        i=4;
+        break;
       }
       i++;
-    } while (i < 3);
+    } catch (LinearDependenceException &excp){
+      break;
+    }
+  } while (i < 3);
+  if (i == 3) {
     DoLog(1) && (Log() << Verbose(1) << "INFO: Crosspoint " << CrossPoint << " inside of triangle." << endl);
     return true;
-  }
-  catch (MathException &excp) {
-    Log() << Verbose(1) << excp;
-    DoeLog(1) && (eLog() << Verbose(1) << "Alas! Intersection with plane failed - at least numerically - the intersection is not on the plane!" << endl);
+  } else {
+    DoLog(1) && (Log() << Verbose(1) << "INFO: Crosspoint " << CrossPoint << " outside of triangle." << endl);
     return false;
   }
-
-
 }
 ;

src/vector_ops.cpp

@@ -15 +15 @@
 #include "Helpers/fast_functions.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
-#include "Exceptions/SkewException.hpp"
 
 #include <gsl/gsl_linalg.h>
@@ -177 +176 @@
   if (fabs(M->Determinant()) > MYEPSILON) {
     Log() << Verbose(1) << "Determinant of coefficient matrix is NOT zero." << endl;
-    throw SkewException(__FILE__,__LINE__);
+    throw LinearDependenceException(__FILE__,__LINE__);
   }