Changeset f61f61 for src/Filling

Timestamp:

Mar 30, 2012, 9:18:26 AM (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:

68abe5

Parents:

901d87

git-author:

Frederik Heber <heber@…> (02/21/12 13:55:58)

git-committer:

Frederik Heber <heber@…> (03/30/12 09:18:26)

Message:

Refactored implementation of Inserter into pimpl pattern.

• this is then much more similar to Predicate.

Location:

src/Filling

Files:

• Inserter/Inserter.cpp (added)
• Inserter/Inserter.hpp (modified) (2 diffs)
• Inserter/InserterBase.hpp (added)
• Inserter/SimpleInserter.hpp (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• unittests/FillerUnitTest.cpp (modified) (2 diffs)

src/Filling/Inserter/Inserter.hpp

@@ -15 +15 @@
 #endif
 
+#include <boost/shared_ptr.hpp>
+
 #include "Filling/ClusterInterface.hpp"
 
@@ -20 +22 @@
 class Vector;
 
-/** Inserter defines the interface to all classes that handle insertion of \a
- * Cluster into the World at a specific position.
+class InserterBase;
+
+/** This class defines the interface for all derived classes.
+ *
+ * This is just a functor of an inserter function.
+ *
  */
 class Inserter
 {
 public:
-  virtual void operator()(CopyAtomsInterface &copyMethod, ClusterInterface::Cluster_impl cluster, const Vector &offset) const = 0;
+  typedef boost::shared_ptr<InserterBase> impl_ptr;
+  friend impl_ptr getInserterImpl(const Inserter&);
 
-  virtual ~Inserter() {}
+  Inserter(const Inserter &ptr);
+  Inserter(impl_ptr);
+  ~Inserter();
+  void operator()(CopyAtomsInterface &copyMethod, ClusterInterface::Cluster_impl cluster, const Vector &offset) const;
+
+protected:
+  impl_ptr getImpl() const;
+
+private:
+  impl_ptr impl;
 };
+
+Inserter::impl_ptr getInserterImpl(const Inserter &f);
 
 

src/Filling/Inserter/SimpleInserter.hpp

@@ -15 +15 @@
 #endif
 
-#include "Filling/Inserter/Inserter.hpp"
+#include "Filling/Inserter/InserterBase.hpp"
 
 /** SimpleInserter implements Inserter interface such that the given \a Cluster
  * is simply inserted at the given position.
  */
-class SimpleInserter : public Inserter
+class SimpleInserter : public InserterBase
 {
 public:

src/Filling/Makefile.am

@@ -8 +8 @@
         Filling/Filler.cpp \
         Filling/Generators/NodeGenerator.cpp \
+        Filling/Inserter/Inserter.cpp \
         Filling/Inserter/SimpleInserter.cpp \
         Filling/Predicates/AnyFillPredicate.cpp \
@@ -24 +25 @@
         Filling/Generators/NodeGenerator.hpp \
         Filling/Inserter/Inserter.hpp \
+        Filling/Inserter/InserterBase.hpp \
         Filling/Inserter/SimpleInserter.hpp \
         Filling/NodeTypes.hpp \

src/Filling/unittests/FillerUnitTest.cpp

@@ -30 +30 @@
 #include "Filling/Cluster.hpp"
 #include "Filling/Filler.hpp"
+#include "Filling/Inserter/Inserter.hpp"
 #include "Filling/Inserter/SimpleInserter.hpp"
 #include "Filling/Mesh/Mesh.hpp"
@@ -71 +72 @@
   predicate = new FillPredicate(AlwaysFillPredicate());
   mesh = new MeshStub();
-  inserter = new SimpleInserter();
+  inserter = new Inserter(Inserter::impl_ptr(new SimpleInserter()));
   CPPUNIT_ASSERT_EQUAL( (size_t)5, mesh->getNodes().size() );
   filler = new Filler(*mesh, *predicate, *inserter);