Changeset bd8b57 for src/Fragmentation/Summation/Converter/DataConverter.hpp

Timestamp:

Oct 8, 2016, 7:25:46 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Add_FitFragmentPartialChargesAction, Fix_ChargeSampling_PBC, Fix_FitPartialCharges

Children:

f5d635

Parents:

e08108

git-author:

Frederik Heber <heber@…> (06/12/16 14:28:29)

git-committer:

Frederik Heber <heber@…> (10/08/16 19:25:46)

Message:

Extracted IndexedValue from IndexedVectors.

• we may now sum up indexed values of arbitrary type, i.e. an arbitrary class that fulfills a certain interface, and each instance connected to a specific index (within index sets).
• added detail::force where std::vector<double> is specialized for three components.
• IndexedVectors is now a specialization of IndexedValue for detail::force.
• adapated usage signatures in AnalyseFragmentationResultsAction, InterfaceVMGJob, and MPQCCommandJob.
• slight changes in IndexedVectorsUnitTest because boost::assign is no longer used for detail::force.

File:

• src/Fragmentation/Summation/Converter/DataConverter.hpp (modified) (2 diffs)

src/Fragmentation/Summation/Converter/DataConverter.hpp

@@ -27 +27 @@
 
 #include "Fragmentation/KeySetsContainer.hpp"
+#include "Fragmentation/Summation/SetValues/detail.hpp"
 #include "Fragmentation/Summation/SetValues/Eigenvalues.hpp"
 #include "Fragmentation/Summation/SetValues/Histogram.hpp"
@@ -139 +140 @@
     }
     IndexedVectors::indices_t indices(arrayiter->begin(), arrayiter->end());
+    IndexedVectors::values_t values(extractedData.forces.begin(), extractedData.forces.end());
     boost::fusion::at_key<typename dataforcefused::forces>(instance) =
-        IndexedVectors(indices, extractedData.forces);
+        IndexedVectors(indices, values);
     Data_Force_fused.insert( std::make_pair(dataiter->first, instance) );
   }