Changeset 22c4f57 for src/Fragmentation/Histogram/unittests

Timestamp:

Nov 8, 2012, 1:13:52 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, Candidate_v1.7.0, 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:

1dd419

Parents:

45f4f96

git-author:

Frederik Heber <heber@…> (07/27/12 12:37:16)

git-committer:

Frederik Heber <heber@…> (11/08/12 13:13:52)

Message:

Added superposeOtherHistogram and implemented thereby operator+=() and operator-=().

• the logic so far is that the other histogram must not extend beyond the present one.

Location:

src/Fragmentation/Histogram/unittests

Files:

• HistogramUnitTest.cpp (modified) (3 diffs)
• HistogramUnitTest.hpp (modified) (2 diffs)

src/Fragmentation/Histogram/unittests/HistogramUnitTest.cpp

@@ -43 +43 @@
 #include "HistogramUnitTest.hpp"
 
+#include <cmath>
+#include <limits>
+
 #include <boost/assign.hpp>
+
+#include "CodePatterns/Assert.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -59 +64 @@
 void HistogramTest::setUp()
 {
+  // failing asserts should be thrown
+  ASSERT_DO(Assert::Throw);
+
   histogram = NULL;
 }
@@ -194 +202 @@
 }
 
-/** UnitTest for operator+=(), operator-=()
- */
-void HistogramTest::operator_Test()
-{
-}
-
+/** UnitTest for superposeOtherHistogram()
+ */
+void HistogramTest::superposeOtherHistogram_Test()
+{
+  // create two histograms, one is larger
+  Histogram::samples_t sampled_values;
+  sampled_values += 1.,2.,3.,4.;
+  histogram = new Histogram(sampled_values, 4);
+  Histogram::samples_t more_values;
+  more_values += 1.75,2.5,3.;
+  Histogram otherhistogram(more_values, 3);
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_THROW ( otherhistogram += *histogram, Assert::AssertionFailure );
+#endif
+}
+
+/** UnitTest for operator+=()
+ */
+void HistogramTest::operatorPlusEqual_Test()
+{
+  // create non-empty histograms and sum them
+  Histogram::samples_t sampled_values;
+  sampled_values += 1.,2.,3.,4.;
+  histogram = new Histogram(sampled_values, 4);
+  Histogram::samples_t more_values;
+  more_values += 1.75,2.5,3.;
+  Histogram otherhistogram(more_values, 3);
+  const double sums = histogram->area() + otherhistogram.area();
+
+  // check that sum is now sum of both
+  *histogram += otherhistogram;
+  CPPUNIT_ASSERT( fabs(sums - histogram->area()) < std::numeric_limits<double>::epsilon()*1e+1 );
+}
+
+/** UnitTest for operator-=()
+ */
+void HistogramTest::operatorMinusEqual_Test()
+{
+  // create non-empty histograms and sum them
+  Histogram::samples_t sampled_values;
+  sampled_values += 1.,2.,3.,4.;
+  histogram = new Histogram(sampled_values, 4);
+  Histogram::samples_t more_values;
+  more_values += 1.75,2.5,3.;
+  Histogram otherhistogram(more_values, 3);
+  const double difference = histogram->area() - otherhistogram.area();
+
+  // check that sum is now difference of both
+  *histogram -= otherhistogram;
+  CPPUNIT_ASSERT( fabs(difference - histogram->area()) < std::numeric_limits<double>::epsilon()*1e+1 );
+}
+

src/Fragmentation/Histogram/unittests/HistogramUnitTest.hpp

@@ -28 +28 @@
     CPPUNIT_TEST ( getHigherEndBin_Test );
     CPPUNIT_TEST ( isEmpty_Test );
-    CPPUNIT_TEST ( operator_Test );
     CPPUNIT_TEST ( areaTest );
+    CPPUNIT_TEST ( superposeOtherHistogram_Test );
+    CPPUNIT_TEST ( operatorPlusEqual_Test );
+    CPPUNIT_TEST ( operatorMinusEqual_Test );
     CPPUNIT_TEST_SUITE_END();
 
@@ -39 +41 @@
       void getHigherEndBin_Test();
       void isEmpty_Test();
-      void operator_Test();
       void areaTest();
+      void superposeOtherHistogram_Test();
+      void operatorPlusEqual_Test();
+      void operatorMinusEqual_Test();
 
 private: