Changeset 8c31865 for src/LinkedCell/unittests

Timestamp:

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

54f3d1

Parents:

e776dc

git-author:

Frederik Heber <heber@…> (12/20/11 14:28:33)

git-committer:

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

Message:

Added new class LinkedCellArrayCache that performs the lazy updates on a LinkedCellArray.

• basically, we cache all write operations and perform them first when there is a read operation that requires an up-to-date structure.
• we cannot do this via the Cacheable pattern was there we always have a return value of the update structure. It is currently unknown how to initialize a cached pointer (apart from always checking for this in the update function).

File:

• src/LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp (modified) (6 diffs)

src/LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp

@@ -32 +32 @@
 #include "LinkedCell/LinkedCell.hpp"
 #include "LinkedCell/LinkedCell_Model.hpp"
+#include "LinkedCell/LinkedCell_Model_LinkedCellArrayCache.hpp"
 #include "LinkedCell/PointCloudAdaptor.hpp"
 #include "LinkedCell/unittests/defs.hpp"
@@ -99 +100 @@
   LinkedCell::tripleIndex index;
   index[0] = index[1] = index[2] = 0;
-  CPPUNIT_ASSERT(LC->N(index) != NULL);
+  CPPUNIT_ASSERT(LC->N->getN()(index) != NULL);
 
   // check that very last cell is allocated
   index[0] = index[1] = index[2] = (size_t)floor(NUMBERCELLS)-1;
-  CPPUNIT_ASSERT(LC->N(index) != NULL);
+  CPPUNIT_ASSERT(LC->N->getN()(index) != NULL);
 
 }
@@ -146 +147 @@
     index[0] = index[1] = index[2] = i;
     // assert that in the destined cell we have one Walker
-    CPPUNIT_ASSERT_EQUAL((size_t)1, LC->N(index)->size());
+    CPPUNIT_ASSERT_EQUAL((size_t)1, LC->N->getN()(index)->size());
   }
   index[0] = 9;
   index[1] = index[2] = 0;
   // assert that in the destined cell we have one Walker
-  CPPUNIT_ASSERT_EQUAL((size_t)0, LC->N(index)->size());
-
-}
-
-/** UnitTest for insertPointCloud()
+  CPPUNIT_ASSERT_EQUAL((size_t)0, LC->N->getN()(index)->size());
+
+}
+
+/** UnitTest for setPartition()
  */
 void LinkedCell_ModelTest::setPartitionTest()
@@ -173 +174 @@
 }
 
-/** UnitTest for insertPointCloud()
+/** UnitTest for getStep()
  */
 void LinkedCell_ModelTest::getStepTest()
@@ -197 +198 @@
 }
 
-/** UnitTest for insertPointCloud()
+/** UnitTest for getIndexToVector()
  */
 void LinkedCell_ModelTest::getIndexToVectorTest()
@@ -221 +222 @@
 }
 
-/** UnitTest for insertPointCloud()
+/** UnitTest for updating nodes
  */
 void LinkedCell_ModelTest::nodeTest()