Changeset 0cf171 for molecuilder/src/tesselation.hpp

Timestamp:

Aug 8, 2009, 7:25:28 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

70c4567

Parents:

51abbe

Message:

BUGFIXes to Find_convex_... and Find_non_convex_... algorithms

• Find_non_convex_border() - very first baseline of starting triangle is skipped as it is the most outward.
• BoundaryLineSet::TrianglesCount is removed and replaced by triangles.size(), as it is redundant and we made mistakes in not reducing TrianglesCount on triangle erase.
• BoundaryLineSet::CheckConvexityCriterion() - extra check when NormalVector point in the very same directions,
• BoundaryTriangleSet::GetIntersectionInsideTriangle() - CrossPoint return value is checked, i===3 checked not >3!
• new stream operator for TesselPoint with single argument.
• class Tesselation inherits PointCloud and implements all functions (including virtual destructor) in order to have PointsOnBoundary parsable by LinkedCell.
• Tesselation::InsertStraddlingPoints() - LinkedCell is created for every atom just from the BoundaryPoints and not for all (so that only BoundaryPoints can be found), old triangle is now really deleted, lots of verbosity added and fixed.
• Tesselation::GetCommonEndpoint() - connectedClosestPoint is deleted lateron, SecondPoint argument but not used.
• Tesselation::FindClosestPoint() - returns second second closest point in new second argument.
• Tesselation::getCircleOfConnectedPoints() - we find the BoundaryPoint if possible and just look through its lines if found, plane is centered at closest point and normal is between it and the center of all on circle, getAngle() corrections incorporated and vector is always projected onto circle plane.
• new function Tesselation findSecondClosestPoint().
• getAngle() - just receives third vector with which it dedices between [0,pi) and [pi,2pi), the vectors are assumed to be relative to one common center already.

File:

• molecuilder/src/tesselation.hpp (modified) (5 diffs)

molecuilder/src/tesselation.hpp

@@ -99 +99 @@
     class BoundaryPointSet *endpoints[2];
     TriangleMap triangles;
-    int TrianglesCount;
     int Nr;
 };
@@ -136 +135 @@
 public:
   TesselPoint();
-  ~TesselPoint();
+  virtual ~TesselPoint();
 
   Vector *node;   // pointer to position of the dot in space
   int nr;       // index to easierly identify
   char *Name;   // some name to reference to on output
+
+  virtual ostream & operator << (ostream &ost);
 };
 
@@ -183 +184 @@
 /** Contains the envelope to a PointCloud.
  */
-class Tesselation {
+class Tesselation : public PointCloud {
   public:
 
     Tesselation();
-    ~Tesselation();
+    virtual ~Tesselation();
 
     void AddPoint(TesselPoint *Walker);
@@ -224 +225 @@
     int TrianglesOnBoundaryCount;
 
+    // PointCloud implementation for PointsOnBoundary
+    virtual Vector *GetCenter(ofstream *out);
+    virtual TesselPoint *GetPoint();
+    virtual TesselPoint *GetTerminalPoint();
+    virtual void GoToNext();
+    virtual void GoToPrevious();
+    virtual void GoToFirst();
+    virtual void GoToLast();
+    virtual bool IsEmpty();
+    virtual bool IsEnd();
+
   private:
     class BoundaryPointSet *TPS[3]; //this is a Storage for pointers to triangle points, this and BPS[2] needed due to AddLine restrictions
@@ -229 +241 @@
     class BoundaryLineSet *BLS[3];
     class BoundaryTriangleSet *BTS;
+
+    PointMap::iterator InternalPointer;
 };
 
 bool CheckLineCriteriaforDegeneratedTriangle(class BoundaryPointSet *nodes[3]);
 bool sortCandidates(class CandidateForTesselation* candidate1, class CandidateForTesselation* candidate2);
-TesselPoint* findClosestPoint(const Vector* Point, LinkedCell* LC);
-double getAngle(const Vector &point, const Vector &reference, const Vector &center, Vector OrthogonalVector);
+TesselPoint* findClosestPoint(const Vector* Point, TesselPoint *&SecondPoint, LinkedCell* LC);
+TesselPoint* findSecondClosestPoint(const Vector*, LinkedCell*);
+double getAngle(const Vector &point, const Vector &reference, const Vector OrthogonalVector);
 
 #endif /* TESSELATION_HPP_ */