Changeset 6acc2f3 for src/Shapes/unittests/ShapeOpsUnitTest.cpp

Timestamp:

Mar 28, 2012, 3:17:38 PM (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:

5a8d61

Parents:

84721b

git-author:

Frederik Heber <heber@…> (01/18/12 20:17:24)

git-committer:

Frederik Heber <heber@…> (03/28/12 15:17:38)

Message:

Added getCenter() and getRadius to all Shapes.

• also extended unit test.
• Added test functions to ShapeOpsUnitTest.

File:

• src/Shapes/unittests/ShapeOpsUnitTest.cpp (modified) (2 diffs)

src/Shapes/unittests/ShapeOpsUnitTest.cpp ¶

@@ -23 +23 @@
 
 #include <cmath>
+#include <limits>
 
 #ifdef HAVE_TESTRUNNER
@@ -107 +108 @@
 }
 
+void ShapeOpsTest::getCenterTest()
+{
+  Shape s = Sphere();
+  Shape t = Sphere(Vector(2.,0.,0.),1.);
+  Vector offset(1.,0.,0);
+  RealSpaceMatrix M;
+  M.setRotation(45.,0.,0.);
+
+  // Sphere
+  {
+    // sphere at origin
+    CPPUNIT_ASSERT_EQUAL( Vector(0.,0.,0), s.getCenter() );
+
+    // translated sphere
+    CPPUNIT_ASSERT_EQUAL( offset, translate(s, offset).getCenter() );
+
+    // resized sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(0.,0.,0), resize(s, 2.).getCenter() );
+
+    // stretched sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(0.,0.,0), stretch(s, Vector(2.,1.,1.)).getCenter() );
+
+    // transformed sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(0.,0.,0), transform(s, M).getCenter() );
+
+    // resized and translated sphere
+    CPPUNIT_ASSERT_EQUAL( offset, translate(resize(s, 2.), offset).getCenter() );
+  }
+
+  // AND spheres
+  {
+    // sphere at origin
+    CPPUNIT_ASSERT_EQUAL( Vector(1.,0.,0), (s && t).getCenter() );
+
+    // translated sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(2.,0.,0), translate((s && t), offset).getCenter() );
+
+    // resized sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(1.,0.,0), resize((s && t), 2.).getCenter() );
+
+    // stretched sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(1.5,0.,0), (stretch(s, Vector(2.,1.,1.)) && t).getCenter() );
+
+    // transformed sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(1.,0.,0), (transform(s, M) && t).getCenter() );
+
+    // resized and translated sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(2.,0.,0), translate(resize((s && t), 2.), offset).getCenter() );
+  }
+
+  // OR spheres
+  {
+    // sphere at origin
+    CPPUNIT_ASSERT_EQUAL( Vector(1.,0.,0), (s || t).getCenter() );
+
+    // translated sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(2.,0.,0), translate((s || t), offset).getCenter() );
+
+    // resized sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(1.,0.,0), resize((s || t), 2.).getCenter() );
+
+    // stretched sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(0.5,0.,0), (stretch(s, Vector(2.,1.,1.)) || t).getCenter() );
+
+    // transformed sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(1.,0.,0), (transform(s, M) || t).getCenter() );
+
+    // resized and translated sphere
+    CPPUNIT_ASSERT_EQUAL( Vector(2.,0.,0), translate(resize((s || t), 2.), offset).getCenter() );
+  }
+
+  // NOT spheres
+  {
+    // sphere at origin
+    CPPUNIT_ASSERT_EQUAL( Vector(0.,0.,0), (!s).getCenter() );
+  }
+}
+
+void ShapeOpsTest::getRadiusTest()
+{
+  Shape s = Sphere();
+  Shape t = Sphere(Vector(2.,0.,0.),1.);
+  Vector offset(1.,0.,0);
+  RealSpaceMatrix M;
+  M.setRotation(45.,0.,0.);
+
+  // Sphere
+  {
+    // sphere at origin
+    CPPUNIT_ASSERT_EQUAL( 1., s.getRadius() );
+
+    // translated sphere
+    CPPUNIT_ASSERT_EQUAL( 1., translate(s, offset).getRadius() );
+
+    // resized sphere
+    CPPUNIT_ASSERT_EQUAL( 2., resize(s, 2.).getRadius() );
+
+    // stretched sphere
+    CPPUNIT_ASSERT_EQUAL( 2., stretch(s, Vector(2.,1.,1.)).getRadius() );
+
+    // transformed sphere
+    CPPUNIT_ASSERT_EQUAL( 1., transform(s, M).getRadius() );
+
+    // resized and translated sphere
+    CPPUNIT_ASSERT_EQUAL( 2., translate(resize(s, 2.), offset).getRadius() );
+  }
+
+  // AND spheres
+  {
+    // sphere at origin
+    CPPUNIT_ASSERT_EQUAL( 1., (s && t).getRadius() );
+
+    // translated sphere
+    CPPUNIT_ASSERT_EQUAL( 1., translate((s && t), offset).getRadius() );
+
+    // resized sphere
+    CPPUNIT_ASSERT_EQUAL( 2., resize((s && t), 2.).getRadius() );
+
+    // stretched sphere
+    CPPUNIT_ASSERT_EQUAL( 1., (stretch(s, Vector(2.,1.,1.)) && t).getRadius() );
+
+    // transformed sphere
+    CPPUNIT_ASSERT_EQUAL( 1., (transform(s, M) && t).getRadius() );
+
+    // resized and translated sphere
+    CPPUNIT_ASSERT_EQUAL( 2., translate(resize((s && t), 2.), offset).getRadius() );
+  }
+
+  // OR spheres
+  {
+    // sphere at origin
+    CPPUNIT_ASSERT_EQUAL( 2., (s || t).getRadius() );
+
+    // translated sphere
+    CPPUNIT_ASSERT_EQUAL( 2., translate((s || t), offset).getRadius() );
+
+    // resized sphere
+    CPPUNIT_ASSERT_EQUAL( 4., resize((s || t), 2.).getRadius() );
+
+    // stretched sphere
+    CPPUNIT_ASSERT_EQUAL( 2.5, (stretch(s, Vector(2.,1.,1.)) || t).getRadius() );
+
+    // transformed sphere
+    CPPUNIT_ASSERT_EQUAL( 2., (transform(s, M) || t).getRadius() );
+
+    // resized and translated sphere
+    CPPUNIT_ASSERT_EQUAL( 4., translate(resize((s || t), 2.), offset).getRadius() );
+  }
+
+  // NOT spheres
+  {
+    // sphere at origin
+    CPPUNIT_ASSERT_EQUAL( std::numeric_limits<double>::infinity(), (!s).getRadius() );
+  }
+}
+