Changeset 54f3d1 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:

455043

Parents:

8c31865

git-author:

Frederik Heber <heber@…> (12/21/11 10:35:41)

git-committer:

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

Message:

Removed short-wiring of updates as they are now passed through LinkedCellArrayCache.

• replaced ..._internal() calls by Changes->addUpdate(..) in LinkedCell_Model.
• added some verbosity to allow for following the chain of updates.
• new unit test function lazyUpdatesTest() in LinkedCell_ModelTest.
• TESTFIX: nodeTest() and insertPointCloudTest() needed a forced update at the right places due to the cached nature now as they access internals bypassing the automatic updates.

Location:

src/LinkedCell/unittests

Files:

• LinkedCell_ModelUnitTest.cpp (modified) (6 diffs)
• LinkedCell_ModelUnitTest.hpp (modified) (2 diffs)

src/LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp

@@ -32 +32 @@
 #include "LinkedCell/LinkedCell.hpp"
 #include "LinkedCell/LinkedCell_Model.hpp"
+#include "LinkedCell/LinkedCell_Model_changeModel.hpp"
 #include "LinkedCell/LinkedCell_Model_LinkedCellArrayCache.hpp"
+#include "LinkedCell/LinkedCell_Model_Update.hpp"
 #include "LinkedCell/PointCloudAdaptor.hpp"
 #include "LinkedCell/unittests/defs.hpp"
@@ -141 +143 @@
   LC->insertPointCloud(cloud);
 
+  // assure that we are updated before accessing internals
+  CPPUNIT_ASSERT_EQUAL( true, *(LC->N->UpToDate) );
   // test structure
   CPPUNIT_ASSERT_EQUAL(((size_t)floor(NUMBERCELLS)), LC->CellLookup.size());
@@ -236 +240 @@
   {
     LC->addNode(Walker);
+    // assure that we are updated before accessing internals
+    CPPUNIT_ASSERT_EQUAL( true, *(LC->N->UpToDate) );
     CPPUNIT_ASSERT_EQUAL( NodeList.size()+1, LC->CellLookup.size());
     LinkedCell::tripleIndex index1 = LC->getIndexToVector(Walker->getPosition());
@@ -251 +257 @@
     // we have to call moveNode ourselves, as we have just added TesselPoints, not via World
     LC->moveNode(Walker);
+    // assure that we are updated before accessing internals
+    CPPUNIT_ASSERT_EQUAL( true, *(LC->N->UpToDate) );
     const LinkedCell::tripleIndex &newindex2 = LC->CellLookup[Walker]->getIndices();
     CPPUNIT_ASSERT( index2 != newindex2);
@@ -258 +266 @@
   {
     LC->deleteNode(Walker);
+    // assure that we are updated before accessing internals
+    CPPUNIT_ASSERT_EQUAL( true, *(LC->N->UpToDate) );
     CPPUNIT_ASSERT_EQUAL( NodeList.size(), LC->CellLookup.size());
   }
@@ -263 +273 @@
   delete Walker;
 }
+
+/** UnitTest whether lazy updates are working.
+ */
+void LinkedCell_ModelTest::lazyUpdatesTest()
+{
+  // create point
+  TesselPoint * Walker = new TesselPoint();
+  Walker->setName(std::string("Walker9"));
+  Walker->setPosition(Vector(9.8,7.6,5.4));
+  TesselPoint * Walker2 = new TesselPoint();
+  Walker2->setName(std::string("Walker10"));
+  Walker2->setPosition(Vector(9.8,7.6,5.4));
+  PointCloudAdaptor< PointSet > cloud(&NodeList, std::string("NodeList"));
+  LC->insertPointCloud(cloud);
+
+  // initial read operation
+  {
+    CPPUNIT_ASSERT( !NodeList.empty() );
+    LinkedCell::tripleIndex index = LC->getIndexToVector((*NodeList.begin())->getPosition());
+    const size_t size = LC->N->getN()(index)->size(); // this will cause the update
+    CPPUNIT_ASSERT( size >= (size_t)1 );
+  }
+
+  // do some write ops
+  LC->addNode(Walker);
+  LC->addNode(Walker2);
+  CPPUNIT_ASSERT( LC->Changes->queue.find(Walker) != LC->Changes->queue.end() );
+  LinkedCell::LinkedCell_Model::Update *update = LC->Changes->queue[Walker];
+  Walker->setPosition(Vector(0.,0.,0.));
+  LC->moveNode(Walker);
+
+  // check that they all reside in cache and nothing is changed so far
+  CPPUNIT_ASSERT( LC->Changes->queue.size() > (size_t)0 );
+
+  // check that add priority is prefered over move
+  CPPUNIT_ASSERT( LC->Changes->queue[Walker] == update );
+
+  // perform read op
+  {
+    LinkedCell::tripleIndex index = LC->getIndexToVector(Walker->getPosition());
+    CPPUNIT_ASSERT( LC->N->getN()(index)->size() >= (size_t)1 );
+  }
+
+  // check that cache is emptied
+  CPPUNIT_ASSERT( LC->Changes->queue.size() == (size_t)0 );
+
+  delete Walker;
+  delete Walker2;
+}

src/LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp

@@ -35 +35 @@
     CPPUNIT_TEST ( getIndexToVectorTest );
     CPPUNIT_TEST ( nodeTest );
+    CPPUNIT_TEST ( lazyUpdatesTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -49 +50 @@
       void getIndexToVectorTest();
       void nodeTest();
+      void lazyUpdatesTest();
 
 private: