Changeset c2c786 for src

Timestamp:

Oct 19, 2014, 5:13:10 PM (11 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:

f1ae15

Parents:

6d5280

git-author:

Frederik Heber <heber@…> (10/03/14 09:43:03)

git-committer:

Frederik Heber <heber@…> (10/19/14 17:13:10)

Message:

FIX: RemovePointFromTesselatedSurface() used Start,Middle,EndNode confusingly.

• FIX: Very last node was removed twice due to StartNode = EndNode setting.

File:

• src/Tesselation/tesselation.cpp (modified) (3 diffs)

src/Tesselation/tesselation.cpp

@@ -3287 +3287 @@
           miniter = std::min_element(angles.begin(), angles.end(), CloserToPiHalf());
         }
-        EndNode = connectedPath->begin();
-        std::advance(EndNode, std::distance(const_cast<const angles_t &>(angles).begin(), miniter));
+        MiddleNode = connectedPath->begin();
+        std::advance(MiddleNode, std::distance(const_cast<const angles_t &>(angles).begin(), miniter));
         angles.clear();
 
-        MiddleNode = EndNode;
-        ASSERT(MiddleNode == connectedPath->end(), "Tesselation::RemovePointFromTesselatedSurface() - Could not find a smallest angle!");
+        ASSERT(MiddleNode != connectedPath->end(), 
+            "Tesselation::RemovePointFromTesselatedSurface() - Could not find a smallest angle!");
         StartNode = MiddleNode;
+        EndNode = MiddleNode;
         if (StartNode == connectedPath->begin())
           StartNode = connectedPath->end();
@@ -3345 +3346 @@
 
         // prepare nodes for next triangle
-        StartNode = EndNode;
-        LOG(3, "DEBUG: Removing " << **MiddleNode << " from closed path, remaining points: " << connectedPath->size() << ".");
+        LOG(3, "DEBUG: Removing " << **MiddleNode << " from closed path.");
         connectedPath->remove(*MiddleNode); // remove the middle node (it is surrounded by triangles)
+        LOG(3, "DEBUG: Remaining points: " << connectedPath->size() << ".");
         ASSERT(connectedPath->size() >= 2, "Tesselation::RemovePointFromTesselatedSurface() - There are only two endpoints left!");
         if (connectedPath->size() == 2) { // we are done
@@ -3354 +3355 @@
           break;
         } else {
+          StartNode = EndNode;
           MiddleNode = StartNode;
           MiddleNode++;