Changeset d4eaf1

Timestamp:

Jun 27, 2014, 9:32:55 PM (11 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:

a498c1

Parents:

a42fee

git-author:

Frederik Heber <heber@…> (04/22/14 15:59:51)

git-committer:

Frederik Heber <heber@…> (06/27/14 21:32:55)

Message:

Renamed ResultContainer -> ReceivedResultContainer.

• this belongs to SpecificFragmentController.
• renamed _ResultContainer_impl -> _ReceiveResultContainer_impl.
• FIX: also renamed inclusion guard.

Location:

src/Fragmentation/Automation

Files:

• MPQCFragmentController.hpp (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• SpecificFragmentController.hpp (modified) (4 diffs)
• SpecificFragmentController_ReceiveResultContainer_impl.hpp (moved) (moved from src/Fragmentation/Automation/SpecificFragmentController_ResultContainer_impl.hpp ) (8 diffs)
• VMGDebugGridFragmentController.hpp (modified) (1 diff)
• VMGFragmentController.hpp (modified) (1 diff)

src/Fragmentation/Automation/MPQCFragmentController.hpp

@@ -70 +70 @@
 private:
   //!> type-specific result container
-  SpecificFragmentController::ResultContainer<MPQCData> results;
+  SpecificFragmentController::ReceiveResultContainer<MPQCData> results;
 };
 

src/Fragmentation/Automation/Makefile.am

@@ -17 +17 @@
         Fragmentation/Automation/MPQCFragmentController.hpp \
         Fragmentation/Automation/SpecificFragmentController.hpp \
-        Fragmentation/Automation/SpecificFragmentController_ResultContainer_impl.hpp
+        Fragmentation/Automation/SpecificFragmentController_ReceiveResultContainer_impl.hpp
         
 if CONDVMG

src/Fragmentation/Automation/SpecificFragmentController.hpp

@@ -60 +60 @@
    */
   template <typename T>
-  struct ResultContainer {
+  struct ReceiveResultContainer {
     /** cycle to wait for results
      *
@@ -79 +79 @@
     size_t receiveResults(SpecificFragmentController &callback);
 
+    /** Inserts FragmentResult's into IdData.
+     *
+     * \param results raw results to insert, containing ids
+     * \param fragmentData converted results to insert, containing data
+     */
+    void insertResults(
+        const std::vector<FragmentResult::ptr> &results,
+        std::vector<T> &fragmentData);
+
     /** Extracts specific Data type from received vector of FragmentResults.
      *
@@ -86 +95 @@
     void ConvertFragmentResultTo(
         const std::vector<FragmentResult::ptr> &results,
-        std::vector<T> &fragmentData);
+        std::vector<T> &fragmentData) const;
 
     /** Clears all internally stored results.
@@ -109 +118 @@
 };
 
-#include "SpecificFragmentController_ResultContainer_impl.hpp"
+#include "SpecificFragmentController_ReceiveResultContainer_impl.hpp"
 
 #endif /* SPECIFICFRAGMENTCONTROLLER_HPP_ */

src/Fragmentation/Automation/SpecificFragmentController_ReceiveResultContainer_impl.hpp

@@ -1 +1 @@
 /*
- * SpecificFragmentController_impl.hpp
+ * SpecificFragmentController_ReceiveResultContainer_impl.hpp
  *
  *  Created on: Aug 27, 2012
@@ -6 +6 @@
  */
 
-#ifndef SPECIFICFRAGMENTCONTROLLER_IMPL_HPP_
-#define SPECIFICFRAGMENTCONTROLLER_IMPL_HPP_
+#ifndef SPECIFICFRAGMENTCONTROLLER_RECEIVERESULTCONTAINER_IMPL_HPP_
+#define SPECIFICFRAGMENTCONTROLLER_RECEIVERESULTCONTAINER_IMPL_HPP_
 
 
@@ -22 +22 @@
 
 template <typename T>
-size_t SpecificFragmentController::ResultContainer<T>::receiveResults(
+size_t SpecificFragmentController::ReceiveResultContainer<T>::receiveResults(
     SpecificFragmentController &callback)
 {
@@ -35 +35 @@
 
   // insert into map
-  std::vector<FragmentResult::ptr>::const_iterator resultiter = fragmentresults.begin();
-  typename std::vector<T>::const_iterator dataiter = fragmentData.begin();
-  for(;resultiter != fragmentresults.end(); ++resultiter, ++dataiter) {
-    const JobId_t _id = (*resultiter)->getId();
-#ifndef NDEBUG
-    std::pair<typename std::map<JobId_t, T>::iterator, bool> inserter =
-#endif
-    IdData.insert( std::make_pair( _id, *dataiter) );
-    ASSERT( inserter.second,
-        "SpecificFragmentController::ResultContainer::receiveResults() - result id "
-        +toString(inserter.first->first)+" already present.");
-  }
-  ASSERT( dataiter == fragmentData.end(),
-      "SpecificFragmentController::ResultContainer::receiveResults() - fragmentresults and fragmentdata differ in size.");
+  insertResults(fragmentresults, fragmentData);
+
   return fragmentData.size();
 }
 
 template <typename T>
-void SpecificFragmentController::ResultContainer<T>::waitforResults(
+void SpecificFragmentController::ReceiveResultContainer<T>::waitforResults(
     const size_t NoExpectedResults,
     boost::asio::io_service &io_service,
@@ -81 +69 @@
 
 template <typename T>
-void SpecificFragmentController::ResultContainer<T>::ConvertFragmentResultTo(
+void SpecificFragmentController::ReceiveResultContainer<T>::ConvertFragmentResultTo(
     const std::vector<FragmentResult::ptr> &results,
-    std::vector<T> &fragmentData)
+    std::vector<T> &fragmentData) const
 {
   // extract results
@@ -90 +78 @@
 
   LOG(2, "DEBUG: Parsing now through " << results.size() << " results.");
-  for (std::vector<FragmentResult::ptr>::const_iterator iter = results.begin();
+ for (std::vector<FragmentResult::ptr>::const_iterator iter = results.begin();
       iter != results.end(); ++iter) {
     //LOG(1, "RESULT: job #"+toString((*iter)->getId())+": "+toString((*iter)->result));
@@ -98 +86 @@
     boost::archive::text_iarchive ia(inputstream);
     ia >> extractedData;
-    LOG(1, "INFO: extracted data is " << extractedData << ".");
+   LOG(1, "INFO: extracted data is " << extractedData << ".");
     fragmentData.push_back(extractedData);
   }
@@ -106 +94 @@
 }
 
-#endif /* SPECIFICFRAGMENTCONTROLLER_IMPL_HPP_ */
+template <typename T>
+void SpecificFragmentController::ReceiveResultContainer<T>::insertResults(
+    const std::vector<FragmentResult::ptr> &fragmentresults,
+    std::vector<T> &fragmentData)
+{
+  std::vector<FragmentResult::ptr>::const_iterator resultiter = fragmentresults.begin();
+  typename std::vector<T>::const_iterator dataiter = fragmentData.begin();
+  for(;resultiter != fragmentresults.end(); ++resultiter, ++dataiter) {
+    const JobId_t _id = (*resultiter)->getId();
+#ifndef NDEBUG
+    std::pair<typename std::map<JobId_t, T>::iterator, bool> inserter =
+#endif
+    IdData.insert( std::make_pair( _id, *dataiter) );
+    ASSERT( inserter.second,
+        "ReceiveResultContainer::insertResults() - result id "
+        +toString(inserter.first->first)+" already present.");
+  }
+  ASSERT( dataiter == fragmentData.end(),
+      "ReceiveResultContainer::insertResults() - fragmentresults and fragmentdata differ in size.");
+}
+
+
+#endif /* SPECIFICFRAGMENTCONTROLLER_RECEIVERESULTCONTAINER_IMPL_HPP_ */

src/Fragmentation/Automation/VMGDebugGridFragmentController.hpp

@@ -55 +55 @@
 private:
   //!> type-specific result container
-  SpecificFragmentController::ResultContainer<std::string> results;
+  SpecificFragmentController::ReceiveResultContainer<std::string> results;
 };
 

src/Fragmentation/Automation/VMGFragmentController.hpp

@@ -89 +89 @@
 private:
   //!> type-specific result container
-  SpecificFragmentController::ResultContainer<VMGData> results;
+  SpecificFragmentController::ReceiveResultContainer<VMGData> results;
 };