Changeset 34e0592

Timestamp:

Aug 20, 2009, 7:48:07 AM (15 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:

78b73c, 9ba9ee

Parents:

1d9b7aa (diff), 7c14ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Frederik Heber <heber@…> (08/19/09 14:40:33)

git-committer:

Frederik Heber <heber@…> (08/20/09 07:48:07)

Message:

Merge branch 'ConcaveHull' of ​ssh://stud64d-02/home/metzler/workspace/espack into Ticket14

Conflicts:

molecuilder/src/boundary.cpp
molecuilder/src/tesselation.cpp

• in boundary.cpp: FindConvexBorder() - overlay due to PickFarthestofTwoBaselines()
• in tesselation.cpp: CheckConvexityCriterion() - overlay due to verbosity change on return, getAngle() -> GetAngle()

Location:

src

Files:

• boundary.cpp (modified) (23 diffs)
• boundary.hpp (modified) (1 diff)
• builder.cpp (modified) (12 diffs)
• config.hpp (modified) (1 diff)
• molecules.hpp (modified) (1 diff)
• tesselation.cpp (modified) (42 diffs)
• tesselation.hpp (modified) (4 diffs)
• tesselationhelpers.cpp (modified) (11 diffs)
• tesselationhelpers.hpp (modified) (2 diffs)

src/boundary.cpp

@@ -118 +118 @@
  * \param *mol molecule structure with atom positions
  */
-void write_vrml_file(ofstream *out, ofstream *vrmlfile, class Tesselation *Tess, class molecule *mol)
+void WriteVrmlFile(ofstream *out, ofstream *vrmlfile, class Tesselation *Tess, class molecule *mol)
 {
   atom *Walker = mol->start;
@@ -172 +172 @@
  * \param *mol molecule structure with atom positions
  */
-void write_raster3d_file(ofstream *out, ofstream *rasterfile, class Tesselation *Tess, class molecule *mol)
+void WriteRaster3dFile(ofstream *out, ofstream *rasterfile, class Tesselation *Tess, class molecule *mol)
 {
   atom *Walker = mol->start;
@@ -227 +227 @@
  * \param N arbitrary number to differentiate various zones in the tecplot format
  */
-void write_tecplot_file(ofstream *out, ofstream *tecplot, class Tesselation *TesselStruct, class molecule *mol, int N)
+void WriteTecplotFile(ofstream *out, ofstream *tecplot, class Tesselation *TesselStruct, class molecule *mol, int N)
 {
   if ((tecplot != NULL) && (TesselStruct != NULL)) {
@@ -440 +440 @@
  * \return *TesselStruct is filled with convex boundary and tesselation is stored under \a *filename.
  */
-void Find_convex_border(ofstream *out, molecule* mol, class LinkedCell *LCList, const char *filename)
+void FindConvexBorder(ofstream *out, molecule* mol, class LinkedCell *LCList, const char *filename)
 {
   bool BoundaryFreeFlag = false;
   Boundaries *BoundaryPoints = NULL;
 
-  cout << Verbose(1) << "Begin of find_convex_border" << endl;
+  cout << Verbose(1) << "Begin of FindConvexBorder" << endl;
 
   if (mol->TesselStruct != NULL) // free if allocated
@@ -509 +509 @@
       OutputName.append(TecplotSuffix);
       ofstream *tecplot = new ofstream(OutputName.c_str());
-      write_tecplot_file(out, tecplot, mol->TesselStruct, mol, 0);
+      WriteTecplotFile(out, tecplot, mol->TesselStruct, mol, 0);
       tecplot->close();
       delete(tecplot);
@@ -518 +518 @@
       OutputName.append(Raster3DSuffix);
       ofstream *rasterplot = new ofstream(OutputName.c_str());
-      write_raster3d_file(out, rasterplot, mol->TesselStruct, mol);
+      WriteRaster3dFile(out, rasterplot, mol->TesselStruct, mol);
       rasterplot->close();
       delete(rasterplot);
@@ -556 +556 @@
       OutputName.append(TecplotSuffix);
       ofstream *tecplot = new ofstream(OutputName.c_str());
-      write_tecplot_file(out, tecplot, mol->TesselStruct, mol, 0);
+      WriteTecplotFile(out, tecplot, mol->TesselStruct, mol, 0);
       tecplot->close();
       delete(tecplot);
@@ -564 +564 @@
       OutputName.append(Raster3DSuffix);
       ofstream *rasterplot = new ofstream(OutputName.c_str());
-      write_raster3d_file(out, rasterplot, mol->TesselStruct, mol);
+      WriteRaster3dFile(out, rasterplot, mol->TesselStruct, mol);
       rasterplot->close();
       delete(rasterplot);
@@ -575 +575 @@
     delete[] (BoundaryPoints);
 
-  cout << Verbose(1) << "End of find_convex_border" << endl;
+  cout << Verbose(1) << "End of FindConvexBorder" << endl;
 };
 
@@ -732 +732 @@
       OutputName.append(TecplotSuffix);
       ofstream *tecplot = new ofstream(OutputName.c_str());
-      write_tecplot_file(out, tecplot, mol->TesselStruct, mol, 0);
+      WriteTecplotFile(out, tecplot, mol->TesselStruct, mol, 0);
       tecplot->close();
       delete(tecplot);
@@ -741 +741 @@
       OutputName.append(Raster3DSuffix);
       ofstream *rasterplot = new ofstream(OutputName.c_str());
-      write_raster3d_file(out, rasterplot, mol->TesselStruct, mol);
+      WriteRaster3dFile(out, rasterplot, mol->TesselStruct, mol);
       rasterplot->close();
       delete(rasterplot);
@@ -816 +816 @@
   class Tesselation *TesselStruct = NULL;
   LinkedCell LCList(mol, 10.);
-  Find_convex_border(out, mol, &LCList, NULL);
+  FindConvexBorder(out, mol, &LCList, NULL);
   double clustervolume;
   if (ClusterVolume == 0)
@@ -957 +957 @@
     if ((*ListRunner)->TesselStruct == NULL) {
       *out << Verbose(1) << "Pre-creating tesselation for molecule " << *ListRunner << "." << endl;
-      Find_non_convex_border((ofstream *)&cout, (*ListRunner), LCList[i], NULL, 5.);
+      FindNonConvexBorder((ofstream *)&cout, (*ListRunner), LCList[i], NULL, 5.);
     }
     i++;
@@ -1082 +1082 @@
  * \para RADIUS radius of the virtual sphere
  */
-void Find_non_convex_border(ofstream *out, molecule* mol, class LinkedCell *LCList, const char *filename, const double RADIUS)
+void FindNonConvexBorder(ofstream *out, molecule* mol, class LinkedCell *LCList, const char *filename, const double RADIUS)
 {
   int N = 0;
@@ -1101 +1101 @@
   LineMap::iterator baseline;
   LineMap::iterator testline;
-  *out << Verbose(0) << "Begin of Find_non_convex_border\n";
+  *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;
@@ -1110 +1110 @@
   }
 
-  mol->TesselStruct->Find_starting_triangle(out, RADIUS, LCList);
+  mol->TesselStruct->FindStartingTriangle(out, RADIUS, LCList);
 
   baseline = mol->TesselStruct->LinesOnBoundary.begin();
@@ -1119 +1119 @@
   while ((baseline != mol->TesselStruct->LinesOnBoundary.end()) || (flag)) {
     if (baseline->second->triangles.size() == 1) {
-      failflag = mol->TesselStruct->Find_next_suitable_triangle(out, *(baseline->second), *(((baseline->second->triangles.begin()))->second), RADIUS, N, LCList); //the line is there, so there is a triangle, but only one.
+      failflag = mol->TesselStruct->FindNextSuitableTriangle(out, *(baseline->second), *(((baseline->second->triangles.begin()))->second), RADIUS, N, LCList); //the line is there, so there is a triangle, but only one.
       flag = flag || failflag;
       if (!failflag)
-        cerr << "WARNING: Find_next_suitable_triangle failed." << endl;
+        cerr << "WARNING: FindNextSuitableTriangle failed." << endl;
       // write temporary envelope
       if ((DoSingleStepOutput && (mol->TesselStruct->TrianglesOnBoundaryCount % SingleStepWidth == 0))) { // if we have a new triangle and want to output each new triangle configuration
@@ -1138 +1138 @@
             *out << Verbose(1) << "Writing temporary non convex hull to file " << NameofTempFile << ".\n";
             tempstream = new ofstream(NameofTempFile.c_str(), ios::trunc);
-            write_tecplot_file(out, tempstream, mol->TesselStruct, mol, TriangleFilesWritten);
+            WriteTecplotFile(out, tempstream, mol->TesselStruct, mol, TriangleFilesWritten);
             tempstream->close();
             tempstream->flush();
@@ -1152 +1152 @@
             *out << Verbose(1) << "Writing temporary non convex hull to file " << NameofTempFile << ".\n";
             tempstream = new ofstream(NameofTempFile.c_str(), ios::trunc);
-            write_raster3d_file(out, tempstream, mol->TesselStruct, mol);
+            WriteRaster3dFile(out, tempstream, mol->TesselStruct, mol);
     //        // include the current position of the virtual sphere in the temporary raster3d file
     //        // make the circumsphere's center absolute again
@@ -1191 +1191 @@
   }
 
+  // Purges surplus triangles.
+  mol->TesselStruct->RemoveDegeneratedTriangles();
+
   // write final envelope
   if (filename != 0) {
@@ -1198 +1201 @@
       OutputName.append(TecplotSuffix);
       ofstream *tecplot = new ofstream(OutputName.c_str());
-      write_tecplot_file(out, tecplot, mol->TesselStruct, mol, -1);
+      WriteTecplotFile(out, tecplot, mol->TesselStruct, mol, -1);
       tecplot->close();
       delete(tecplot);
@@ -1206 +1209 @@
       OutputName.append(Raster3DSuffix);
       ofstream *raster = new ofstream(OutputName.c_str());
-      write_raster3d_file(out, raster, mol->TesselStruct, mol);
+      WriteRaster3dFile(out, raster, mol->TesselStruct, mol);
       raster->close();
       delete(raster);
@@ -1257 +1260 @@
 //    << "for atom " << a << " (inside)." << endl;
 
-
   if (freeLC)
     delete(LCList);
-  *out << Verbose(0) << "End of Find_non_convex_border\n";
+  *out << Verbose(0) << "End of FindNonConvexBorder\n";
 };
 

src/boundary.hpp

@@ -37 +37 @@
 void PrepareClustersinWater(ofstream *out, config *configuration, molecule *mol, double ClusterVolume, double celldensity);
 molecule * FillBoxWithMolecule(ofstream *out, MoleculeListClass *List, molecule *filler, config &configuration, double distance[NDIM], double RandAtomDisplacement, double RandMolDisplacement, bool DoRandomRotation);
-void Find_convex_border(ofstream *out, molecule* mol, class LinkedCell *LCList, const char *filename);
-void Find_non_convex_border(ofstream *out, molecule* mol, class LinkedCell *LC, const char *tempbasename, const double RADIUS);
+void FindConvexBorder(ofstream *out, molecule* mol, class LinkedCell *LCList, const char *filename);
+void FindNonConvexBorder(ofstream *out, molecule* mol, class LinkedCell *LC, const char *tempbasename, const double RADIUS);
 double ConvexizeNonconvexEnvelope(ofstream *out, class Tesselation *TesselStruct, molecule *mol, char *filename);
-void Find_next_suitable_point(class BoundaryTriangleSet *BaseTriangle, class BoundaryLineSet *BaseLine, atom*& OptCandidate, Vector *OptCandidateCenter, double *ShortestAngle, const double RADIUS, LinkedCell *LC);
+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);

src/builder.cpp

@@ -584 +584 @@
         LinkedCell LCList(mol, 10.);
         class Tesselation *TesselStruct = NULL;
-        Find_convex_border((ofstream *)&cout, mol, &LCList, NULL);
+        FindConvexBorder((ofstream *)&cout, mol, &LCList, NULL);
         double clustervolume = VolumeOfConvexEnvelope((ofstream *)&cout, TesselStruct, configuration);
         cout << Verbose(0) << "The tesselated surface area is " << clustervolume << "." << endl;
@@ -644 +644 @@
   Vector x,y,z,n; // coordinates for absolute point in cell volume
   double *factor; // unit factor if desired
-  double bond, min_bond;
+  double bond, minBond;
   char choice;  // menu choice char
   bool valid;
@@ -683 +683 @@
         first = mol->AskAtom("Enter first (fixed) atom: ");
         second = mol->AskAtom("Enter second (shifting) atom: ");
-        min_bond = 0.;
+        minBond = 0.;
         for (int i=NDIM;i--;)
-          min_bond += (first->x.x[i]-second->x.x[i])*(first->x.x[i] - second->x.x[i]);
-        min_bond = sqrt(min_bond);
-        cout << Verbose(0) << "Current Bond length between " << first->type->name << " Atom " << first->nr << " and " << second->type->name << " Atom " << second->nr << ": " << min_bond << " a.u." << endl;
+          minBond += (first->x.x[i]-second->x.x[i])*(first->x.x[i] - second->x.x[i]);
+        minBond = sqrt(minBond);
+        cout << Verbose(0) << "Current Bond length between " << first->type->name << " Atom " << first->nr << " and " << second->type->name << " Atom " << second->nr << ": " << minBond << " a.u." << endl;
         cout << Verbose(0) << "Enter new bond length [a.u.]: ";
         cin >> bond;
         for (int i=NDIM;i--;) {
-          second->x.x[i] -= (second->x.x[i]-first->x.x[i])/min_bond*(min_bond-bond);
+          second->x.x[i] -= (second->x.x[i]-first->x.x[i])/minBond*(minBond-bond);
         }
         //cout << Verbose(0) << "New coordinates of Atom " << second->nr << " are: ";
@@ -1325 +1325 @@
   int j;
   double volume = 0.;
-  enum ConfigStatus config_present = absent;
+  enum ConfigStatus configPresent = absent;
   clock_t start,end;
   int argptr;
@@ -1425 +1425 @@
         if (output == NULL) {
           cout << Verbose(1) << "Specified config file " << argv[1] << " not found." << endl;
-          config_present = absent;
+          configPresent = absent;
         } else {
           cout << "Empty configuration file." << endl;
           ConfigFileName = argv[1];
-          config_present = empty;
+          configPresent = empty;
           output.close();
         }
@@ -1440 +1440 @@
             cout << "new syntax." << endl;
             configuration.Load(ConfigFileName, periode, mol);
-            config_present = present;
+            configPresent = present;
             break;
           case 0:
             cout << "old syntax." << endl;
             configuration.LoadOld(ConfigFileName, periode, mol);
-            config_present = present;
+            configPresent = present;
             break;
           default:
             cout << "Unknown syntax or empty, yet present file." << endl;
-            config_present = empty;
+            configPresent = empty;
        }
       }
     } else
-      config_present = absent;
+      configPresent = absent;
     // 4. parse again through options, now for those depending on elements db and config presence
     argptr = 1;
@@ -1460 +1460 @@
       if (argv[argptr][0] == '-') {
         argptr++;
-        if ((config_present == present) || (config_present == empty)) {
+        if ((configPresent == present) || (configPresent == empty)) {
           switch(argv[argptr-1][1]) {
             case 'p':
@@ -1474 +1474 @@
                 else {
                   cout << Verbose(2) << "File found and parsed." << endl;
-                  config_present = present;
+                  configPresent = present;
                 }
               }
@@ -1494 +1494 @@
                 if (first->type != NULL) {
                   mol->AddAtom(first);  // add to molecule
-                  if ((config_present == empty) && (mol->AtomCount != 0))
-                    config_present = present;
+                  if ((configPresent == empty) && (mol->AtomCount != 0))
+                    configPresent = present;
                 } else
                   cerr << Verbose(1) << "Could not find the specified element." << endl;
@@ -1505 +1505 @@
           }
         }
-        if (config_present == present) {
+        if (configPresent == present) {
           switch(argv[argptr-1][1]) {
             case 'M':
@@ -1627 +1627 @@
                 start = clock();
                 LinkedCell LCList(mol, atof(argv[argptr])*2.);
-                Find_non_convex_border((ofstream *)&cout, mol, &LCList, argv[argptr+1], atof(argv[argptr]));
+                FindNonConvexBorder((ofstream *)&cout, mol, &LCList, argv[argptr+1], atof(argv[argptr]));
                 //FindDistributionOfEllipsoids((ofstream *)&cout, &T, &LCList, N, number, filename.c_str());
                 end = clock();
@@ -1871 +1871 @@
                 cout << Verbose(1) << "Storing tecplot data in " << argv[argptr] << "." << endl;
                 LinkedCell LCList(mol, 10.);
-                //Find_convex_border((ofstream *)&cout, mol, &LCList, argv[argptr]);
-                Find_non_convex_border((ofstream *)&cout, mol, &LCList, argv[argptr], 10.);
+                //FindConvexBorder((ofstream *)&cout, mol, &LCList, argv[argptr]);
+                FindNonConvexBorder((ofstream *)&cout, mol, &LCList, argv[argptr], 10.);
 
                 double volumedifference = ConvexizeNonconvexEnvelope((ofstream *)&cout, mol->TesselStruct, mol, argv[argptr]);

src/config.hpp

@@ -18 +18 @@
 #include "molecules.hpp"
 #include "periodentafel.hpp"
+
+class ConfigFileBuffer {
+  public:
+    char **buffer;
+    int *LineMapping;
+    int CurrentLine;
+    int NoLines;
+
+    ConfigFileBuffer();
+    ConfigFileBuffer(char *filename);
+    ~ConfigFileBuffer();
+
+    void InitMapping();
+    void MapIonTypesInBuffer(int NoAtoms);
+};
 
 /** The config file.

src/molecules.hpp

@@ -303 +303 @@
 };
 
-class ConfigFileBuffer {
-  public:
-    char **buffer;
-    int *LineMapping;
-    int CurrentLine;
-    int NoLines;
-
-    ConfigFileBuffer();
-    ConfigFileBuffer(char *filename);
-    ~ConfigFileBuffer();
-
-    void InitMapping();
-    void MapIonTypesInBuffer(int NoAtoms);
-};
-
 
 #endif /*MOLECULES_HPP_*/

src/tesselation.cpp

@@ -219 +219 @@
     return true;
   }
-  double angle = getAngle(helper[0], helper[1], BaseLineNormal);
+  double angle = GetAngle(helper[0], helper[1], BaseLineNormal);
   if ((angle - M_PI) > -MYEPSILON) {
     *out << Verbose(2) << "ACCEPT: Angle is greater than pi: convex." << endl;
@@ -1402 +1402 @@
 
 
-/** Finds the starting triangle for find_non_convex_border().
- * Looks at the outermost point per axis, then Find_second_point_for_Tesselation()
- * for the second and Find_next_suitable_point_via_Angle_of_Sphere() for the third
+/** Finds the starting triangle for FindNonConvexBorder().
+ * Looks at the outermost point per axis, then FindSecondPointForTesselation()
+ * for the second and FindNextSuitablePointViaAngleOfSphere() for the third
  * point are called.
  * \param *out output stream for debugging
@@ -1410 +1410 @@
  * \param *LC LinkedCell structure with neighbouring TesselPoint's
  */
-void Tesselation::Find_starting_triangle(ofstream *out, const double RADIUS, LinkedCell *LC)
-{
-  cout << Verbose(1) << "Begin of Find_starting_triangle\n";
+void Tesselation::FindStartingTriangle(ofstream *out, const double RADIUS, LinkedCell *LC)
+{
+  cout << Verbose(1) << "Begin of FindStartingTriangle\n";
   int i = 0;
   LinkedNodes *List = NULL;
@@ -1418 +1418 @@
   TesselPoint* SecondPoint = NULL;
   TesselPoint* MaxPoint[NDIM];
-  double max_coordinate[NDIM];
+  double maxCoordinate[NDIM];
   Vector Oben;
   Vector helper;
@@ -1428 +1428 @@
   for (i = 0; i < 3; i++) {
     MaxPoint[i] = NULL;
-    max_coordinate[i] = -1;
+    maxCoordinate[i] = -1;
   }
 
@@ -1440 +1440 @@
         if (List != NULL) {
           for (LinkedNodes::iterator Runner = List->begin();Runner != List->end();Runner++) {
-            if ((*Runner)->node->x[i] > max_coordinate[i]) {
+            if ((*Runner)->node->x[i] > maxCoordinate[i]) {
               cout << Verbose(2) << "New maximal for axis " << i << " node is " << *(*Runner) << " at " << *(*Runner)->node << "." << endl;
-              max_coordinate[i] = (*Runner)->node->x[i];
+              maxCoordinate[i] = (*Runner)->node->x[i];
               MaxPoint[i] = (*Runner);
             }
@@ -1458 +1458 @@
 
   BTS = NULL;
-  CandidateList *Opt_Candidates = new CandidateList();
+  CandidateList *OptCandidates = new CandidateList();
   for (int k=0;k<NDIM;k++) {
     Oben.x[k] = 1.;
@@ -1465 +1465 @@
 
     double ShortestAngle;
-    TesselPoint* Opt_Candidate = NULL;
+    TesselPoint* OptCandidate = NULL;
     ShortestAngle = 999999.; // This will contain the angle, which will be always positive (when looking for second point), when looking for third point this will be the quadrant.
 
-    Find_second_point_for_Tesselation(FirstPoint, NULL, Oben, Opt_Candidate, &ShortestAngle, RADIUS, LC); // we give same point as next candidate as its bonds are looked into in find_second_...
-    SecondPoint = Opt_Candidate;
+    FindSecondPointForTesselation(FirstPoint, NULL, Oben, OptCandidate, &ShortestAngle, RADIUS, LC); // we give same point as next candidate as its bonds are looked into in find_second_...
+    SecondPoint = OptCandidate;
     if (SecondPoint == NULL)  // have we found a second point?
       continue;
@@ -1500 +1500 @@
 
     //cout << Verbose(2) << "INFO: OldSphereCenter is at " << helper << ".\n";
-    Find_third_point_for_Tesselation(
-      Oben, SearchDirection, helper, BLS[0], NULL, *&Opt_Candidates, &ShortestAngle, RADIUS, LC
+    FindThirdPointForTesselation(
+      Oben, SearchDirection, helper, BLS[0], NULL, *&OptCandidates, &ShortestAngle, RADIUS, LC
     );
     cout << Verbose(1) << "List of third Points is ";
-    for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+    for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
         cout << " " << *(*it)->point;
     }
     cout << endl;
 
-    for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+    for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
       // add third triangle point
       AddTesselationPoint((*it)->point, 2);
@@ -1526 +1526 @@
 
       // if we do not reach the end with the next step of iteration, we need to setup a new first line
-      if (it != Opt_Candidates->end()--) {
+      if (it != OptCandidates->end()--) {
         FirstPoint = (*it)->BaseLine->endpoints[0]->node;
         SecondPoint = (*it)->point;
@@ -1541 +1541 @@
       // remove all candidates from the list and then the list itself
       class CandidateForTesselation *remover = NULL;
-      for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+      for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
         remover = *it;
         delete(remover);
       }
-      Opt_Candidates->clear();
+      OptCandidates->clear();
     }
   }
@@ -1551 +1551 @@
   // remove all candidates from the list and then the list itself
   class CandidateForTesselation *remover = NULL;
-  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
     remover = *it;
     delete(remover);
   }
-  delete(Opt_Candidates);
-  cout << Verbose(1) << "End of Find_starting_triangle\n";
+  delete(OptCandidates);
+  cout << Verbose(1) << "End of FindStartingTriangle\n";
 };
 
@@ -1568 +1568 @@
  * @param *LC LinkedCell structure with neighbouring points
  */
-bool Tesselation::Find_next_suitable_triangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, LinkedCell *LC)
-{
-  cout << Verbose(0) << "Begin of Find_next_suitable_triangle\n";
+bool Tesselation::FindNextSuitableTriangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, LinkedCell *LC)
+{
+  cout << Verbose(0) << "Begin of FindNextSuitableTriangle\n";
   bool result = true;
-  CandidateList *Opt_Candidates = new CandidateList();
+  CandidateList *OptCandidates = new CandidateList();
 
   Vector CircleCenter;
@@ -1629 +1629 @@
 
     // add third point
-    Find_third_point_for_Tesselation(
-      T.NormalVector, SearchDirection, OldSphereCenter, &Line, ThirdNode, Opt_Candidates,
+    FindThirdPointForTesselation(
+      T.NormalVector, SearchDirection, OldSphereCenter, &Line, ThirdNode, OptCandidates,
       &ShortestAngle, RADIUS, LC
     );
@@ -1638 +1638 @@
   }
 
-  if (Opt_Candidates->begin() == Opt_Candidates->end()) {
+  if (OptCandidates->begin() == OptCandidates->end()) {
     cerr << "WARNING: Could not find a suitable candidate." << endl;
     return false;
   }
   cout << Verbose(1) << "Third Points are ";
-  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
     cout << " " << *(*it)->point;
   }
@@ -1649 +1649 @@
 
   BoundaryLineSet *BaseRay = &Line;
-  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
     cout << Verbose(1) << " Third point candidate is " << *(*it)->point
     << " with circumsphere's center at " << (*it)->OptCenter << "." << endl;
@@ -1668 +1668 @@
       AddTesselationPoint(BaseRay->endpoints[1]->node, 2);
 
-      if (CheckLineCriteriaforDegeneratedTriangle(TPS)) {
+      if (CheckLineCriteriaForDegeneratedTriangle(TPS)) {
         AddTesselationLine(TPS[0], TPS[1], 0);
         AddTesselationLine(TPS[0], TPS[2], 1);
@@ -1697 +1697 @@
         // We demand that at most one new degenerate line is created and that this line also already exists (which has to be the case due to existentTrianglesCount == 1)
         // i.e. at least one of the three lines must be present with TriangleCount <= 1
-        if (CheckLineCriteriaforDegeneratedTriangle(TPS)) {
+        if (CheckLineCriteriaForDegeneratedTriangle(TPS)) {
           AddTesselationLine(TPS[0], TPS[1], 0);
           AddTesselationLine(TPS[0], TPS[2], 1);
@@ -1735 +1735 @@
   // remove all candidates from the list and then the list itself
   class CandidateForTesselation *remover = NULL;
-  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
     remover = *it;
     delete(remover);
   }
-  delete(Opt_Candidates);
-  cout << Verbose(0) << "End of Find_next_suitable_triangle\n";
+  delete(OptCandidates);
+  cout << Verbose(0) << "End of FindNextSuitableTriangle\n";
   return result;
 };
@@ -2047 +2047 @@
  * \param *Candidate pointer to candidate node on return
  * \param Oben vector indicating the outside
- * \param Opt_Candidate reference to recommended candidate on return
+ * \param OptCandidate reference to recommended candidate on return
  * \param Storage[3] array storing angles and other candidate information
  * \param RADIUS radius of virtual sphere
  * \param *LC LinkedCell structure with neighbouring points
  */
-void Tesselation::Find_second_point_for_Tesselation(TesselPoint* a, TesselPoint* Candidate, Vector Oben, TesselPoint*& Opt_Candidate, double Storage[3], double RADIUS, LinkedCell *LC)
-{
-  cout << Verbose(2) << "Begin of Find_second_point_for_Tesselation" << endl;
+void Tesselation::FindSecondPointForTesselation(TesselPoint* a, TesselPoint* Candidate, Vector Oben, TesselPoint*& OptCandidate, double Storage[3], double RADIUS, LinkedCell *LC)
+{
+  cout << Verbose(2) << "Begin of FindSecondPointForTesselation" << endl;
   Vector AngleCheck;
   double norm = -1., angle;
@@ -2092 +2092 @@
             if (a != Candidate) {
               // Calculate center of the circle with radius RADIUS through points a and Candidate
-              Vector OrthogonalizedOben, a_Candidate, Center;
+              Vector OrthogonalizedOben, aCandidate, Center;
               double distance, scaleFactor;
 
               OrthogonalizedOben.CopyVector(&Oben);
-              a_Candidate.CopyVector(a->node);
-              a_Candidate.SubtractVector(Candidate->node);
-              OrthogonalizedOben.ProjectOntoPlane(&a_Candidate);
+              aCandidate.CopyVector(a->node);
+              aCandidate.SubtractVector(Candidate->node);
+              OrthogonalizedOben.ProjectOntoPlane(&aCandidate);
               OrthogonalizedOben.Normalize();
-              distance = 0.5 * a_Candidate.Norm();
+              distance = 0.5 * aCandidate.Norm();
               scaleFactor = sqrt(((RADIUS * RADIUS) - (distance * distance)));
               OrthogonalizedOben.Scale(scaleFactor);
@@ -2111 +2111 @@
               AngleCheck.CopyVector(&Center);
               AngleCheck.SubtractVector(a->node);
-              norm = a_Candidate.Norm();
+              norm = aCandidate.Norm();
               // second point shall have smallest angle with respect to Oben vector
               if (norm < RADIUS*2.) {
@@ -2118 +2118 @@
                   //cout << Verbose(3) << "Old values of Storage: %lf %lf \n", Storage[0], Storage[1]);
                   cout << Verbose(3) << "Current candidate is " << *Candidate << ": Is a better candidate with distance " << norm << " and angle " << angle << " to oben " << Oben << ".\n";
-                  Opt_Candidate = Candidate;
+                  OptCandidate = Candidate;
                   Storage[0] = angle;
                   //cout << Verbose(3) << "Changing something in Storage: %lf %lf. \n", Storage[0], Storage[2]);
                 } else {
-                  //cout << Verbose(3) << "Current candidate is " << *Candidate << ": Looses with angle " << angle << " to a better candidate " << *Opt_Candidate << endl;
+                  //cout << Verbose(3) << "Current candidate is " << *Candidate << ": Looses with angle " << angle << " to a better candidate " << *OptCandidate << endl;
                 }
               } else {
@@ -2135 +2135 @@
         }
       }
-  cout << Verbose(2) << "End of Find_second_point_for_Tesselation" << endl;
+  cout << Verbose(2) << "End of FindSecondPointForTesselation" << endl;
 };
 
@@ -2161 +2161 @@
  * holds. Then, the normalized projection onto the SearchDirection is either +1 or -1 and thus states whether
  * the angle is uniquely in either (0,M_PI] or [M_PI, 2.*M_PI).
- * @param NormalVector normal direction of the base triangle (here the unit axis vector, \sa Find_starting_triangle())
+ * @param NormalVector normal direction of the base triangle (here the unit axis vector, \sa FindStartingTriangle())
  * @param SearchDirection general direction where to search for the next point, relative to center of BaseLine
  * @param OldSphereCenter center of sphere for base triangle, relative to center of BaseLine, giving null angle for the parameter circle
@@ -2167 +2167 @@
  * @param ThirdNode third point to avoid in search
  * @param candidates list of equally good candidates to return
- * @param ShortestAngle the current path length on this circle band for the current Opt_Candidate
+ * @param ShortestAngle the current path length on this circle band for the current OptCandidate
  * @param RADIUS radius of sphere
  * @param *LC LinkedCell structure with neighbouring points
  */
-void Tesselation::Find_third_point_for_Tesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint  *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, LinkedCell *LC)
+void Tesselation::FindThirdPointForTesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint  *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, LinkedCell *LC)
 {
   Vector CircleCenter;  // center of the circle, i.e. of the band of sphere's centers
@@ -2188 +2188 @@
   CandidateForTesselation *optCandidate = NULL;
 
-  cout << Verbose(1) << "Begin of Find_third_point_for_Tesselation" << endl;
+  cout << Verbose(1) << "Begin of FindThirdPointForTesselation" << endl;
 
   //cout << Verbose(2) << "INFO: NormalVector of BaseTriangle is " << NormalVector << "." << endl;
@@ -2345 +2345 @@
   if (candidates->size() > 1) {
     candidates->unique();
-    candidates->sort(sortCandidates);
-  }
-
-  cout << Verbose(1) << "End of Find_third_point_for_Tesselation" << endl;
+    candidates->sort(SortCandidates);
+  }
+
+  cout << Verbose(1) << "End of FindThirdPointForTesselation" << endl;
 };
 
@@ -2397 +2397 @@
   }
 
-  trianglePoints[0] = findClosestPoint(x, SecondPoint, LC);
+  trianglePoints[0] = FindClosestPoint(x, SecondPoint, LC);
   
   // check whether closest point is "too close" :), then it's inside
@@ -2408 +2408 @@
     return NULL;
   }
-  list<TesselPoint*> *connectedPoints = getCircleOfConnectedPoints(out, trianglePoints[0]);
-  list<TesselPoint*> *connectedClosestPoints = getNeighboursonCircleofConnectedPoints(out, connectedPoints, trianglePoints[0], x);
+  list<TesselPoint*> *connectedPoints = GetCircleOfConnectedPoints(out, trianglePoints[0]);
+  list<TesselPoint*> *connectedClosestPoints = GetNeighboursOnCircleOfConnectedPoints(out, connectedPoints, trianglePoints[0], x);
   delete(connectedPoints);
   trianglePoints[1] = connectedClosestPoints->front();
@@ -2497 +2497 @@
  * @return list of the all points linked to the provided one
  */
-list<TesselPoint*> * Tesselation::getCircleOfConnectedPoints(ofstream *out, TesselPoint* Point)
+list<TesselPoint*> * Tesselation::GetCircleOfConnectedPoints(ofstream *out, TesselPoint* Point)
 {
   list<TesselPoint*> *connectedPoints = new list<TesselPoint*>;
@@ -2558 +2558 @@
  * @return list of the two points linked to the provided one and closest to the point to be checked,
  */
-list<TesselPoint*> * Tesselation::getNeighboursonCircleofConnectedPoints(ofstream *out, list<TesselPoint*> *connectedPoints, TesselPoint* Point, Vector* Reference)
+list<TesselPoint*> * Tesselation::GetNeighboursOnCircleOfConnectedPoints(ofstream *out, list<TesselPoint*> *connectedPoints, TesselPoint* Point, Vector* Reference)
 {
   map<double, TesselPoint*> anglesOfPoints;
@@ -2597 +2597 @@
     helper.SubtractVector(Point->node);
     helper.ProjectOntoPlane(&PlaneNormal);
-    double angle = getAngle(helper, AngleZero, OrthogonalVector);
+    double angle = GetAngle(helper, AngleZero, OrthogonalVector);
     *out << Verbose(2) << "INFO: Calculated angle is " << angle << " for point " << **listRunner << "." << endl;
     anglesOfPoints.insert(pair<double, TesselPoint*>(angle, (*listRunner)));
@@ -2644 +2644 @@
     return 0.;
   }
-  list<TesselPoint*> *CircleofPoints = getCircleOfConnectedPoints(out, point->node);
+  list<TesselPoint*> *CircleofPoints = GetCircleOfConnectedPoints(out, point->node);
 
   // remove all triangles
@@ -2716 +2716 @@
  * \return true - there is such a line (i.e. creation of degenerated triangle is valid), false - no such line (don't create)
  */
-bool CheckLineCriteriaforDegeneratedTriangle(class BoundaryPointSet *nodes[3])
+bool CheckLineCriteriaForDegeneratedTriangle(class BoundaryPointSet *nodes[3])
 {
   bool result = false;
@@ -2750 +2750 @@
 /** Sort function for the candidate list.
  */
-bool sortCandidates(CandidateForTesselation* candidate1, CandidateForTesselation* candidate2) 
+bool SortCandidates(CandidateForTesselation* candidate1, CandidateForTesselation* candidate2)
 {
   Vector BaseLineVector, OrthogonalVector, helper;
@@ -2800 +2800 @@
  * @return point which is second closest to the provided one
  */
-TesselPoint* findSecondClosestPoint(const Vector* Point, LinkedCell* LC)
+TesselPoint* FindSecondClosestPoint(const Vector* Point, LinkedCell* LC)
 {
   LinkedNodes *List = NULL;
@@ -2846 +2846 @@
 };
 
-
-
 /**
  * Finds the point which is closest to the provided one.
@@ -2857 +2855 @@
  * @return point which is closest to the provided one, NULL if none found
  */
-TesselPoint* findClosestPoint(const Vector* Point, TesselPoint *&SecondPoint, LinkedCell* LC)
+TesselPoint* FindClosestPoint(const Vector* Point, TesselPoint *&SecondPoint, LinkedCell* LC)
 {
   LinkedNodes *List = NULL;
@@ -2904 +2902 @@
   return closestPoint;
 };
-
 
 /**
@@ -2971 +2968 @@
 }
 
+/**
+ * Finds all degenerated triangles within the tesselation structure.
+ *
+ * @return map of keys of degenerated triangle pairs, each triangle occurs twice
+ *         in the list, once as key and once as value
+ */
+map<int, int> Tesselation::FindAllDegeneratedTriangles()
+{
+  map<int, int> DegeneratedTriangles;
+
+  // sanity check
+  if (LinesOnBoundary.empty()) {
+    cout << Verbose(1) << "Warning: FindAllDegeneratedTriangles() was called without any tesselation structure.";
+    return DegeneratedTriangles;
+  }
+
+  LineMap::iterator LineRunner1, LineRunner2;
+
+  for (LineRunner1 = LinesOnBoundary.begin(); LineRunner1 != LinesOnBoundary.end(); ++LineRunner1) {
+    for (LineRunner2 = LinesOnBoundary.begin(); LineRunner2 != LinesOnBoundary.end(); ++LineRunner2) {
+      if ((LineRunner1->second != LineRunner2->second)
+        && (LineRunner1->second->endpoints[0] == LineRunner2->second->endpoints[0])
+        && (LineRunner1->second->endpoints[1] == LineRunner2->second->endpoints[1])
+      ) {
+        TriangleMap::iterator TriangleRunner1 = LineRunner1->second->triangles.begin(),
+          TriangleRunner2 = LineRunner2->second->triangles.begin();
+
+        for (; TriangleRunner1 != LineRunner1->second->triangles.end(); ++TriangleRunner1) {
+          for (; TriangleRunner2 != LineRunner2->second->triangles.end(); ++TriangleRunner2) {
+            if ((TriangleRunner1->second != TriangleRunner2->second)
+              && (TriangleRunner1->second->endpoints[0] == TriangleRunner2->second->endpoints[0])
+              && (TriangleRunner1->second->endpoints[1] == TriangleRunner2->second->endpoints[1])
+              && (TriangleRunner1->second->endpoints[2] == TriangleRunner2->second->endpoints[2])
+            ) {
+              DegeneratedTriangles[TriangleRunner1->second->Nr] = TriangleRunner2->second->Nr;
+              DegeneratedTriangles[TriangleRunner2->second->Nr] = TriangleRunner1->second->Nr;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  cout << Verbose(1) << "FindAllDegeneratedTriangles() found " << DegeneratedTriangles.size() << " triangles." << endl;
+  map<int,int>::iterator it;
+  for (it = DegeneratedTriangles.begin(); it != DegeneratedTriangles.end(); it++)
+      cout << Verbose(2) << (*it).first << " => " << (*it).second << endl;
+
+  return DegeneratedTriangles;
+}
+
+/**
+ * Purges degenerated triangles from the tesselation structure if they are not
+ * necessary to keep a single point within the structure.
+ */
+void Tesselation::RemoveDegeneratedTriangles()
+{
+  map<int, int> DegeneratedTriangles = FindAllDegeneratedTriangles();
+
+  for (map<int, int>::iterator TriangleKeyRunner = DegeneratedTriangles.begin();
+    TriangleKeyRunner != DegeneratedTriangles.end(); ++TriangleKeyRunner
+  ) {
+    BoundaryTriangleSet *triangle = TrianglesOnBoundary.find(TriangleKeyRunner->first)->second,
+      *partnerTriangle = TrianglesOnBoundary.find(TriangleKeyRunner->second)->second;
+
+    bool trianglesShareLine = false;
+    for (int i = 0; i < 3; ++i)
+      for (int j = 0; j < 3; ++j)
+        trianglesShareLine = trianglesShareLine || triangle->lines[i] == partnerTriangle->lines[j];
+
+    if (trianglesShareLine
+      && (triangle->endpoints[1]->LinesCount > 2)
+      && (triangle->endpoints[2]->LinesCount > 2)
+      && (triangle->endpoints[0]->LinesCount > 2)
+    ) {
+      cout << Verbose(1) << "RemoveDegeneratedTriangles() removes triangle " << *triangle << "." << endl;
+      RemoveTesselationTriangle(triangle);
+      cout << Verbose(1) << "RemoveDegeneratedTriangles() removes triangle " << *partnerTriangle << "." << endl;
+      RemoveTesselationTriangle(partnerTriangle);
+      DegeneratedTriangles.erase(DegeneratedTriangles.find(partnerTriangle->Nr));
+    } else {
+      cout << Verbose(1) << "RemoveDegeneratedTriangles() does not remove triangle " << *triangle
+        << " and its partner " << *partnerTriangle << " because it is essential for at"
+        << " least one of the endpoints to be kept in the tesselation structure." << endl;
+    }
+  }
+}
+
 /** Gets the angle between a point and a reference relative to the provided center.
  * We have two shanks point and reference between which the angle is calculated
@@ -2980 +3065 @@
  * @return angle between point and reference
  */
-double getAngle(const Vector &point, const Vector &reference, const Vector OrthogonalVector)
+double GetAngle(const Vector &point, const Vector &reference, const Vector OrthogonalVector)
 {
   if (reference.IsZero())

src/tesselation.hpp

@@ -20 +20 @@
 #include <map>
 #include <list>
+#include <set>
 
 
@@ -203 +204 @@
 
     // concave envelope
-    void Find_starting_triangle(ofstream *out, const double RADIUS, class LinkedCell *LC);
-    void Find_second_point_for_Tesselation(class TesselPoint* a, class TesselPoint* Candidate, Vector Oben, class TesselPoint*& Opt_Candidate, double Storage[3], double RADIUS, class LinkedCell *LC);
-    void Find_third_point_for_Tesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, class LinkedCell *LC);
-    bool Find_next_suitable_triangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, LinkedCell *LC);
+    void FindStartingTriangle(ofstream *out, const double RADIUS, class LinkedCell *LC);
+    void FindSecondPointForTesselation(class TesselPoint* a, class TesselPoint* Candidate, Vector Oben, class TesselPoint*& OptCandidate, double Storage[3], double RADIUS, class LinkedCell *LC);
+    void FindThirdPointForTesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, class LinkedCell *LC);
+    bool FindNextSuitableTriangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, LinkedCell *LC);
     int CheckPresenceOfTriangle(ofstream *out, class TesselPoint *Candidates[3]);
 
@@ -217 +218 @@
     bool PickFarthestofTwoBaselines(ofstream *out, class BoundaryLineSet *Base);
     class BoundaryPointSet *IsConvexRectangle(ofstream *out, class BoundaryLineSet *Base);
-
-
-    list<TesselPoint*> * getCircleOfConnectedPoints(ofstream *out, TesselPoint* Point);
-    list<TesselPoint*> * getNeighboursonCircleofConnectedPoints(ofstream *out, list<TesselPoint*> *connectedPoints, TesselPoint* Point, Vector* Reference);
+    map<int, int> FindAllDegeneratedTriangles();
+    void RemoveDegeneratedTriangles();
+
+    list<TesselPoint*> * GetCircleOfConnectedPoints(ofstream *out, TesselPoint* Point);
+    list<TesselPoint*> * GetNeighboursOnCircleOfConnectedPoints(ofstream *out, list<TesselPoint*> *connectedPoints, TesselPoint* Point, Vector* Reference);
     list<BoundaryTriangleSet*> *FindTriangles(TesselPoint* Points[3]);
     list<BoundaryTriangleSet*> * FindClosestTrianglesToPoint(ofstream *out, Vector *x, LinkedCell* LC);
@@ -262 +264 @@
 };
 
-bool CheckLineCriteriaforDegeneratedTriangle(class BoundaryPointSet *nodes[3]);
-bool sortCandidates(class CandidateForTesselation* candidate1, class CandidateForTesselation* candidate2);
-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);
+bool CheckLineCriteriaForDegeneratedTriangle(class BoundaryPointSet *nodes[3]);
+bool SortCandidates(class CandidateForTesselation* candidate1, class CandidateForTesselation* candidate2);
+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);
 Vector * GetClosestPointBetweenLine(ofstream *out, class BoundaryLineSet *Base, class BoundaryLineSet *OtherBase);
 

src/tesselationhelpers.cpp

@@ -8 +8 @@
 #include "tesselationhelpers.hpp"
 
-double det_get(gsl_matrix *A, int inPlace) {
+double DetGet(gsl_matrix *A, int inPlace) {
   /*
   inPlace = 1 => A is replaced with the LU decomposed copy.
@@ -36 +36 @@
 };
 
-void get_sphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS)
+void GetSphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS)
 {
   gsl_matrix *A = gsl_matrix_calloc(3,3);
@@ -46 +46 @@
     gsl_matrix_set(A, i, 2, c.x[i]);
   }
-  m11 = det_get(A, 1);
+  m11 = DetGet(A, 1);
 
   for(int i=0;i<3;i++) {
@@ -53 +53 @@
     gsl_matrix_set(A, i, 2, c.x[i]);
   }
-  m12 = det_get(A, 1);
+  m12 = DetGet(A, 1);
 
   for(int i=0;i<3;i++) {
@@ -60 +60 @@
     gsl_matrix_set(A, i, 2, c.x[i]);
   }
-  m13 = det_get(A, 1);
+  m13 = DetGet(A, 1);
 
   for(int i=0;i<3;i++) {
@@ -67 +67 @@
     gsl_matrix_set(A, i, 2, b.x[i]);
   }
-  m14 = det_get(A, 1);
+  m14 = DetGet(A, 1);
 
   if (fabs(m11) < MYEPSILON)
@@ -101 +101 @@
  * @param Umkreisradius double radius of circumscribing circle
  */
-void Get_center_of_sphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection,
+void GetCenterOfSphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection,
     double HalfplaneIndicator, double AlternativeIndicator, double alpha, double beta, double gamma, double RADIUS, double Umkreisradius)
 {
@@ -107 +107 @@
   double Restradius;
   Vector OtherCenter;
-  cout << Verbose(3) << "Begin of Get_center_of_sphere.\n";
+  cout << Verbose(3) << "Begin of GetCenterOfSphere.\n";
   Center->Zero();
   helper.CopyVector(&a);
@@ -153 +153 @@
   Center->AddVector(&TempNormal);
   cout << Verbose(0) << "Center of sphere of circumference is " << *Center << ".\n";
-  get_sphere(&OtherCenter, a, b, c, RADIUS);
+  GetSphere(&OtherCenter, a, b, c, RADIUS);
   cout << Verbose(0) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n";
-  cout << Verbose(3) << "End of Get_center_of_sphere.\n";
+  cout << Verbose(3) << "End of GetCenterOfSphere.\n";
 };
 
@@ -307 +307 @@
     gsl_multimin_fminimizer *s = NULL;
     gsl_vector *ss, *x;
-    gsl_multimin_function minex_func;
+    gsl_multimin_function minexFunction;
 
     size_t iter = 0;
@@ -324 +324 @@
 
     /* Initialize method and iterate */
-    minex_func.n = NDIM;
-    minex_func.f = &MinIntersectDistance;
-    minex_func.params = (void *)&par;
+    minexFunction.n = NDIM;
+    minexFunction.f = &MinIntersectDistance;
+    minexFunction.params = (void *)&par;
 
     s = gsl_multimin_fminimizer_alloc(T, NDIM);
-    gsl_multimin_fminimizer_set(s, &minex_func, x, ss);
+    gsl_multimin_fminimizer_set(s, &minexFunction, x, ss);
 
     do {

src/tesselationhelpers.hpp

@@ -28 +28 @@
 #include "vector.hpp"
 
-double det_get(gsl_matrix *A, int inPlace);
-void get_sphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS);
-void Get_center_of_sphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection, double HalfplaneIndicator, double AlternativeIndicator, double alpha, double beta, double gamma, double RADIUS, double Umkreisradius);
+double DetGet(gsl_matrix *A, int inPlace);
+void GetSphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS);
+void GetCenterOfSphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection, double HalfplaneIndicator, double AlternativeIndicator, double alpha, double beta, double gamma, double RADIUS, double Umkreisradius);
 void GetCenterofCircumcircle(Vector *Center, Vector *a, Vector *b, Vector *c);
 double GetPathLengthonCircumCircle(Vector &CircleCenter, Vector &CirclePlaneNormal, double CircleRadius, Vector &NewSphereCenter, Vector &OldSphereCenter, Vector &NormalVector, Vector &SearchDirection);
@@ -36 +36 @@
 bool existsIntersection(Vector point1, Vector point2, Vector point3, Vector point4);
 
-//bool Choose_preferable_third_point(atom *Candidate, atom *OptCandidate, class BoundaryLineSet *BaseLine, atom *ThirdNode, Tesselation *Tess);
-
-
 #endif /* TESSELATIONHELPERS_HPP_ */