Changeset 6801f4 for src/Filling

Timestamp:

Sep 10, 2014, 6:59:16 PM (10 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:

df9f20

Parents:

36f45c

git-author:

Frederik Heber <heber@…> (09/03/14 18:00:26)

git-committer:

Frederik Heber <heber@…> (09/10/14 18:59:16)

Message:

Added FillVolumeAction for filling a Shape's volume.

• added ShapeFillerPreparator for preparing the volume filler.
• FIX: MeshAdaptor should include Mesh.hpp.
• added regression tests for FillVolume for all present shapes.
• all but cylinder fail because of missing implementation, are marked as XFAIL for the moment, except everywhere and nowhere of FillVolume which say they fail explicitly. (this is not an implementation problem, for these shapes filling makes no sense.) We explicitly check for the currently failing shape types and let the Action fail (cause this works also in disable-debug).

Location:

src/Filling

Files:

• Makefile.am (modified) (2 diffs)
• Mesh/MeshAdaptor.hpp (modified) (1 diff)
• Preparators/ShapeVolumeFillerPreparator.cpp (added)
• Preparators/ShapeVolumeFillerPreparator.hpp (added)

src/Filling/Makefile.am

@@ -21 +21 @@
         Filling/Predicates/Ops_FillPredicate.cpp \
         Filling/Preparators/BaseFillerPreparator.cpp \
-        Filling/Preparators/BoxFillerPreparator.cpp
+        Filling/Preparators/BoxFillerPreparator.cpp \
+        Filling/Preparators/ShapeVolumeFillerPreparator.cpp
         
 FILLINGHEADER = \
@@ -48 +49 @@
         Filling/Predicates/Ops_FillPredicate_impl.hpp \
         Filling/Preparators/BaseFillerPreparator.hpp \
-        Filling/Preparators/BoxFillerPreparator.hpp
+        Filling/Preparators/BoxFillerPreparator.hpp \
+        Filling/Preparators/ShapeVolumeFillerPreparator.hpp
 
 noinst_LTLIBRARIES += libMolecuilderFilling.la

src/Filling/Mesh/MeshAdaptor.hpp

@@ -18 +18 @@
 
 #include "Filling/NodeTypes.hpp"
+#include "Filling/Mesh/Mesh.hpp"
 
 class MeshAdaptor : public Mesh