Change from_tuples interfaces

Author: Aperjump

include/boost/numeric/ublas/data_frame.hpp

@@ -7,6 +7,7 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include <initializer_list>
 #include <tuple>
 #include <typeinfo>
 namespace boost { namespace numeric { namespace ublas {	
@@ -24,6 +25,10 @@ class data_frame {
     bool add_column(std::string col_name, std::vector<T> tmp_vec);
     template<class... Args>
     void from_tuples(const std::vector<std::tuple<Args...>>& t, const std::vector<std::string>& names);
+    template<class... Args>
+    void from_tuples(std::initializer_list<std::tuple<Args...>> t, const std::vector<std::string>& names);
+    template<template<class...> class TypeLists, class... Args>
+    void from_tuples(const std::vector<std::tuple<Args...>>& t, const std::vector<std::string>& names, TypeLists<Args...>);
     template<typename T>
     T& get(const std::string& col_name, size_t pos);
     template<typename T>
@@ -265,6 +270,11 @@ bool data_frame::init_column(const std::string& col_name, int size) {
     return true;
 }
 template<class... Args>
+void data_frame::from_tuples(std::initializer_list<std::tuple<Args...>> t, const std::vector<std::string>& names) {
+    std::vector<std::tuple<Args...>> vec(t);
+    from_tuples(vec, names);
+}
+template<class... Args>
 void data_frame::from_tuples(const std::vector<std::tuple<Args...>>& t, const std::vector<std::string>& names) {
     if (sizeof...(Args) != names.size()) return;
     cur_rows = t.size();
@@ -273,6 +283,10 @@ void data_frame::from_tuples(const std::vector<std::tuple<Args...>>& t, const st
         from_tuple(t[i], names, i);
     }
 }
+template<template<class...> class TypeLists, class... Args>
+void data_frame::from_tuples(const std::vector<std::tuple<Args...>>& t, const std::vector<std::string>& names, TypeLists<Args...>) {
+    from_tuples<Args...>(t, names);
+}
 template<typename T>
 std::vector<int> data_frame::order(const std::string& col_name) {
     if (!col_names_map.count(col_name)) return {};

test/data_frame_test.cpp

@@ -26,9 +26,39 @@ TEST(Data_frame, initialize_from_tuple) {
     df2.from_tuples(std::vector{std::make_tuple(1, 3.3, "hello"s), 
                                 std::make_tuple(2, 2.2, "world"s), 
                                 std::make_tuple(3, 1.1, "bili"s)}, 
-                    {"int_vec", "double_vec", "str_vec"});
+                               {"int_vec", "double_vec", "str_vec"});
     EXPECT_EQ(df2.get_cur_rows(), 3);
     EXPECT_EQ(df2.get_cur_cols(), 3);
+    data_frame df3;
+    df3.from_tuples<int, double, std::string>({{1, 3.3, "hello"s}, 
+                                {2, 2.2, "world"s}, 
+                                {3, 1.1, "bili"s}}, 
+                                {"int_vec", "double_vec", "str_vec"});
+    EXPECT_EQ(df3.get_cur_rows(), 3);
+    EXPECT_EQ(df3.get_cur_cols(), 3);
+    data_frame df4;
+    /**
+     *  df4.from_tuples({{0, 3.4, "hello"s}
+     *                   {2, 2.2, "world"s}, 
+     *                   {3, 1.1, "bili"s}}, 
+     *                   {"int_vec", "double_vec", "str_vec"});
+     */
+    std::tuple t{0, 3.4, "hello"s};
+    df4.from_tuples({t, 
+                    {2, 2.2, "world"s}, 
+                    {3, 1.1, "bilibili"s}}, 
+                    {"int_vec", "double_vec", "str_vec"});
+    EXPECT_EQ(df4.get_cur_rows(), 3);
+    EXPECT_EQ(df4.get_cur_cols(), 3);
+    data_frame df5;
+    using type_collection = type_list<int, double, std::string>::types; 
+    df5.from_tuples({{1, 3.3, "hello"s}, 
+                     {2, 2.2, "world"s}, 
+                     {3, 1.1, "bili"s}}, 
+                     {"int_vec", "double_vec", "str_vec"}, 
+                     type_collection{});
+    EXPECT_EQ(df5.get_cur_rows(), 3);
+    EXPECT_EQ(df5.get_cur_cols(), 3);
 }
 TEST(Data_frame, sort_with_single_column) {
     data_frame df2;
@@ -121,4 +151,4 @@ TEST(Data_frame, apply_with_index_test) {
         return t * 2;
     }, type_collection2{});
     df4.print_with_index({0, 1, 2},type_collection2{} );
-}
+}