Changeset cc21cd for src/Tesselation/unittests

Timestamp:

Mar 27, 2012, 3:53:36 PM (13 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:

418b5e

Parents:

bdf6c8

git-author:

Frederik Heber <heber@…> (01/30/12 11:09:06)

git-committer:

Frederik Heber <heber@…> (03/27/12 15:53:36)

Message:

Added Tesselation::operator() that performs a tesselation on a given IPointCloud.

• also changed unit tests TesselationUnitTest and Tesselation_InsideOutSideUnitTest to use the new function in setUp().

Location:

src/Tesselation/unittests

Files:

• TesselationUnitTest.cpp (modified) (4 diffs)
• TesselationUnitTest.hpp (modified) (1 diff)
• Tesselation_InsideOutsideUnitTest.cpp (modified) (3 diffs)

src/Tesselation/unittests/TesselationUnitTest.cpp

@@ -29 +29 @@
 #include "Helpers/defs.hpp"
 #include "LinkedCell/PointCloudAdaptor.hpp"
+#include "LinkedCell/linkedcell.hpp"
 #include "Tesselation/BoundaryLineSet.hpp"
 #include "Tesselation/BoundaryTriangleSet.hpp"
@@ -73 +74 @@
   Corners.push_back(Walker);
 
-  // create linkedcell
-  PointCloudAdaptor<TesselPointSTLList> cloud(&Corners, "TesselPointSTLList");
-  LinkedList = new LinkedCell_deprecated(cloud, 2.*SPHERERADIUS);
-
   // create tesselation
   TesselStruct = new Tesselation;
@@ -82 +79 @@
   CPPUNIT_ASSERT_EQUAL( true, TesselStruct->LinesOnBoundary.empty() );
   CPPUNIT_ASSERT_EQUAL( true, TesselStruct->TrianglesOnBoundary.empty() );
-  TesselStruct->FindStartingTriangle(SPHERERADIUS, LinkedList);
-
-  CandidateForTesselation *baseline = NULL;
-  BoundaryTriangleSet *T = NULL;
-  bool OneLoopWithoutSuccessFlag = true;
-  bool TesselationFailFlag = false;
-  while ((!TesselStruct->OpenLines.empty()) && (OneLoopWithoutSuccessFlag)) {
-    // 2a. fill all new OpenLines
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
-      baseline = Runner->second;
-      if (baseline->pointlist.empty()) {
-        T = (((baseline->BaseLine->triangles.begin()))->second);
-        TesselationFailFlag = TesselStruct->FindNextSuitableTriangle(*baseline, *T, SPHERERADIUS, LinkedList); //the line is there, so there is a triangle, but only one.
-      }
-    }
-
-    // 2b. search for smallest ShortestAngle among all candidates
-    double ShortestAngle = 4.*M_PI;
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
-      if (Runner->second->ShortestAngle < ShortestAngle) {
-        baseline = Runner->second;
-        ShortestAngle = baseline->ShortestAngle;
-      }
-    }
-    if ((ShortestAngle == 4.*M_PI) || (baseline->pointlist.empty()))
-      OneLoopWithoutSuccessFlag = false;
-    else {
-      TesselStruct->AddCandidatePolygon(*baseline, SPHERERADIUS, LinkedList);
-    }
-  }
+  PointCloudAdaptor<TesselPointSTLList> cloud(&Corners, "TesselPointSTLList");
+  (*TesselStruct)(cloud, SPHERERADIUS);
 };
 
@@ -117 +86 @@
 void TesselationTest::tearDown()
 {
-  delete(LinkedList);
   delete(TesselStruct);
   for (TesselPointSTLList::iterator Runner = Corners.begin(); Runner != Corners.end(); Runner++)

src/Tesselation/unittests/TesselationUnitTest.hpp

@@ -43 +43 @@
       class Tesselation *TesselStruct;
       TesselPointSTLList Corners;
-      class LinkedCell_deprecated *LinkedList;
 };
 

src/Tesselation/unittests/Tesselation_InsideOutsideUnitTest.cpp

@@ -96 +96 @@
   Corners.push_back(Walker);
 
-  // create linkedcell
+  // create LinkedCell
   PointCloudAdaptor< TesselPointSTLList > cloud(&Corners, "TesselPointSTLList");
   LinkedList = new LinkedCell_deprecated(cloud, 2.*SPHERERADIUS);
@@ -102 +102 @@
   // create tesselation
   TesselStruct = new Tesselation;
-  TesselStruct->FindStartingTriangle(SPHERERADIUS, LinkedList);
-
-  CandidateForTesselation *baseline = NULL;
-  BoundaryTriangleSet *T = NULL;
-  bool OneLoopWithoutSuccessFlag = true;
-  bool TesselationFailFlag = false;
-  while ((!TesselStruct->OpenLines.empty()) && (OneLoopWithoutSuccessFlag)) {
-    // 2a. fill all new OpenLines
-    LOG(1, "There are " << TesselStruct->OpenLines.size() << " open lines to scan for candidates:");
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
-      LOG(2, *(Runner->second));
-
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
-      baseline = Runner->second;
-      if (baseline->pointlist.empty()) {
-        T = (((baseline->BaseLine->triangles.begin()))->second);
-        LOG(1, "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T);
-        TesselationFailFlag = TesselStruct->FindNextSuitableTriangle(*baseline, *T, SPHERERADIUS, LinkedList); //the line is there, so there is a triangle, but only one.
-      }
-    }
-
-    // 2b. search for smallest ShortestAngle among all candidates
-    double ShortestAngle = 4.*M_PI;
-    LOG(1, "There are " << TesselStruct->OpenLines.size() << " open lines to scan for the best candidates:");
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
-      LOG(2, *(Runner->second));
-
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
-      if (Runner->second->ShortestAngle < ShortestAngle) {
-        baseline = Runner->second;
-        ShortestAngle = baseline->ShortestAngle;
-        //LOG(1, "New best candidate is " << *baseline->BaseLine << " with point " << *baseline->point << " and angle " << baseline->ShortestAngle);
-      }
-    }
-    if ((ShortestAngle == 4.*M_PI) || (baseline->pointlist.empty()))
-      OneLoopWithoutSuccessFlag = false;
-    else {
-      TesselStruct->AddCandidatePolygon(*baseline, SPHERERADIUS, LinkedList);
-    }
-  }
+  (*TesselStruct)(cloud, SPHERERADIUS);
 };
 
@@ -147 +108 @@
 void TesselationInOutsideTest::tearDown()
 {
-  delete(LinkedList);
-  delete(TesselStruct);
+        delete LinkedList;
+  delete TesselStruct;
   for (TesselPointSTLList::iterator Runner = Corners.begin(); Runner != Corners.end(); Runner++)
-    delete(*Runner);
+    delete *Runner;
   Corners.clear();
   logger::purgeInstance();