Changeset 91b1e79 for molecuilder/src/vector.cpp

Timestamp:

Jan 11, 2010, 9:16:36 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

afa056

Parents:

d403a1

git-author:

Frederik Heber <heber@…> (01/11/10 09:13:49)

git-committer:

Frederik Heber <heber@…> (01/11/10 09:16:36)

Message:

Fixed Tesselation::IsInnerPoint()

• Both unit tests TesselationInsideOutsideTest and VectorUnitTest are working (and also all others btw);
• FIX: BoundaryTriangleSet::GetIntersectionInsideTriangle() - checks whether intersection is one endpoint and performs the GetIntersectionOfTwoLinesOnPlane() right away to check whether we are inside of triangle
• FIX: Vector::GetIntersectionOfTwoLinesOnPlane() - parallelity is now checked correctly and in accordance with interface description fixed in VectorUnitTest.

Signed-off-by: Frederik Heber <heber@tabletINS.(none)>

File:

• molecuilder/src/vector.cpp (modified) (5 diffs)

molecuilder/src/vector.cpp

@@ -306 +306 @@
 {
   Info FunctionInfo(__func__);
-  Vector a;
-  Vector b;
-  Vector c;
 
   GSLMatrix *M = new GSLMatrix(4,4);
@@ -319 +316 @@
     M->Set(3, i, Line2b->x[i]);
   }
-  Log() << Verbose(1) << "Coefficent matrix is:" << endl;
-  for (int i=0;i<4;i++) {
-    for (int j=0;j<4;j++)
-      cout << "\t" << M->Get(i,j);
-    cout << endl;
-  }
+  
+  //Log() << Verbose(1) << "Coefficent matrix is:" << endl;
+  //for (int i=0;i<4;i++) {
+  //  for (int j=0;j<4;j++)
+  //    cout << "\t" << M->Get(i,j);
+  //  cout << endl;
+  //}
   if (fabs(M->Determinant()) > MYEPSILON) {
     Log() << Verbose(1) << "Determinant of coefficient matrix is NOT zero." << endl;
@@ -333 +331 @@
 
   // constuct a,b,c
+  Vector a;
+  Vector b;
+  Vector c;
+  Vector d;
   a.CopyVector(Line1b);
   a.SubtractVector(Line1a);
@@ -339 +341 @@
   c.CopyVector(Line2a);
   c.SubtractVector(Line1a);
+  d.CopyVector(Line2b);
+  d.SubtractVector(Line1b);
   Log() << Verbose(1) << "INFO: a = " << a << ", b = " << b << ", c = " << c << "." << endl;
+  if ((a.NormSquared() < MYEPSILON) || (b.NormSquared() < MYEPSILON)) {
+   Zero();
+   Log() << Verbose(1) << "At least one of the lines is ill-defined, i.e. offset equals second vector." << endl;
+   return false;
+  }
 
   // check for parallelity
   Vector parallel;
-  parallel.CopyVector(&a);
-  parallel.SubtractVector(&b);
-  if (parallel.NormSquared() < MYEPSILON) {
+  double factor = 0.;
+  double pfactor = 0.;
+  if (fabs(a.ScalarProduct(&b)*a.ScalarProduct(&b)/a.NormSquared()/b.NormSquared() - 1.) < MYEPSILON) {
+    parallel.CopyVector(Line1a);
+    parallel.SubtractVector(Line2a);
+    factor = parallel.ScalarProduct(&a)/a.Norm();
+    if ((factor >= -MYEPSILON) && (factor - 1. < MYEPSILON)) {
+      CopyVector(Line2a);
+      Log() << Verbose(1) << "Lines conincide." << endl;
+      return true;
+    } else {
+      parallel.CopyVector(Line1a);
+      parallel.SubtractVector(Line2b);
+      factor = parallel.ScalarProduct(&a)/a.Norm();
+      if ((factor >= -MYEPSILON) && (factor - 1. < MYEPSILON)) {
+        CopyVector(Line2b);
+        Log() << Verbose(1) << "Lines conincide." << endl;
+        return true;
+      }
+    }
     Log() << Verbose(1) << "Lines are parallel." << endl;
+    Zero();
     return false;
   }
@@ -370 +397 @@
   Log() << Verbose(1) << "Intersection is at " << *this << "." << endl;
 
-  if ((s >=0 ) && (s<=1))
-    return true;
-  else
-    return false;
+  return true;
 };