Changeset 4a8169

Timestamp:

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

cbdcb1

Parents:

99f4ee

git-author:

Frederik Heber <heber@…> (12/21/11 18:03:15)

git-committer:

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

Message:

LinkedCell_Controller is now an Observer.

• new function updateModelsForNewBoxMatrix() which updates the models in all active views.
• so far we are hampered by const LinkedCell_Model& ref.

Location:

src/LinkedCell

Files:

• LinkedCell_Controller.cpp (modified) (3 diffs)
• LinkedCell_Controller.hpp (modified) (3 diffs)
• unittests/LinkedCell_ControllerUnitTest.cpp (modified) (1 diff)
• unittests/LinkedCell_ControllerUnitTest.hpp (modified) (2 diffs)

src/LinkedCell/LinkedCell_Controller.cpp

@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include <set>
+
 #include "Box.hpp"
 #include "CodePatterns/Assert.hpp"
+#include "CodePatterns/Log.hpp"
+#include "CodePatterns/Observer/Notification.hpp"
 #include "CodePatterns/Range.hpp"
 #include "LinkedCell_Controller.hpp"
@@ -38 +42 @@
  */
 LinkedCell_Controller::LinkedCell_Controller(const Box &_domain) :
+    Observer("LinkedCell_Controller"),
     domain(_domain)
 {
@@ -175 +180 @@
   }
 }
+
+/** Internal function to re-create all present and used models for the new Box.
+ *
+ * The main problem are the views currently in use.
+ * We make use of LinkedCell:LinkedCell_View::RAIIMap as there all present are
+ * listed. We go through the list, create a map with old model ref as keys to
+ * just newly created ones, and finally go again through each view and exchange
+ * the model against the new ones via a simple map lookup.
+ *
+ */
+void LinkedCell_Controller::updateModelsForNewBoxMatrix()
+{
+  typedef std::map<const LinkedCell_Model *, LinkedCell_Model *>  ModelLookup;
+  ModelLookup models;
+
+  // set up map, for now with NULL pointers
+  for (LinkedCell_View::ModelInstanceMap::const_iterator iter = LinkedCell_View::RAIIMap.begin();
+      iter != LinkedCell_View::RAIIMap.end(); ++iter) {
+#ifndef NDEBUG
+    std::pair< ModelLookup::iterator, bool > inserter =
+#endif
+        models.insert( std::pair<const LinkedCell_Model *, LinkedCell_Model *>( &((*iter)->LC), NULL) );
+    ASSERT( inserter.second,
+        "LinkedCell_Controller::updateModelsForNewBoxMatrix() - failed to insert old model "
+        +toString( &((*iter)->LC))+","+toString(NULL)+" into models, is already present");
+  }
+
+  // invert MapEdgelengthModel
+  typedef std::map<const LinkedCell_Model*, double > MapEdgelengthModel_inverted;
+  MapEdgelengthModel_inverted ModelsMap_inverted;
+  for (MapEdgelengthModel::const_iterator iter = ModelsMap.begin();
+      iter != ModelsMap.end(); ++iter) {
+#ifndef NDEBUG
+    MapEdgelengthModel_inverted::const_iterator assertiter = ModelsMap_inverted.find(iter->second);
+    ASSERT( assertiter != ModelsMap_inverted.end(),
+        "LinkedCell_Controller::updateModelsForNewBoxMatrix() - ModelsMap is not invertible, value "
+        +toString(iter->second)+" is already present.");
+#endif
+    ModelsMap_inverted.insert( std::make_pair(iter->second, iter->first) );
+  }
+
+  // go through map and re-create models
+  for (ModelLookup::iterator iter = models.begin(); iter != models.end(); ++iter) {
+    // delete old model
+    const LinkedCell_Model * const oldref = iter->first;
+#ifndef NDEBUG
+    MapEdgelengthModel_inverted::const_iterator assertiter = ModelsMap_inverted.find(oldref);
+    ASSERT( assertiter != ModelsMap_inverted.end(),
+        "LinkedCell_Controller::updateModelsForNewBoxMatrix() - ModelsMap_inverted does not contain old model "
+        +toString(oldref)+".");
+#endif
+    const double distance = ModelsMap_inverted[oldref];
+    delete oldref;
+    ModelsMap.erase(distance);
+    // create new one
+    LinkedCell_Model * const newref = new LinkedCell_Model(distance, domain);
+    iter->second = newref;
+    // replace in ModelsMap
+#ifndef NDEBUG
+    std::pair< MapEdgelengthModel::iterator, bool > inserter =
+#endif
+        ModelsMap.insert( std::make_pair(distance, newref) );
+    ASSERT( inserter.second,
+        "LinkedCell_Controller::updateModelsForNewBoxMatrix() - failed to insert new model "
+        +toString(distance)+","+toString(newref)+" into ModelsMap, is already present");
+  }
+
+  // delete inverted map for safety (values are gone)
+  ModelsMap_inverted.clear();
+
+  // go through views and exchange the models
+  for (LinkedCell_View::ModelInstanceMap::const_iterator iter = LinkedCell_View::RAIIMap.begin();
+      iter != LinkedCell_View::RAIIMap.end(); ++iter) {
+    ModelLookup::const_iterator modeliter = models.find(&((*iter)->LC));
+    ASSERT( modeliter != models.end(),
+        "LinkedCell_Controller::updateModelsForNewBoxMatrix() - we miss a model "
+        +toString(&((*iter)->LC))+" in ModelLookup.");
+    // this is ugly but the only place where we have to set ourselves over the constness of the member variable
+    //if (modeliter != models.end())
+      //const_cast<LinkedCell_Model &>((*iter)->LC) = *modeliter->second;
+  }
+}
+
+/** Callback function for Observer mechanism.
+ *
+ * @param publisher reference to the Observable that calls
+ */
+void LinkedCell_Controller::update(Observable *publisher)
+{
+  ELOG(2, "LinkedCell_Model received inconclusive general update from "
+      << publisher << ".");
+}
+
+/** Callback function for the Notifications mechanism.
+ *
+ * @param publisher reference to the Observable that calls
+ * @param notification specific notification as cause of the call
+ */
+void LinkedCell_Controller::recieveNotification(Observable *publisher, Notification_ptr notification)
+{
+  switch(notification->getChannelNo()) {
+    case Box::MatrixChanged:
+      updateModelsForNewBoxMatrix();
+      break;
+    default:
+      ASSERT(0,
+          "LinkedCell_Controller::recieveNotification() - unwanted notification "
+          +toString(notification->getChannelNo())+" received.");
+      break;
+  }
+}
+
+/** Callback function when an Observer dies.
+ *
+ * @param publisher reference to the Observable that calls
+ */
+void LinkedCell_Controller::subjectKilled(Observable *publisher)
+{}
+

src/LinkedCell/LinkedCell_Controller.hpp

@@ -16 +16 @@
 #include <map>
 
+#include "CodePatterns/Observer/Observer.hpp"
 #include "CodePatterns/Range.hpp"
 #include "LinkedCell/LinkedCell_View.hpp"
@@ -40 +41 @@
    *
    */
-  class LinkedCell_Controller
+  class LinkedCell_Controller : public Observer
   {
     //!> grant unit tests access to internal parts
@@ -50 +51 @@
     LinkedCell_View getView(const double distance, IPointCloud &set);
 
+    void update(Observable *publisher);
+    void recieveNotification(Observable *publisher, Notification_ptr notification);
+    void subjectKilled(Observable *publisher);
+
   private:
     const LinkedCell_Model * getBestModel(const double distance) const;
     const range<double> getHeuristicRange(const double distance) const;
     void insertNewModel(const double edgelength, const LinkedCell_Model* instance);
+    void updateModelsForNewBoxMatrix();
 
   private:

src/LinkedCell/unittests/LinkedCell_ControllerUnitTest.cpp

@@ -257 +257 @@
   }
 }
+
+/** UnitTest for LinkedCell_Controller::updateModelsForNewBoxMatrix().
+ */
+void LinkedCell_ControllerTest::updateBoxTest()
+{
+  CPPUNIT_ASSERT(true);
+}

src/LinkedCell/unittests/LinkedCell_ControllerUnitTest.hpp

@@ -41 +41 @@
     CPPUNIT_TEST ( getView_LowerThresholdViewTest );
     CPPUNIT_TEST ( getView_UpperThresholdViewTest );
+    CPPUNIT_TEST ( updateBoxTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -55 +56 @@
       void getView_LowerThresholdViewTest();
       void getView_UpperThresholdViewTest();
+      void updateBoxTest();
 
 private: