Changeset 776b64 for src/linkedcell.hpp

Timestamp:

Oct 27, 2009, 4:11:22 PM (16 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:

fb73b8

Parents:

ad37ab

Message:

Huge refactoring to make const what is const (ticket #38), continued.

• too many changes because of too many cross-references to be able to list them up here.
• NOTE that "make check" runs fine and did catch several error.
• note that we had to use const_iterator several times when the map, ... was declared const.
• at times we changed an allocated LinkedCell LCList(...) into

const LinkedCell *LCList;
LCList = new LinkedCell(...);

• also mutable (see ticket #5) was used, e.g. for molecule::InternalPointer (PointCloud changes are allowed, because they are just accounting).

Signed-off-by: Frederik Heber <heber@…>

File:

• src/linkedcell.hpp (modified) (1 diff)

src/linkedcell.hpp

@@ -46 +46 @@
     double RADIUS;    // cell edge length
     int N[NDIM];      // number of cells per axis
-    int n[NDIM];      // temporary variable for current cell per axis
-    int index;        // temporary index variable , access by index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2];
+    mutable int n[NDIM];      // temporary variable for current cell per axis
+    mutable int index;        // temporary index variable , access by index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2];
 
     LinkedCell();
-    LinkedCell(PointCloud *set, double RADIUS);
-    LinkedCell(LinkedNodes *set, double radius);
+    LinkedCell(const  PointCloud * const set, const double RADIUS);
+    LinkedCell(LinkedNodes *set, const double radius);
     ~LinkedCell();
-    LinkedNodes* GetCurrentCell();
-    LinkedNodes* GetRelativeToCurrentCell(int relative[NDIM]);
-    bool SetIndexToNode(const TesselPoint *Walker);
-    bool SetIndexToVector(const Vector *x);
-    bool CheckBounds();
-    bool CheckBounds(int relative[NDIM]);
-    void GetNeighbourBounds(int lower[NDIM], int upper[NDIM]);
+    const LinkedNodes* GetCurrentCell()const ;
+    const LinkedNodes* GetRelativeToCurrentCell(const int relative[NDIM])const ;
+    bool SetIndexToNode(const TesselPoint * const Walker)const ;
+    bool SetIndexToVector(const Vector * const x)const ;
+    bool CheckBounds()const ;
+    bool CheckBounds(const int relative[NDIM])const ;
+    void GetNeighbourBounds(int lower[NDIM], int upper[NDIM])const ;
 
     // not implemented yet