Changeset 455043 for src/LinkedCell

Timestamp:

Jan 2, 2012, 1:34:57 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:

c29915

Parents:

54f3d1

git-author:

Frederik Heber <heber@…> (12/21/11 17:57:51)

git-committer:

Frederik Heber <heber@…> (01/02/12 13:34:57)

Message:

Changed MapEdgelengthModel to contain const ref as value.

• LinkedCell_Controller::insertNewModel() gets const ref as param now.

Location:

src/LinkedCell

Files:

• LinkedCell_Controller.cpp (modified) (2 diffs)
• LinkedCell_Controller.hpp (modified) (1 diff)

src/LinkedCell/LinkedCell_Controller.cpp

@@ -139 +139 @@
  * @param instance pointer to model
  */
-void LinkedCell_Controller::insertNewModel(const double edgelength, LinkedCell_Model*& instance)
+void LinkedCell_Controller::insertNewModel(const double edgelength, const LinkedCell_Model* instance)
 {
   std::pair< MapEdgelengthModel::iterator, bool> inserter =
@@ -160 +160 @@
 {
   /// Look for best instance.
-  const LinkedCell_Model *LCModel_best = getBestModel(distance);
+  const LinkedCell_Model * const LCModel_best = getBestModel(distance);
 
   /// Construct new instance if none found,
   if (LCModel_best == NULL) {
-    LinkedCell_Model *LCModel_new = new LinkedCell_Model(distance, domain);
+    LinkedCell_Model * const LCModel_new = new LinkedCell_Model(distance, domain);
     LCModel_new->insertPointCloud(set);
     insertNewModel(distance, LCModel_new);
-    LinkedCell_View view(const_cast<const LinkedCell_Model &>(*LCModel_new));
+    LinkedCell_View view(*LCModel_new);
     return view;
   } else {

src/LinkedCell/LinkedCell_Controller.hpp

@@ -53 +53 @@
     const LinkedCell_Model * getBestModel(const double distance) const;
     const range<double> getHeuristicRange(const double distance) const;
-    void insertNewModel(const double edgelength, LinkedCell_Model*& instance);
+    void insertNewModel(const double edgelength, const LinkedCell_Model* instance);
 
   private:
     //!> typedef for the (edge length, model) map
-    typedef std::map<double, LinkedCell_Model* > MapEdgelengthModel;
+    typedef std::map<double, const LinkedCell_Model* > MapEdgelengthModel;
 
     //!> internal map of present LinkedCell_Model instances by their egde length