Hlafway [skip ci]

USCbiostats · Oct 4, 2023 · b1aeccd · b1aeccd
1 parent f12189c
commit b1aeccd
Show file tree

Hide file tree

Showing 7 changed files with 151 additions and 70 deletions.
diff --git a/include/barry/barraydense-meat.hpp b/include/barry/barraydense-meat.hpp
@@ -449,10 +449,10 @@ template<typename Cell_Type, typename Data_Type> inline void BArrayDense<Cell_Ty
     if (check_bounds) 
         out_of_range(0u, i);
 
+    #pragma code_align 32
     #if defined(__OPENMP) || defined(_OPENMP)
     #pragma omp simd
     #endif
-    #pragma code_align 32
     for (size_t j = 0u; j < N; ++j) 
         x->operator[](j) = el[POS(j, i)];//this->get_cell(iter->first, i, false);
 

diff --git a/include/barry/model-bones.hpp b/include/barry/model-bones.hpp
@@ -59,9 +59,11 @@ class Model {
      * - term k
      */
     ///@{
-    std::vector< std::vector< double > > stats_support;          ///< Sufficient statistics of the model (support)
-    std::vector< size_t >                stats_support_n_arrays; ///< Number of arrays included per support.
-    std::vector< std::vector< double > > stats_target;           ///< Target statistics of the model
+    std::vector< double >                stats_support;           ///< Sufficient statistics of the model (support)
+    std::vector< size_t >                stats_support_sizes;     ///< Number of vectors included in the support.
+    std::vector< size_t >                stats_support_sizes_acc; ///< Accumulated number of vectors included in the support.
+    std::vector< size_t >                stats_support_n_arrays;  ///< Number of arrays included per support.
+    std::vector< std::vector< double > > stats_target;            ///< Target statistics of the model
     std::vector< size_t >                arrays2support;
     ///@}
 
@@ -378,7 +380,7 @@ class Model {
      */
     ///@{
     std::vector< std::vector< double > > * get_stats_target();
-    std::vector< std::vector< double > > * get_stats_support();
+    std::vector< double > * get_stats_support();
     std::vector< size_t > * get_arrays2support();
     std::vector< std::vector< Array_Type > > * get_pset_arrays();
     std::vector< std::vector<double> > * get_pset_stats();  ///< Statistics of the support(s)