Changeset 429069 for src/LinkedCell

Timestamp:

Feb 22, 2012, 11:28:52 AM (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:

5e2864

Parents:

040a5c

git-author:

Frederik Heber <heber@…> (01/06/12 09:43:05)

git-committer:

Frederik Heber <heber@…> (02/22/12 11:28:52)

Message:

FIX: Forgot that LinkedCell_Controller::updateModels() should also erase Models not viewed currently.

• these models are erased after new ones are created to enforce different memory addresses upon which unit test check is based.

File:

• src/LinkedCell/LinkedCell_Controller.cpp (modified) (2 diffs)

src/LinkedCell/LinkedCell_Controller.cpp

@@ -239 +239 @@
 #endif
     const double distance = ModelsMap_inverted[oldref];
-    // create new one
+    // create new one, afterwards erase old model (this is for unit test to get different memory addresses)
     LinkedCell_Model * const newref = new LinkedCell_Model(distance, domain);
-    // delete old one (this way to make sure, unit test notices different pointer addresses)
-    delete oldref;
-    ModelsMap.erase(distance);
+    MapEdgelengthModel::iterator oldmodeliter = ModelsMap.find(distance);
+    delete oldmodeliter->second;
+    ModelsMap.erase(oldmodeliter);
     LOG(2, "INFO: oldref is " << oldref << ", newref is " << newref << ".");
     iter->second = newref;
@@ -255 +255 @@
         +toString(distance)+","+toString(newref)+" into ModelsMap, is already present");
   }
+  
+  // remove all remaining active models (also those that don't have an active View on them)
+  for (MapEdgelengthModel::iterator iter = ModelsMap.begin();
+      !ModelsMap.empty();
+      iter = ModelsMap.begin()) {
+    delete iter->second;
+    ModelsMap.erase(iter);
+  }
+
 
   // delete inverted map for safety (values are gone)