Changeset d505a3

Timestamp:

Mar 30, 2012, 9:16:32 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:

a88452

Parents:

5d81e5

git-author:

Frederik Heber <heber@…> (01/19/12 15:40:18)

git-committer:

Frederik Heber <heber@…> (03/30/12 09:16:32)

Message:

Added Filler as general method of filling a Shape.

• Filler::operator()() requires CopyAtomsInterface ref as param.
• added unit test that creates cluster of two atoms and fills a row of nodes.

Location:

src/Filling

Files:

• Filler.cpp (added)
• Filler.hpp (added)
• Makefile.am (modified) (2 diffs)
• unittests/FillerUnitTest.cpp (added)
• unittests/FillerUnitTest.hpp (added)
• unittests/Makefile.am (modified) (4 diffs)

src/Filling/Makefile.am

@@ -6 +6 @@
         Filling/Mesh/CubeMesh.cpp \
         Filling/Mesh/Mesh.cpp \
+        Filling/Filler.cpp \
         Filling/Predicates/AnyFillPredicate.cpp \
         Filling/Predicates/FillPredicate.cpp \
@@ -18 +19 @@
         Filling/Mesh/CubeMesh.hpp \
         Filling/Mesh/Mesh.hpp \
+        Filling/Filler.hpp \
         Filling/NodeTypes.hpp \
         Filling/Predicates/AnyFillPredicate.hpp \

src/Filling/unittests/Makefile.am

@@ -4 +4 @@
 FILLINGTESTSSOURCES = \
   ../Filling/unittests/ClusterUnitTest.cpp \
+  ../Filling/unittests/FillerUnitTest.cpp \
   ../Filling/unittests/IsInsideDomain_FillPredicateUnitTest.cpp \
   ../Filling/unittests/IsInsideSurface_FillPredicateUnitTest.cpp \
@@ -12 +13 @@
 FILLINGTESTSHEADERS = \
   ../Filling/unittests/ClusterUnitTest.hpp \
+  ../Filling/unittests/FillerUnitTest.hpp \
   ../Filling/unittests/IsInsideDomain_FillPredicateUnitTest.hpp \
   ../Filling/unittests/IsInsideSurface_FillPredicateUnitTest.hpp \
@@ -20 +22 @@
 FILLINGTESTS = \
   ClusterUnitTest \
+  FillerUnitTest \
   IsInsideDomain_FillPredicateUnitTest \
   IsInsideSurface_FillPredicateUnitTest \
@@ -36 +39 @@
         ../Filling/unittests/ClusterUnitTest.hpp
 ClusterUnitTest_LDADD = \
+        ../libMolecuilderFilling.la \
+        ../libMolecuilderUI.la \
+        ../libMolecuilder.la \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS} \
+        $(BOOST_LIBS)
+
+FillerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../Filling/unittests/FillerUnitTest.cpp \
+        ../Filling/unittests/FillerUnitTest.hpp
+FillerUnitTest_LDADD = \
         ../libMolecuilderFilling.la \
         ../libMolecuilderUI.la \