Changeset a811a0 for molecuilder/src/boundary.cpp

Timestamp:

Jul 7, 2009, 9:12:54 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

30212a8

Parents:

d98327

Message:

BUGFIX: Initial edge for starting triangle may be up to TWICE the sphere's radius

Find_second_point_for_tesselation() - now checks norm of vector against 2.*RADIUS

File:

• molecuilder/src/boundary.cpp (modified) (4 diffs)

molecuilder/src/boundary.cpp

@@ -2708 +2708 @@
             // check if we only have one unique point yet ...
             if (a != Candidate) {
-        // Calculate center of the circle with radius RADIUS through points a and Candidate
+              // Calculate center of the circle with radius RADIUS through points a and Candidate
               Vector OrthogonalizedOben, a_Candidate, Center;
               double distance, scaleFactor;
@@ -2714 +2714 @@
               OrthogonalizedOben.CopyVector(&Oben);
               a_Candidate.CopyVector(&(a->x));
-         a_Candidate.SubtractVector(&(Candidate->x));
-         OrthogonalizedOben.ProjectOntoPlane(&a_Candidate);
-         OrthogonalizedOben.Normalize();
-        distance = 0.5 * a_Candidate.Norm();
-        scaleFactor = sqrt(((RADIUS * RADIUS) - (distance * distance)));
-        OrthogonalizedOben.Scale(scaleFactor);
+              a_Candidate.SubtractVector(&(Candidate->x));
+              OrthogonalizedOben.ProjectOntoPlane(&a_Candidate);
+              OrthogonalizedOben.Normalize();
+              distance = 0.5 * a_Candidate.Norm();
+              scaleFactor = sqrt(((RADIUS * RADIUS) - (distance * distance)));
+              OrthogonalizedOben.Scale(scaleFactor);
 
               Center.CopyVector(&(Candidate->x));
-        Center.AddVector(&(a->x));
-        Center.Scale(0.5);
-        Center.AddVector(&OrthogonalizedOben);
+              Center.AddVector(&(a->x));
+              Center.Scale(0.5);
+              Center.AddVector(&OrthogonalizedOben);
 
               AngleCheck.CopyVector(&Center);
@@ -2730 +2730 @@
               norm = a_Candidate.Norm();
               // second point shall have smallest angle with respect to Oben vector
-              if (norm < RADIUS) {
+              if (norm < RADIUS*2.) {
                 angle = AngleCheck.Angle(&Oben);
                 if (angle < Storage[0]) {
@@ -2749 +2749 @@
           }
         } else {
-        cout << "Linked cell list is empty." << endl;
+          cout << "Linked cell list is empty." << endl;
         }
       }