Changeset ebb50e

Timestamp:

Apr 15, 2010, 3:22:51 PM (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:

474961

Parents:

bc3f2a

Message:

Renamed AddCandidateTriangle() -> AddCandidatePolygon()

• AddCandidateTriangle() may actually add more than one triangle in degenerated Delauney case.

Location:

src

Files:

• boundary.cpp (modified) (1 diff)
• tesselation.cpp (modified) (2 diffs)
• tesselation.hpp (modified) (1 diff)
• unittests/tesselation_insideoutsideunittest.cpp (modified) (1 diff)
• unittests/tesselationunittest.cpp (modified) (1 diff)

src/boundary.cpp

@@ -1037 +1037 @@
       OneLoopWithoutSuccessFlag = false;
     else {
-      TesselStruct->AddCandidateTriangle(*baseline);
+      TesselStruct->AddCandidatePolygon(*baseline);
     }
 

src/tesselation.cpp

@@ -2222 +2222 @@
 
     BTS = NULL;
-    AddCandidateTriangle(OptCandidates);
+    AddCandidatePolygon(OptCandidates);
 //    delete(BaseLine.endpoints[0]);
 //    delete(BaseLine.endpoints[1]);
@@ -2546 +2546 @@
  * \NOTE we need the copy operator here as the original CandidateForTesselation is removed in AddTesselationLine()
  */
-void Tesselation::AddCandidateTriangle(CandidateForTesselation CandidateLine)
-{
-        Info FunctionInfo(__func__);
+void Tesselation::AddCandidatePolygon(CandidateForTesselation CandidateLine)
+{
+  Info FunctionInfo(__func__);
   Vector Center;
   TesselPoint * const TurningPoint = CandidateLine.BaseLine->endpoints[0]->node;

src/tesselation.hpp

@@ -286 +286 @@
     void AddTesselationTriangle();
     void AddTesselationTriangle(const int nr);
-    void AddCandidateTriangle(CandidateForTesselation CandidateLine);
+    void AddCandidatePolygon(CandidateForTesselation CandidateLine);
     void RemoveTesselationTriangle(class BoundaryTriangleSet *triangle);
     void RemoveTesselationLine(class BoundaryLineSet *line);

src/unittests/tesselation_insideoutsideunittest.cpp

@@ -123 +123 @@
       OneLoopWithoutSuccessFlag = false;
     else {
-      TesselStruct->AddCandidateTriangle(*baseline);
+      TesselStruct->AddCandidatePolygon(*baseline);
     }
   }

src/unittests/tesselationunittest.cpp

@@ -91 +91 @@
       OneLoopWithoutSuccessFlag = false;
     else {
-      TesselStruct->AddCandidateTriangle(*baseline);
+      TesselStruct->AddCandidatePolygon(*baseline);
     }
   }