Merge pull request #226 from JohanMabille/variable

Variable

Author: JohanMabille

include/xframe/xaxis_variant.hpp

@@ -62,7 +62,7 @@ namespace xf
         {
             using tmp_storage_type = xtl::variant<xaxis<L, S, MT>...>;
             using storage_type = add_default_axis_t<tmp_storage_type, S, L...>;
-            using label_list = xvector_variant_cref<L...>;
+            using label_list = xvector_variant_cref<std::vector<L>...>;
             using key_type = xtl::variant<typename xaxis<L, S, MT>::key_type...>;
             using key_reference = xtl::variant<xtl::xclosure_wrapper<const typename xaxis<L, S, MT>::key_type&>...>;
             using mapped_type = S;
@@ -540,7 +540,7 @@ namespace xf
 
         inline const label_list& labels() const
         {
-            return xget_vector<key_type>(m_axis.labels());
+            return xget_vector<std::vector<key_type>>(m_axis.labels());
         };
 
         inline bool is_sorted() const noexcept

include/xframe/xvariable_variant.hpp

@@ -0,0 +1,53 @@
+/***************************************************************************
+* Copyright (c) 2017, Johan Mabille, Sylvain Corlay, Wolf Vollprecht and   *
+* Martin Renou                                                             *
+*                                                                          *
+* Distributed under the terms of the BSD 3-Clause License.                 *
+*                                                                          *
+* The full license is in the file LICENSE, distributed with this software. *
+****************************************************************************/
+
+#ifndef XFRAME_XVARIABLE_VARIANT_HPP
+#define XFRAME_XVARIABLE_VARIANT_HPP
+
+#include "xvariable.hpp"
+
+namespace xf
+{
+
+
+    template <class... V>
+    class xvariable_variant
+    {
+    };
+
+    // vtype1 = variable<double, coord_type1>;
+    // vtype2 variable<int, coord_type2>;
+    // vtype1 v1;
+    // vtype2 v2;
+
+    // auto fr = ("n1", v1) | ("n2", v2);
+    // ftype = xframe<L, vtype1, vtype2>;
+    // ftype::vtype = variant<variable<double, coord_type1>&, variable<int, coord_type2>&>
+    // ftype::vtype::value_type = variant<vtype1::value_type, vtype1::value_type>;
+    // ftype::vtype::coordinate_type = variant<vtype1::coordinate_type, vtype2::coordinate_type>;
+    // ftype::vtype::dimension_type = variant<vtype1::dimension_type, vtype2::dimension_type>;
+    // ftype::vtype::data_type = variant<vtype1::data_type, vtype2::deta_type>
+    // ftype::ctype = xcommon_coordinate_type<coord_type1, coord_type2>;
+    // ftype::dtype = xcommon_dimension_type<typename vtype1::dimension_type, typename vtype2::dimension_type>;
+    //
+    // xframe not aligned:
+    // std::map<L, ftype::vtype>;
+    // ftype::ctype m_coord;
+    // ftype::dtype m_dims;
+    // f["n1"] returns ??
+    //
+    // xframe aligned
+    // std::map<L, ftype::vtype::data_type>;
+    // ftype::ctype m_coord;
+    // ftype::dtype m_dims;
+    // f["n1"]
+}
+
+#endif
+