Changeset 0eb8f4 for src/Shapes/unittests/BaseShapesUnitTest.cpp

Timestamp:

Sep 26, 2012, 5:24:33 PM (12 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:

6f0507e

Parents:

52575c

git-author:

Gregor Bollerhey <bollerhe@…> (06/18/12 14:43:14)

git-committer:

Frederik Heber <heber@…> (09/26/12 17:24:33)

Message:

Cylinder implementation.

Taken from somehow broken branch, so rebase was not possible,
unfortunately.

The cylinder shape is centered on (0 0 0) and its height (z-Axis)
ranges from -1 to 1. Different scalings can be applied with the special
constructor.

File:

• src/Shapes/unittests/BaseShapesUnitTest.cpp (modified) (1 diff)

src/Shapes/unittests/BaseShapesUnitTest.cpp

@@ -78 +78 @@
 {}
 
+void BaseShapesTest::cylinderTest()
+{
+    Shape s = Cylinder();
+    // z = 0
+    // Quadrant 1 1
+    CPPUNIT_ASSERT( s.isInside(v000));
+    CPPUNIT_ASSERT( s.isInside(v100));
+    CPPUNIT_ASSERT(!s.isInside(v110));
+    CPPUNIT_ASSERT( s.isInside(v010));
+    // Quadrant 0 1
+    CPPUNIT_ASSERT(!s.isInside(v210));
+    CPPUNIT_ASSERT( s.isInside(v200));
+    // Quadrant 0 0
+    CPPUNIT_ASSERT(!s.isInside(v220));
+    CPPUNIT_ASSERT( s.isInside(v020));
+    // Quadrant 1 0
+    CPPUNIT_ASSERT(!s.isInside(v120));
+    
+    // z = 1
+    // Quadrant 1 1
+    CPPUNIT_ASSERT( s.isInside(v001));
+    CPPUNIT_ASSERT( s.isInside(v101));
+    CPPUNIT_ASSERT(!s.isInside(v111));
+    CPPUNIT_ASSERT( s.isInside(v011));
+    // Quadrant 0 1
+    CPPUNIT_ASSERT(!s.isInside(v211));
+    CPPUNIT_ASSERT( s.isInside(v201));
+    // Quadrant 0 0
+    CPPUNIT_ASSERT(!s.isInside(v221));
+    CPPUNIT_ASSERT( s.isInside(v021));
+    // Quadrant 1 0
+    CPPUNIT_ASSERT(!s.isInside(v121));
+    
+    // z = 2
+    // Quadrant 1 1
+    CPPUNIT_ASSERT( s.isInside(v002));
+    CPPUNIT_ASSERT( s.isInside(v102));
+    CPPUNIT_ASSERT(!s.isInside(v112));
+    CPPUNIT_ASSERT( s.isInside(v012));
+    // Quadrant 0 1
+    CPPUNIT_ASSERT(!s.isInside(v212));
+    CPPUNIT_ASSERT( s.isInside(v202));
+    // Quadrant 0 0
+    CPPUNIT_ASSERT(!s.isInside(v222));
+    CPPUNIT_ASSERT( s.isInside(v022));
+    // Quadrant 1 0
+    CPPUNIT_ASSERT(!s.isInside(v122));
+
+
+    // More special cylinder
+    s = Cylinder(Vector(0.5, 0.5, 0.0), 0.0, 30.0/180.0*M_PI, 4.0, 1.5);
+
+    CPPUNIT_ASSERT(!s.isInside(v222));
+    CPPUNIT_ASSERT(!s.isInside(v022));
+    CPPUNIT_ASSERT(!s.isInside(v122));
+    CPPUNIT_ASSERT( s.isInside(v202));
+    CPPUNIT_ASSERT( s.isInside(v002));
+    CPPUNIT_ASSERT( s.isInside(v102));
+    CPPUNIT_ASSERT( s.isInside(v212));
+    CPPUNIT_ASSERT( s.isInside(v012));
+    CPPUNIT_ASSERT( s.isInside(v112));
+    
+    CPPUNIT_ASSERT(!s.isInside(v220));
+    CPPUNIT_ASSERT(!s.isInside(v020));
+    CPPUNIT_ASSERT(!s.isInside(v120));
+    CPPUNIT_ASSERT( s.isInside(v200));
+    CPPUNIT_ASSERT( s.isInside(v000));
+    CPPUNIT_ASSERT( s.isInside(v100));
+    CPPUNIT_ASSERT( s.isInside(v210));
+    CPPUNIT_ASSERT( s.isInside(v010));
+    CPPUNIT_ASSERT( s.isInside(v110));
+    
+    CPPUNIT_ASSERT(!s.isInside(v221));
+    CPPUNIT_ASSERT(!s.isInside(v021));
+    CPPUNIT_ASSERT(!s.isInside(v121));
+    CPPUNIT_ASSERT(!s.isInside(v201));
+    CPPUNIT_ASSERT( s.isInside(v001));
+    CPPUNIT_ASSERT( s.isInside(v101));
+    CPPUNIT_ASSERT(!s.isInside(v211));
+    CPPUNIT_ASSERT( s.isInside(v011));
+    CPPUNIT_ASSERT( s.isInside(v111));
+}
 
 void BaseShapesTest::baseShapesTest(){