Changeset 4af89b for molecuilder/src/tesselation.hpp

Timestamp:

Nov 25, 2009, 12:18:18 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

edf611

Parents:

1a3354

Message:

Now the best (in terms of ShortestAngle) baseline is picked among all open ones instead of the next.

• trying to fix the tesselation, we have the following changes
  • in Tesselation::FindNextSuitableTriangle(), the adding of the triangle was split off and shifted to new function Tesselation::AddCandidateTriangle()
  • Tesselation::FindNextSuitableTriangle() now takes CandidateForTesselation instead of a baseline and puts found candidate therein
  • instead of looping through LinesOnBoundary in FindNonConvexBorder() we have a new Map called OpenLines containing all Lines with TriangleCount < 2
  • the loop itself was changed as follows and continues until OpenLines is empty:
    1. Find Candidates for all new OpenLines
    2. Pick smallest ShortestAngle among these
    3. Add this candidate
  • OpenLines is added to in AddAlwaysTesselationLine() and removed from in AllTesselationLine() (existing line case)
  • CandidateForTesselation class has new attributes (Other)ShortestAngle

• Element initialization was done for all constructors in tesselation.cpp

File:

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

molecuilder/src/tesselation.hpp

@@ -53 +53 @@
 #define PointTestPair pair < PointMap::iterator, bool >
 #define CandidateList list <class CandidateForTesselation *>
+#define CandidateMap map <class BoundaryLineSet *, class CandidateForTesselation *>
 
 #define LineMap multimap < int, class BoundaryLineSet * >
@@ -114 +115 @@
     TriangleMap triangles;
     int Nr;
+    bool skipped;
 };
 
@@ -186 +188 @@
 class CandidateForTesselation {
   public :
+  CandidateForTesselation(BoundaryLineSet* currentBaseLine);
   CandidateForTesselation(TesselPoint* candidate, BoundaryLineSet* currentBaseLine, Vector OptCandidateCenter, Vector OtherOptCandidateCenter);
   ~CandidateForTesselation();
@@ -193 +196 @@
   Vector OptCenter;
   Vector OtherOptCenter;
-};
+  double ShortestAngle;
+  double OtherShortestAngle;
+};
+
+ostream & operator <<(ostream &ost, const  CandidateForTesselation &a);
 
 // =========================================================== class TESSELATION ===========================================
@@ -211 +218 @@
     void AddTesselationTriangle();
     void AddTesselationTriangle(const int nr);
+    void AddCandidateTriangle(CandidateForTesselation &CandidateLine);
     void RemoveTesselationTriangle(class BoundaryTriangleSet *triangle);
     void RemoveTesselationLine(class BoundaryLineSet *line);
@@ -220 +228 @@
     void FindSecondPointForTesselation(class TesselPoint* a, Vector Oben, class TesselPoint*& OptCandidate, double Storage[3], double RADIUS, const LinkedCell *LC);
     void FindThirdPointForTesselation(Vector &NormalVector, Vector &SearchDirection, Vector &OldSphereCenter, class BoundaryLineSet *BaseLine, const class TesselPoint * const ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, const LinkedCell *LC) const;
-    bool FindNextSuitableTriangle(BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC);
+    bool FindNextSuitableTriangle(CandidateForTesselation &CandidateLine, BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC);
     int CheckPresenceOfTriangle(class TesselPoint *Candidates[3]) const;
     class BoundaryTriangleSet * GetPresentTriangle(TesselPoint *Candidates[3]);
@@ -260 +268 @@
     PointMap PointsOnBoundary;
     LineMap LinesOnBoundary;
+    CandidateMap OpenLines;
     TriangleMap TrianglesOnBoundary;
     int PointsOnBoundaryCount;