Changeset 7dea7c

Timestamp:

Oct 2, 2009, 3:19:51 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

a33931, aba92d

Parents:

e4a379

Message:

Fixes to the (Non)ConvexTesselation, working with 1_2_dimethoxyethylene

minor changes:

• BoundaryLineSet::CheckConvexityCriterion() reduced verbosity
• CalculateConcavityPerBoundaryPoint() moved to tesselationhelpers.cpp
• FindNonConvexBorder(): flag -> OneLoopWithoutSuccessFlag, failflag -> TesselationFailFlag, N removed
• FindNonConvexBorder() - CheckListOfBaseline() used before and after insertion of straddling points
• BoundaryTriangleSet::ContainsBoundaryPoint() overloaded function to check also for TesselPoint
• Tesselation::InsertStraddlingPoints() - LinkedCell only redone when point was added
• Tesselation::AddTesselationTriangle() - overloaded function to set index of triangle directly.
• new function CheckListOfBaselines() - outsourced from FindNonConvexBorder()

major changes:

• BUGFIX: FindNonConvexBorder() - increment of baseline was missing
• third step (Flipping baselines) removed from ConvexizeNonconvexEnvelope()
• BUGFIX: BoundaryTriangleSet::GetIntersectionInsideTriangle() < should have been > in final if-statement to check whether in- or outside
• Tesselation::InsertStraddlingPoints() - behavior of FindClosestTriangle() changed, hence we have to check whether returned triangle does not contain the point in question.
• BUGFIX: Tesselation::FlipBaseline() - did not change LastTriangle which caused crashes on writing envelope, as it pointed to delete memory

Location:

src

Files:

• boundary.cpp (modified) (8 diffs)
• boundary.hpp (modified) (1 diff)
• tesselation.cpp (modified) (15 diffs)
• tesselation.hpp (modified) (2 diffs)
• tesselationhelpers.cpp (modified) (2 diffs)
• tesselationhelpers.hpp (modified) (1 diff)

src/boundary.cpp

@@ -572 +572 @@
 
   // third step: IsConvexRectangle
-  LineRunner = TesselStruct->LinesOnBoundary.begin();
-  LineAdvance = LineRunner;  // we need an advanced line, as the LineRunner might get removed
-  while (LineRunner != TesselStruct->LinesOnBoundary.end()) {
-    LineAdvance++;
-    line = LineRunner->second;
-    *out << Verbose(1) << "INFO: Current line is " << *line << "." << endl;
-    //if (LineAdvance != TesselStruct->LinesOnBoundary.end())
-      //*out << Verbose(1) << "INFO: Next line will be " << *(LineAdvance->second) << "." << endl;
-    if (!line->CheckConvexityCriterion(out)) {
-      *out << Verbose(1) << "... line " << *line << " is concave, flipping it." << endl;
-
-      // take highest of both lines
-      point = TesselStruct->IsConvexRectangle(out, line);
-      if (point != NULL)
-        volume += TesselStruct->RemovePointFromTesselatedSurface(out, point);
-    }
-    LineRunner = LineAdvance;
-  }
+//  LineRunner = TesselStruct->LinesOnBoundary.begin();
+//  LineAdvance = LineRunner;  // we need an advanced line, as the LineRunner might get removed
+//  while (LineRunner != TesselStruct->LinesOnBoundary.end()) {
+//    LineAdvance++;
+//    line = LineRunner->second;
+//    *out << Verbose(1) << "INFO: Current line is " << *line << "." << endl;
+//    //if (LineAdvance != TesselStruct->LinesOnBoundary.end())
+//      //*out << Verbose(1) << "INFO: Next line will be " << *(LineAdvance->second) << "." << endl;
+//    if (!line->CheckConvexityCriterion(out)) {
+//      *out << Verbose(1) << "... line " << *line << " is concave, flipping it." << endl;
+//
+//      // take highest of both lines
+//      point = TesselStruct->IsConvexRectangle(out, line);
+//      if (point != NULL)
+//        volume += TesselStruct->RemovePointFromTesselatedSurface(out, point);
+//    }
+//    LineRunner = LineAdvance;
+//  }
 
   CalculateConcavityPerBoundaryPoint(out, TesselStruct);
@@ -600 +600 @@
 };
 
-/** Calculates the concavity for each of the BoundaryPointSet's in a Tesselation.
- * Sets BoundaryPointSet::value equal to the number of connected lines that are not convex.
- * \param *out output stream for debugging
- * \param *TesselStruct pointer to Tesselation structure
- */
-void CalculateConcavityPerBoundaryPoint(ofstream *out, class Tesselation *TesselStruct)
-{
-  class BoundaryPointSet *point = NULL;
-  class BoundaryLineSet *line = NULL;
-  // calculate remaining concavity
-  for (PointMap::iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
-    point = PointRunner->second;
-    *out << Verbose(1) << "INFO: Current point is " << *point << "." << endl;
-    point->value = 0;
-    for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
-      line = LineRunner->second;
-      *out << Verbose(2) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
-      if (!line->CheckConvexityCriterion(out))
-        point->value += 1;
-    }
-  }
-};
-
-/** Stores triangles to file.
- * \param *out output stream for debugging
- * \param *mol molecule with atoms and bonds
- * \param *filename prefix of filename
- * \param *extraSuffix intermediate suffix
- */
-void StoreTrianglesinFile(ofstream *out, molecule *mol, const char *filename, const char *extraSuffix)
-{
-  // 4. Store triangles in tecplot file
-  if (filename != NULL) {
-    if (DoTecplotOutput) {
-      string OutputName(filename);
-      OutputName.append(extraSuffix);
-      OutputName.append(TecplotSuffix);
-      ofstream *tecplot = new ofstream(OutputName.c_str());
-      WriteTecplotFile(out, tecplot, mol->TesselStruct, mol, 0);
-      tecplot->close();
-      delete(tecplot);
-    }
-    if (DoRaster3DOutput) {
-      string OutputName(filename);
-      OutputName.append(extraSuffix);
-      OutputName.append(Raster3DSuffix);
-      ofstream *rasterplot = new ofstream(OutputName.c_str());
-      WriteRaster3dFile(out, rasterplot, mol->TesselStruct, mol);
-      rasterplot->close();
-      delete(rasterplot);
-    }
-  }
-};
 
 /** Determines the volume of a cluster.
@@ -699 +646 @@
 
   return volume;
-}
-;
+};
+
+/** Stores triangles to file.
+ * \param *out output stream for debugging
+ * \param *mol molecule with atoms and bonds
+ * \param *filename prefix of filename
+ * \param *extraSuffix intermediate suffix
+ */
+void StoreTrianglesinFile(ofstream *out, molecule *mol, const char *filename, const char *extraSuffix)
+{
+  // 4. Store triangles in tecplot file
+  if (filename != NULL) {
+    if (DoTecplotOutput) {
+      string OutputName(filename);
+      OutputName.append(extraSuffix);
+      OutputName.append(TecplotSuffix);
+      ofstream *tecplot = new ofstream(OutputName.c_str());
+      WriteTecplotFile(out, tecplot, mol->TesselStruct, mol, 0);
+      tecplot->close();
+      delete(tecplot);
+    }
+    if (DoRaster3DOutput) {
+      string OutputName(filename);
+      OutputName.append(extraSuffix);
+      OutputName.append(Raster3DSuffix);
+      ofstream *rasterplot = new ofstream(OutputName.c_str());
+      WriteRaster3dFile(out, rasterplot, mol->TesselStruct, mol);
+      rasterplot->close();
+      delete(rasterplot);
+    }
+  }
+};
 
 /** Creates multiples of the by \a *mol given cluster and suspends them in water with a given final density.
@@ -990 +967 @@
 void FindNonConvexBorder(ofstream *out, molecule* mol, class LinkedCell *LCList, const double RADIUS, const char *filename = NULL)
 {
-  int N = 0;
   bool freeLC = false;
 
@@ -1005 +981 @@
   LineMap::iterator testline;
   *out << Verbose(0) << "Begin of FindNonConvexBorder\n";
-  bool flag = false;  // marks whether we went once through all baselines without finding any without two triangles
-  bool failflag = false;
+  bool OneLoopWithoutSuccessFlag = false;  // marks whether we went once through all baselines without finding any without two triangles
+  bool TesselationFailFlag = false;
 
   // initialise Linked Cell
@@ -1020 +996 @@
   baseline = mol->TesselStruct->LinesOnBoundary.begin();
   baseline++; // skip first line
-  while ((baseline != mol->TesselStruct->LinesOnBoundary.end()) || (flag)) {
+  while ((baseline != mol->TesselStruct->LinesOnBoundary.end()) || (OneLoopWithoutSuccessFlag)) {
     if (baseline->second->triangles.size() == 1) {
       // 3. find next triangle
-      failflag = mol->TesselStruct->FindNextSuitableTriangle(out, *(baseline->second), *(((baseline->second->triangles.begin()))->second), RADIUS, LCList); //the line is there, so there is a triangle, but only one.
-      flag = flag || failflag;
-      if (!failflag)
+      TesselationFailFlag = mol->TesselStruct->FindNextSuitableTriangle(out, *(baseline->second), *(((baseline->second->triangles.begin()))->second), RADIUS, LCList); //the line is there, so there is a triangle, but only one.
+      OneLoopWithoutSuccessFlag = OneLoopWithoutSuccessFlag || TesselationFailFlag;
+      if (!TesselationFailFlag)
         cerr << "WARNING: FindNextSuitableTriangle failed." << endl;
 
       // write temporary envelope
       if (filename != NULL) {
-        if ((DoSingleStepOutput && ((mol->TesselStruct->TrianglesOnBoundary.size() % SingleStepWidth == 0) || (mol->TesselStruct->TrianglesOnBoundary.size() > 8520 && mol->TesselStruct->TrianglesOnBoundary.size() <= 8530)))) { // if we have a new triangle and want to output each new triangle configuration
+        if ((DoSingleStepOutput && ((mol->TesselStruct->TrianglesOnBoundary.size() % SingleStepWidth == 0)))) { // if we have a new triangle and want to output each new triangle configuration
           mol->TesselStruct->Output(out, filename, mol);
         }
       }
       baseline = mol->TesselStruct->LinesOnBoundary.end();
+      *out << Verbose(2) << "Baseline set to end." << endl;
     } else {
       //cout << Verbose(1) << "Line " << *baseline->second << " has " << baseline->second->triangles.size() << " triangles adjacent" << endl;
@@ -1041 +1018 @@
     }
 
-    N++;
-    if ((baseline == mol->TesselStruct->LinesOnBoundary.end()) && (flag)) {
+    if ((baseline == mol->TesselStruct->LinesOnBoundary.end()) && (OneLoopWithoutSuccessFlag)) {
       baseline = mol->TesselStruct->LinesOnBoundary.begin();   // restart if we reach end due to newly inserted lines
-      baseline++;
-      flag = false;
-    }
-  }
+      OneLoopWithoutSuccessFlag = false;
+    }
+    baseline++;
+  }
+  // check envelope for consistency
+  CheckListOfBaselines(out, mol->TesselStruct);
+
   // look whether all points are inside of the convex envelope, otherwise add them via degenerated triangles
   mol->TesselStruct->InsertStraddlingPoints(out, mol, LCList);
@@ -1067 +1046 @@
   mol->TesselStruct->RemoveDegeneratedTriangles();
 
-  cout << Verbose(2) << "Check: List of Baselines with not two connected triangles:" << endl;
-  int counter = 0;
-  for (testline = mol->TesselStruct->LinesOnBoundary.begin(); testline != mol->TesselStruct->LinesOnBoundary.end(); testline++) {
-    if (testline->second->triangles.size() != 2) {
-      cout << Verbose(2) << *testline->second << "\t" << testline->second->triangles.size() << endl;
-      counter++;
-    }
-  }
-  if (counter == 0)
-    *out << Verbose(2) << "None." << endl;
+  // check envelope for consistency
+  CheckListOfBaselines(out, mol->TesselStruct);
 
   // write final envelope

src/boundary.hpp

@@ -36 +36 @@
 void FindNextSuitablePoint(class BoundaryTriangleSet *BaseTriangle, class BoundaryLineSet *BaseLine, atom*& OptCandidate, Vector *OptCandidateCenter, double *ShortestAngle, const double RADIUS, LinkedCell *LC);
 Boundaries *GetBoundaryPoints(ofstream *out, molecule *mol);
-void CalculateConcavityPerBoundaryPoint(ofstream *out, class Tesselation *TesselStruct);
 void StoreTrianglesinFile(ofstream *out, molecule *mol, const char *filename, const char *extraSuffix);
 bool RemoveAllBoundaryPoints(ofstream *out, class Tesselation *TesselStruct, molecule *mol, char *filename);

src/tesselation.cpp

@@ -215 +215 @@
     node = runner->second->GetThirdEndpoint(this);
     if (node != NULL) {
-      *out << Verbose(3) << "INFO: Third node for triangle " << *(runner->second) << " is " << *node << " at " << *(node->node->node) << "." << endl;
+      //*out << Verbose(3) << "INFO: Third node for triangle " << *(runner->second) << " is " << *node << " at " << *(node->node->node) << "." << endl;
       helper[i].CopyVector(node->node->node);
       helper[i].SubtractVector(&BaseLineCenter);
       helper[i].MakeNormalVector(&BaseLine);  // we want to compare the triangle's heights' angles!
-      *out << Verbose(4) << "INFO: Height vector with respect to baseline is " << helper[i] << "." << endl;
+      //*out << Verbose(4) << "INFO: Height vector with respect to baseline is " << helper[i] << "." << endl;
       i++;
     } else {
@@ -226 +226 @@
     }
   }
-  *out << Verbose(3) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
+  //*out << Verbose(3) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
   if (NormalCheck.NormSquared() < MYEPSILON) {
     *out << Verbose(3) << "ACCEPT: Normalvectors of both triangles are the same: convex." << endl;
@@ -374 +374 @@
  * We call Vector::GetIntersectionWithPlane() to receive the intersection point with the plane
  * This we test if it's really on the plane and whether it's inside the triangle on the plane or not.
- * The latter is done as follows: if it's really outside, then for any endpoint of the triangle and it's opposite
- * base line, the intersection between the line from endpoint to intersection and the base line will have a Vector::NormSquared()
- * smaller than the first line.
+ * The latter is done as follows: We calculate the cross point of one of the triangle's baseline with the line
+ * given by the intersection and the third basepoint. Then, we check whether it's on the baseline (i.e. between
+ * the first two basepoints) or not.
  * \param *out output stream for debugging
  * \param *MolCenter offset vector of line
@@ -408 +408 @@
     exit(255);
   }
-  CrossPoint.SubtractVector(endpoints[i%3]->node->node);
+  CrossPoint.SubtractVector(endpoints[i%3]->node->node);  // cross point was returned as absolute vector
 
   // check whether intersection is inside or not by comparing length of intersection and length of cross point
-  if ((CrossPoint.NormSquared() - helper.NormSquared()) > -MYEPSILON) { // inside
+  if ((CrossPoint.NormSquared() - helper.NormSquared()) < MYEPSILON) { // inside
     return true;
   } else { // outside!
@@ -439 +439 @@
   for(int i=0;i<3;i++)
     if (point == endpoints[i])
+      return true;
+  return false;
+};
+
+/** Checks whether point is any of the three endpoints this triangle contains.
+ * \param *point TesselPoint to test
+ * \return true - point is of the triangle, false - is not
+ */
+bool BoundaryTriangleSet::ContainsBoundaryPoint(class TesselPoint *point)
+{
+  for(int i=0;i<3;i++)
+    if (point == endpoints[i]->node)
       return true;
   return false;
@@ -1088 +1100 @@
   Vector *Center = cloud->GetCenter(out);
   list<BoundaryTriangleSet*> *triangles = NULL;
+  bool AddFlag = false;
+  LinkedCell *BoundaryPoints = NULL;
 
   *out << Verbose(1) << "Begin of InsertStraddlingPoints" << endl;
 
   cloud->GoToFirst();
+  BoundaryPoints = new LinkedCell(this, 5.);
   while (!cloud->IsEnd()) {  // we only have to go once through all points, as boundary can become only bigger
-    LinkedCell BoundaryPoints(this, 5.);
+    if (AddFlag) {
+      delete(BoundaryPoints);
+      BoundaryPoints = new LinkedCell(this, 5.);
+      AddFlag = false;
+    }
     Walker = cloud->GetPoint();
     *out << Verbose(2) << "Current point is " << *Walker << "." << endl;
     // get the next triangle
-    triangles = FindClosestTrianglesToPoint(out, Walker->node, &BoundaryPoints);
-    if (triangles == NULL) {
-      *out << Verbose(1) << "No triangles found, probably a tesselation point itself." << endl;
+    triangles = FindClosestTrianglesToPoint(out, Walker->node, BoundaryPoints);
+    BTS = triangles->front();
+    if ((triangles == NULL) || (BTS->ContainsBoundaryPoint(Walker))) {
+      *out << Verbose(2) << "No triangles found, probably a tesselation point itself." << endl;
       cloud->GoToNext();
       continue;
     } else {
-      BTS = triangles->front();
     }
     *out << Verbose(2) << "Closest triangle is " << *BTS << "." << endl;
@@ -1126 +1145 @@
         // add Walker to boundary points
         *out << Verbose(2) << "Adding " << *Walker << " to BoundaryPoints." << endl;
+        AddFlag = true;
         if (AddBoundaryPoint(Walker,0))
           NewPoint = BPS[0];
@@ -1279 +1299 @@
 };
 
-/** Function tries to add Triangle just created to Triangle and remarks if already existent (Failure of algorithm).
- * Furthermore it adds the triangle to all of its lines, in order to recognize those which are saturated later.
+/** Function adds triangle to global list.
+ * Furthermore, the triangle receives the next free id and id counter \a TrianglesOnBoundaryCount is increased.
  */
 void Tesselation::AddTesselationTriangle()
@@ -1289 +1309 @@
   TrianglesOnBoundary.insert(TrianglePair(TrianglesOnBoundaryCount, BTS));
   TrianglesOnBoundaryCount++;
+
+  // set as last new triangle
+  LastTriangle = BTS;
+
+  // NOTE: add triangle to local maps is done in constructor of BoundaryTriangleSet
+};
+
+/** Function adds triangle to global list.
+ * Furthermore, the triangle number is set to \a nr.
+ * \param nr triangle number
+ */
+void Tesselation::AddTesselationTriangle(int nr)
+{
+  cout << Verbose(1) << "Adding triangle to global TrianglesOnBoundary map." << endl;
+
+  // add triangle to global map
+  TrianglesOnBoundary.insert(TrianglePair(nr, BTS));
 
   // set as last new triangle
@@ -2097 +2134 @@
     BTS = new class BoundaryTriangleSet(BLS, OldTriangleNrs[0]);
     BTS->GetNormalVector(BaseLineNormal);
-    TrianglesOnBoundary.insert(TrianglePair(OldTriangleNrs[0], BTS));
+    AddTesselationTriangle(OldTriangleNrs[0]);
     *out << Verbose(3) << "INFO: Created new triangle " << *BTS << "." << endl;
 
@@ -2105 +2142 @@
     BTS = new class BoundaryTriangleSet(BLS, OldTriangleNrs[1]);
     BTS->GetNormalVector(BaseLineNormal);
-    TrianglesOnBoundary.insert(TrianglePair(OldTriangleNrs[1], BTS));
+    AddTesselationTriangle(OldTriangleNrs[1]);
     *out << Verbose(3) << "INFO: Created new triangle " << *BTS << "." << endl;
   } else {
@@ -2481 +2518 @@
   }
   if (trianglePoints[0]->node->DistanceSquared(x) < MYEPSILON) {
-    *out << Verbose(2) << "Point is right on a tesselation point, no nearest triangle." << endl;
+    *out << Verbose(3) << "Point is right on a tesselation point, no nearest triangle." << endl;
     PointMap::iterator PointRunner = PointsOnBoundary.find(trianglePoints[0]->nr);
     triangles = new list<BoundaryTriangleSet*>;
@@ -2512 +2549 @@
         *out << Verbose(1) << "ERROR: IsInnerPoint encounters serious error, point " << i << " not found." << endl;
       }
-      *out << Verbose(1) << "List of triangle points:" << endl;
-      *out << Verbose(2) << *trianglePoints[i] << endl;
+      //*out << Verbose(2) << "List of triangle points:" << endl;
+      //*out << Verbose(3) << *trianglePoints[i] << endl;
     }
 
     triangles = FindTriangles(trianglePoints);
-    *out << Verbose(1) << "List of possible triangles:" << endl;
+    *out << Verbose(2) << "List of possible triangles:" << endl;
     for(list<BoundaryTriangleSet*>::iterator Runner = triangles->begin(); Runner != triangles->end(); Runner++)
-      *out << Verbose(2) << **Runner << endl;
+      *out << Verbose(3) << **Runner << endl;
 
     delete(connectedClosestPoints);
@@ -3299 +3336 @@
   int count  = 0;
 
+  cout << Verbose(1) << "Begin of RemoveDegeneratedTriangles" << endl;
+
   for (map<int, int>::iterator TriangleKeyRunner = DegeneratedTriangles->begin();
     TriangleKeyRunner != DegeneratedTriangles->end(); ++TriangleKeyRunner
@@ -3370 +3409 @@
 
   cout << Verbose(1) << "RemoveDegeneratedTriangles() removed " << count << " triangles:" << endl;
+  cout << Verbose(1) << "End of RemoveDegeneratedTriangles" << endl;
 }
 

src/tesselation.hpp

@@ -126 +126 @@
     bool ContainsBoundaryLine(class BoundaryLineSet *line);
     bool ContainsBoundaryPoint(class BoundaryPointSet *point);
+    bool ContainsBoundaryPoint(class TesselPoint *point);
     class BoundaryPointSet *GetThirdEndpoint(class BoundaryLineSet *line);
     bool IsPresentTupel(class BoundaryPointSet *Points[3]);
@@ -204 +205 @@
     void AlwaysAddTesselationTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n);
     void AddTesselationTriangle();
+    void AddTesselationTriangle(int nr);
     void RemoveTesselationTriangle(class BoundaryTriangleSet *triangle);
     void RemoveTesselationLine(class BoundaryLineSet *line);

src/tesselationhelpers.cpp

@@ -598 +598 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  cout << Verbose(2) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
+  cout << Verbose(3) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
 
   LC->GetNeighbourBounds(Nlower, Nupper);
@@ -828 +828 @@
   }
 };
+
+/** Calculates the concavity for each of the BoundaryPointSet's in a Tesselation.
+ * Sets BoundaryPointSet::value equal to the number of connected lines that are not convex.
+ * \param *out output stream for debugging
+ * \param *TesselStruct pointer to Tesselation structure
+ */
+void CalculateConcavityPerBoundaryPoint(ofstream *out, class Tesselation *TesselStruct)
+{
+  class BoundaryPointSet *point = NULL;
+  class BoundaryLineSet *line = NULL;
+
+  //*out << Verbose(2) << "Begin of CalculateConcavityPerBoundaryPoint" << endl;
+  // calculate remaining concavity
+  for (PointMap::iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
+    point = PointRunner->second;
+    *out << Verbose(1) << "INFO: Current point is " << *point << "." << endl;
+    point->value = 0;
+    for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
+      line = LineRunner->second;
+      //*out << Verbose(2) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
+      if (!line->CheckConvexityCriterion(out))
+        point->value += 1;
+    }
+  }
+  //*out << Verbose(2) << "End of CalculateConcavityPerBoundaryPoint" << endl;
+};
+
+
+/** Checks whether each BoundaryLineSet in the Tesselation has two triangles.
+ * \param *out output stream for debugging
+ * \param *TesselStruct
+ * \return true - all have exactly two triangles, false - some not, list is printed to screen
+ */
+bool CheckListOfBaselines(ofstream *out, Tesselation *TesselStruct)
+{
+  LineMap::iterator testline;
+  bool result = false;
+  int counter = 0;
+
+  *out << Verbose(1) << "Check: List of Baselines with not two connected triangles:" << endl;
+  for (testline = TesselStruct->LinesOnBoundary.begin(); testline != TesselStruct->LinesOnBoundary.end(); testline++) {
+    if (testline->second->triangles.size() != 2) {
+      *out << Verbose(1) << *testline->second << "\t" << testline->second->triangles.size() << endl;
+      counter++;
+    }
+  }
+  if (counter == 0) {
+    *out << Verbose(1) << "None." << endl;
+    result = true;
+  }
+  return result;
+}
+

src/tesselationhelpers.hpp

@@ -50 +50 @@
 void IncludeSphereinRaster3D(ofstream *out, ofstream *rasterfile, class Tesselation *Tess, PointCloud *cloud);
 void WriteVrmlFile(ofstream *out, ofstream *vrmlfile, class Tesselation *Tess, PointCloud *cloud);
+void CalculateConcavityPerBoundaryPoint(ofstream *out, class Tesselation *TesselStruct);
+
+bool CheckListOfBaselines(ofstream *out, Tesselation *TesselStruct);