Using emplace when OK

USCbiostats · Sep 26, 2023 · 66d19b5 · 66d19b5
1 parent 9023d6b
commit 66d19b5
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/barry.hpp b/barry.hpp
@@ -5378,7 +5378,7 @@ COUNTERS_TEMPLATE(void, add_counter)(
 )
 {
 
-    data.push_back(Counter<Array_Type,Data_Type>(
+    data.emplace_back(Counter<Array_Type,Data_Type>(
         count_fun_,
         init_fun_,
         hasher_fun_,
@@ -7904,7 +7904,7 @@ MODEL_TEMPLATE(size_t, add_array)(
     {
 
         auto tmpcounts = counter_fun.count_all();
-        stats_target.push_back(
+        stats_target.emplace_back(
             transform_model_fun(&tmpcounts[0u], tmpcounts.size())
             );
 

diff --git a/defm.hpp b/defm.hpp
@@ -956,7 +956,7 @@ inline void counter_transition(
         #ifdef BARRY_WITH_LATEX
             name += ") -> (";
         #else
-            name += "} \u21E8 {";
+            name += std::string("}") + u8"\u21E8" + std::string("{");
         #endif
     else
         #ifdef BARRY_WITH_LATEX
@@ -1529,10 +1529,10 @@ inline DEFM::DEFM(
 
     // Creating the names
     for (auto i = 0u; i < Y_ncol; ++i)
-        Y_names.push_back(std::string("y") + std::to_string(i));
+        Y_names.emplace_back(std::string("y") + std::to_string(i));
 
     for (auto i = 0u; i < X_ncol; ++i)
-        X_names.push_back(std::string("X") + std::to_string(i));
+        X_names.emplace_back(std::string("X") + std::to_string(i));
 
     return;    
 

diff --git a/include/barry/barrayvector-meat.hpp b/include/barry/barrayvector-meat.hpp
@@ -16,7 +16,7 @@ inline void BArrayVector<Cell_Type,Data_Type>::init_vec() {
     } else {
 
         for (const auto& a : Array->el_ji[i])
-            vec.push_back(std::make_pair<size_t, Cell<Cell_Type>>(a.first, *(a.second)));
+            vec.emplace_back(std::make_pair<size_t, Cell<Cell_Type>>(a.first, *(a.second)));
 
     }
 

diff --git a/include/barry/counters-meat.hpp b/include/barry/counters-meat.hpp
@@ -185,7 +185,7 @@ COUNTERS_TEMPLATE(void, add_counter)(
 )
 {
 
-    data.push_back(Counter<Array_Type,Data_Type>(
+    data.emplace_back(Counter<Array_Type,Data_Type>(
         count_fun_,
         init_fun_,
         hasher_fun_,

diff --git a/include/barry/model-meat.hpp b/include/barry/model-meat.hpp
@@ -443,7 +443,7 @@ MODEL_TEMPLATE(size_t, add_array)(
     {
 
         auto tmpcounts = counter_fun.count_all();
-        stats_target.push_back(
+        stats_target.emplace_back(
             transform_model_fun(&tmpcounts[0u], tmpcounts.size())
             );
 

diff --git a/include/barry/models/defm/counters.hpp b/include/barry/models/defm/counters.hpp
@@ -490,7 +490,7 @@ inline void counter_transition(
         #ifdef BARRY_WITH_LATEX
             name += ") -> (";
         #else
-            name += "} \u21E8 {";
+            name += std::string("}") + u8"\u21E8" + std::string("{");
         #endif
     else
         #ifdef BARRY_WITH_LATEX

diff --git a/include/barry/models/defm/defm-meat.hpp b/include/barry/models/defm/defm-meat.hpp
@@ -201,10 +201,10 @@ inline DEFM::DEFM(
 
     // Creating the names
     for (auto i = 0u; i < Y_ncol; ++i)
-        Y_names.push_back(std::string("y") + std::to_string(i));
+        Y_names.emplace_back(std::string("y") + std::to_string(i));
 
     for (auto i = 0u; i < X_ncol; ++i)
-        X_names.push_back(std::string("X") + std::to_string(i));
+        X_names.emplace_back(std::string("X") + std::to_string(i));
 
     return;    
 

diff --git a/include/barry/models/geese/flock-meat.hpp b/include/barry/models/geese/flock-meat.hpp
@@ -30,7 +30,7 @@ inline size_t Flock::add_data(
     }
 
     // Generating the Geese object
-    dat.push_back(Geese(annotations, geneid, parent, duplication));
+    dat.emplace_back(Geese(annotations, geneid, parent, duplication));
 
     if (dat.size() == 1u)
         this->nfunctions = dat[0].nfuns();

diff --git a/include/barry/models/geese/geese-meat.hpp b/include/barry/models/geese/geese-meat.hpp
@@ -160,7 +160,7 @@ inline void Geese::init(size_t bar_width) {
     for (auto& iter : pset.data)
     {
 
-        states.push_back(std::vector< bool >(nfunctions, false));
+        states.emplace_back(std::vector< bool >(nfunctions, false));
 
         for (auto j = 0u; j < nfunctions; ++j)
         {
@@ -539,7 +539,7 @@ inline std::vector< std::vector<double> > Geese::observed_counts()
         if (n.second.is_leaf())
         {
 
-            ans.push_back({});
+            ans.emplace_back(std::vector<double>({}));
             continue;
 
         }
@@ -605,7 +605,7 @@ inline void Geese::print_observed_counts()
     for (auto& n : nodes) {
 
         if (n.second.is_leaf()) {
-            ans.push_back({});
+            ans.emplace_back(std::vector< double >({}));
             continue;
         }