Changeset 4506cc for src/unittests

Timestamp:

Jul 15, 2010, 10:38:19 AM (14 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

6d750f

Parents:

cfda65

Message:

Added more testing to Shape mechanism

File:

• src/unittests/ShapeUnittest.cpp (modified) (2 diffs)

src/unittests/ShapeUnittest.cpp

@@ -17 +17 @@
 
 #include "Shapes/Shape.hpp"
+#include "Shapes/BaseShapes.hpp"
 #include "vector.cpp"
 
@@ -113 +114 @@
   CPPUNIT_ASSERT(Everywhere().isInside(v122));
   CPPUNIT_ASSERT(Everywhere().isInside(v222));
+
+  CPPUNIT_ASSERT(Cuboid().isInside(v000));
+  CPPUNIT_ASSERT(Cuboid().isInside(v100));
+  CPPUNIT_ASSERT(Cuboid().isInside(v200));
+  CPPUNIT_ASSERT(Cuboid().isInside(v010));
+  CPPUNIT_ASSERT(Cuboid().isInside(v110));
+  CPPUNIT_ASSERT(Cuboid().isInside(v210));
+  CPPUNIT_ASSERT(Cuboid().isInside(v020));
+  CPPUNIT_ASSERT(Cuboid().isInside(v120));
+  CPPUNIT_ASSERT(Cuboid().isInside(v220));
+  CPPUNIT_ASSERT(Cuboid().isInside(v001));
+  CPPUNIT_ASSERT(Cuboid().isInside(v101));
+  CPPUNIT_ASSERT(Cuboid().isInside(v201));
+  CPPUNIT_ASSERT(Cuboid().isInside(v011));
+  CPPUNIT_ASSERT(Cuboid().isInside(v111));
+  CPPUNIT_ASSERT(Cuboid().isInside(v211));
+  CPPUNIT_ASSERT(Cuboid().isInside(v021));
+  CPPUNIT_ASSERT(Cuboid().isInside(v121));
+  CPPUNIT_ASSERT(Cuboid().isInside(v221));
+  CPPUNIT_ASSERT(Cuboid().isInside(v002));
+  CPPUNIT_ASSERT(Cuboid().isInside(v102));
+  CPPUNIT_ASSERT(Cuboid().isInside(v202));
+  CPPUNIT_ASSERT(Cuboid().isInside(v012));
+  CPPUNIT_ASSERT(Cuboid().isInside(v112));
+  CPPUNIT_ASSERT(Cuboid().isInside(v212));
+  CPPUNIT_ASSERT(Cuboid().isInside(v022));
+  CPPUNIT_ASSERT(Cuboid().isInside(v122));
+  CPPUNIT_ASSERT(Cuboid().isInside(v222));
+
+  CPPUNIT_ASSERT(Sphere().isInside(v000));
+  CPPUNIT_ASSERT(Sphere().isInside(v100));
+  CPPUNIT_ASSERT(Sphere().isInside(v200));
+  CPPUNIT_ASSERT(Sphere().isInside(v010));
+  CPPUNIT_ASSERT(!Sphere().isInside(v110));
+  CPPUNIT_ASSERT(!Sphere().isInside(v210));
+  CPPUNIT_ASSERT(Sphere().isInside(v020));
+  CPPUNIT_ASSERT(!Sphere().isInside(v120));
+  CPPUNIT_ASSERT(!Sphere().isInside(v220));
+  CPPUNIT_ASSERT(Sphere().isInside(v001));
+  CPPUNIT_ASSERT(!Sphere().isInside(v101));
+  CPPUNIT_ASSERT(!Sphere().isInside(v201));
+  CPPUNIT_ASSERT(!Sphere().isInside(v011));
+  CPPUNIT_ASSERT(!Sphere().isInside(v111));
+  CPPUNIT_ASSERT(!Sphere().isInside(v211));
+  CPPUNIT_ASSERT(!Sphere().isInside(v021));
+  CPPUNIT_ASSERT(!Sphere().isInside(v121));
+  CPPUNIT_ASSERT(!Sphere().isInside(v221));
+  CPPUNIT_ASSERT(Sphere().isInside(v002));
+  CPPUNIT_ASSERT(!Sphere().isInside(v102));
+  CPPUNIT_ASSERT(!Sphere().isInside(v202));
+  CPPUNIT_ASSERT(!Sphere().isInside(v012));
+  CPPUNIT_ASSERT(!Sphere().isInside(v112));
+  CPPUNIT_ASSERT(!Sphere().isInside(v212));
+  CPPUNIT_ASSERT(!Sphere().isInside(v022));
+  CPPUNIT_ASSERT(!Sphere().isInside(v122));
+  CPPUNIT_ASSERT(!Sphere().isInside(v222));
 }