Changes in src/tesselationhelpers.cpp [643e76:b32dbb]

File:

• src/tesselationhelpers.cpp (modified) (7 diffs)

src/tesselationhelpers.cpp

@@ -10 +10 @@
 #include "info.hpp"
 #include "linkedcell.hpp"
+#include "linearsystemofequations.hpp"
 #include "log.hpp"
 #include "tesselation.hpp"
 #include "tesselationhelpers.hpp"
 #include "vector.hpp"
-#include "Line.hpp"
 #include "vector_ops.hpp"
 #include "verbose.hpp"
@@ -183 +183 @@
   beta = M_PI - SideC.Angle(SideA);
   gamma = M_PI - SideA.Angle(SideB);
-  //Log() << Verbose(1) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << gamma/M_PI*180. << "." << endl;
+  Log() << Verbose(1) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << gamma/M_PI*180. << "." << endl;
   if (fabs(M_PI - alpha - beta - gamma) > HULLEPSILON) {
     DoeLog(2) && (eLog()<< Verbose(2) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl);
@@ -196 +196 @@
   (*Center) += helper;
   Center->Scale(1./(sin(2.*alpha) + sin(2.*beta) + sin(2.*gamma)));
+  Log() << Verbose(1) << "INFO: Center (1st algo) is at " << *Center << "." << endl;
+
+//  LinearSystemOfEquations LSofEq(NDIM,NDIM);
+//  double *matrix = new double[NDIM*NDIM];
+//  matrix[0] = 0.;
+//  matrix[1] = a.DistanceSquared(b);
+//  matrix[2] = a.DistanceSquared(c);
+//  matrix[3] = a.DistanceSquared(b);
+//  matrix[4] = 0.;
+//  matrix[5] = b.DistanceSquared(c);
+//  matrix[6] = a.DistanceSquared(c);
+//  matrix[7] = b.DistanceSquared(c);
+//  matrix[8] = 0.;
+//  cout << "Matrix is: ";
+//  for (int i=0;i<NDIM*NDIM;i++)
+//    cout << matrix[i] << "\t";
+//  cout << endl;
+//  LSofEq.SetA(matrix);
+//  delete[](matrix);
+//  LSofEq.Setb(new Vector(1.,1.,1.));
+//  LSofEq.SetSymmetric(true);
+//  helper.Zero();
+//  if (!LSofEq.GetSolutionAsVector(helper)) {
+//    DoLog(0) && (eLog()<< Verbose(0) << "Could not solve the linear system in GetCenterofCircumCircle()!" << endl);
+//  }
+//  cout << "Solution is " << helper << endl;
+  // is equivalent to the three lines below
+  helper[0] = SideA.NormSquared()*(SideB.NormSquared()+SideC.NormSquared() - SideA.NormSquared());
+  helper[1] = SideB.NormSquared()*(SideC.NormSquared()+SideA.NormSquared() - SideB.NormSquared());
+  helper[2] = SideC.NormSquared()*(SideA.NormSquared()+SideB.NormSquared() - SideC.NormSquared());
+
+  Center->Zero();
+  *Center += helper[0] * a;
+  *Center += helper[1] * b;
+  *Center += helper[2] * c;
+  Center->Scale(1./(helper[0]+helper[1]+helper[2]));
+  Log() << Verbose(1) << "INFO: Center (2nd algo) is at " << *Center << "." << endl;
 };
 
@@ -417 +454 @@
 /** Calculates the volume of a general tetraeder.
  * \param *a first vector
- * \param *a first vector
- * \param *a first vector
- * \param *a first vector
+ * \param *b second vector
+ * \param *c third vector
+ * \param *d fourth vector
  * \return \f$ \frac{1}{6} \cdot ((a-d) \times (a-c) \cdot  (a-b)) \f$
  */
@@ -437 +474 @@
   volume = 1./6. * fabs(Point.ScalarProduct(TetraederVector[2]));
   return volume;
+};
+
+/** Calculates the area of a general triangle.
+ * We use the Heron's formula of area, [Bronstein, S. 138]
+ * \param &A first vector
+ * \param &B second vector
+ * \param &C third vector
+ * \return \f$ \frac{1}{6} \cdot ((a-d) \times (a-c) \cdot  (a-b)) \f$
+ */
+double CalculateAreaofGeneralTriangle(const Vector &A, const Vector &B, const Vector &C)
+{
+  Info FunctionInfo(__func__);
+
+  const double sidea = B.distance(C);
+  const double sideb = A.distance(C);
+  const double sidec = A.distance(B);
+  const double s = (sidea+sideb+sidec)/2.;
+
+  const double area = sqrt(s*(s-sidea)*(s-sideb)*(s-sidec));
+  return area;
 };
 
@@ -667 +724 @@
   // calculate the intersection between this projected baseline and Base
   Vector *Intersection = new Vector;
-  Line line1 = makeLineThrough(*(Base->endpoints[0]->node->node),*(Base->endpoints[1]->node->node));
-  Line line2 = makeLineThrough(NewOffset, NewDirection);
-  *Intersection = line1.getIntersection(line2);
+  *Intersection = GetIntersectionOfTwoLinesOnPlane(*(Base->endpoints[0]->node->node),
+                                                   *(Base->endpoints[1]->node->node),
+                                                     NewOffset, NewDirection);
   Normal = (*Intersection) - (*Base->endpoints[0]->node->node);
   DoLog(1) && (Log() << Verbose(1) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(Baseline)/Baseline.NormSquared()) << "." << endl);
@@ -871 +928 @@
   class BoundaryPointSet *point = NULL;
   class BoundaryLineSet *line = NULL;
-
-  // calculate remaining concavity
+  class BoundaryTriangleSet *triangle = NULL;
+  double ConcavityPerLine = 0.;
+  double ConcavityPerTriangle = 0.;
+  double area = 0.;
+  double totalarea = 0.;
+
   for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
     point = PointRunner->second;
     DoLog(1) && (Log() << Verbose(1) << "INFO: Current point is " << *point << "." << endl);
-    point->value = 0;
+
+    // calculate mean concavity over all connected line
+    ConcavityPerLine = 0.;
     for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
       line = LineRunner->second;
       //Log() << Verbose(1) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
-      if (!line->CheckConvexityCriterion())
-        point->value += 1;
-    }
-  }
-};
-
+      ConcavityPerLine -= line->CalculateConvexity();
+    }
+    ConcavityPerLine /= point->lines.size();
+
+    // weigh with total area of the surrounding triangles
+    totalarea  = 0.;
+    TriangleSet *triangles = TesselStruct->GetAllTriangles(PointRunner->second);
+    for (TriangleSet::iterator TriangleRunner = triangles->begin(); TriangleRunner != triangles->end(); ++TriangleRunner) {
+      totalarea += CalculateAreaofGeneralTriangle(*(*TriangleRunner)->endpoints[0]->node->node, *(*TriangleRunner)->endpoints[1]->node->node, *(*TriangleRunner)->endpoints[2]->node->node);
+    }
+    ConcavityPerLine *= totalarea;
+
+    // calculate mean concavity over all attached triangles
+    ConcavityPerTriangle = 0.;
+    for (TriangleSet::const_iterator TriangleRunner = triangles->begin(); TriangleRunner != triangles->end(); ++TriangleRunner) {
+      line = (*TriangleRunner)->GetThirdLine(PointRunner->second);
+      triangle = line->GetOtherTriangle(*TriangleRunner);
+      area = CalculateAreaofGeneralTriangle(*triangle->endpoints[0]->node->node, *triangle->endpoints[1]->node->node, *triangle->endpoints[2]->node->node);
+      area += CalculateAreaofGeneralTriangle(*(*TriangleRunner)->endpoints[0]->node->node, *(*TriangleRunner)->endpoints[1]->node->node, *(*TriangleRunner)->endpoints[2]->node->node);
+      area *= -line->CalculateConvexity();
+      if (area > 0)
+        ConcavityPerTriangle += area;
+//      else
+//        ConcavityPerTriangle -= area;
+    }
+    ConcavityPerTriangle /= triangles->size()/totalarea;
+    delete(triangles);
+
+    // add up
+    point->value = ConcavityPerLine + ConcavityPerTriangle;
+  }
+};
+
+
+
+/** Calculates the concavity for each of the BoundaryPointSet's in a Tesselation.
+ * Sets BoundaryPointSet::value equal to the nearest distance to convex envelope.
+ * \param *out output stream for debugging
+ * \param *TesselStruct pointer to Tesselation structure
+ * \param *Convex pointer to convex Tesselation structure as reference
+ */
+void CalculateConstrictionPerBoundaryPoint(const Tesselation * const TesselStruct, const Tesselation * const Convex)
+{
+  Info FunctionInfo(__func__);
+  double distance = 0.;
+
+  for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
+    DoeLog(1) && (eLog() << Verbose(1) << "INFO: Current point is " << * PointRunner->second << "." << endl);
+
+    distance = 0.;
+    for (TriangleMap::const_iterator TriangleRunner = Convex->TrianglesOnBoundary.begin(); TriangleRunner != Convex->TrianglesOnBoundary.end(); TriangleRunner++) {
+      const double CurrentDistance = Convex->GetDistanceSquaredToTriangle(*PointRunner->second->node->node, TriangleRunner->second);
+      if (CurrentDistance < distance)
+        distance = CurrentDistance;
+    }
+
+    PointRunner->second->value = distance;
+  }
+};
 
 /** Checks whether each BoundaryLineSet in the Tesselation has two triangles.