Changeset 2445fb for src

Timestamp:

May 4, 2012, 2:19:07 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:

9875cc

Parents:

083490

git-author:

Frederik Heber <heber@…> (11/27/11 20:09:01)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:19:07)

Message:

Added private default cstor to FragmentResult.

• enhanced unit test by a vector<Fragmentresult> test and this made the above default cstor necessary.

Location:

src/Fragmentation/Automation

Files:

• FragmentResult.cpp (modified) (1 diff)
• FragmentResult.hpp (modified) (1 diff)
• unittests/FragmentResultUnitTest.cpp (modified) (2 diffs)
• unittests/FragmentResultUnitTest.hpp (modified) (3 diffs)

src/Fragmentation/Automation/FragmentResult.cpp

@@ -21 +21 @@
 
 #include "FragmentResult.hpp"
+
+/** Private default Constructor of class FragmentResult.
+ *
+ * This cstor is for serialization of this class inside a vector
+ * only. Without it, we would not need it.
+ */
+FragmentResult::FragmentResult() :
+  JobId(JobId::NoJob),
+  result(std::string("NoJob"))
+{}
 
 /** Constructor of class FragmentResult.

src/Fragmentation/Automation/FragmentResult.hpp

@@ -50 +50 @@
 private:
   friend class boost::serialization::access;
+
+  /// private default constructor for serialization only.
+  FragmentResult();
+
   // serialization
   template <typename Archive>

src/Fragmentation/Automation/unittests/FragmentResultUnitTest.cpp

@@ -25 +25 @@
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
+#include <boost/serialization/vector.hpp>
 
 #include "FragmentResultUnitTest.hpp"
@@ -93 +94 @@
 }
 
+/** UnitTest for serialization
+ */
+void FragmentResultTest::vectorserializationTest()
+{
+  std::vector<FragmentResult> testresults;
+  FragmentResult testResult(1);
+  testresults.push_back(testResult);
+  // write element to stream
+  std::stringstream stream;
+  boost::archive::text_oarchive oa(stream);
+  oa << testresults;
+
+  //std::cout << "Contents of archive is " << stream.str() << std::endl;
+
+  // create and open an archive for input
+  boost::archive::text_iarchive ia(stream);
+  // read class state from archive
+  std::vector<FragmentResult> othertestresults;
+
+  ia >> othertestresults;
+
+  CPPUNIT_ASSERT (testresults == othertestresults);
+}

src/Fragmentation/Automation/unittests/FragmentResultUnitTest.hpp

@@ -15 +15 @@
 
 #include <string>
+#include <vector>
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -25 +26 @@
     CPPUNIT_TEST ( equalityTest );
     CPPUNIT_TEST ( serializationTest );
+    CPPUNIT_TEST ( vectorserializationTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -32 +34 @@
       void equalityTest();
       void serializationTest();
+      void vectorserializationTest();
 
 };