From 1a4dd74a31f97869d1d87975e222e9a625ee1c43 Mon Sep 17 00:00:00 2001 From: Bela Schaum Date: Thu, 28 Nov 2024 14:49:41 +0100 Subject: [PATCH] not serialize aggregator on dimension --- src/dataframe/old/datatable.cpp | 9 +++++++++ src/dataframe/old/types.h | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/dataframe/old/datatable.cpp b/src/dataframe/old/datatable.cpp index 33ab6d87e..d3baca7cf 100644 --- a/src/dataframe/old/datatable.cpp +++ b/src/dataframe/old/datatable.cpp @@ -85,6 +85,15 @@ void SeriesIndex::setAggr(const std::string &aggr) aggregator = Refl::get_enum(aggr); } +std::string SeriesIndex::toJSON() const +{ + std::string res; + Conv::JSONObj obj{res}; + obj("name", name); + if (aggregator) obj("aggregator", Conv::toString(*aggregator)); + return res; +} + DataCube::iterator_t DataCube::begin() const { iterator_t res{this, diff --git a/src/dataframe/old/types.h b/src/dataframe/old/types.h index 3625277bb..5684a7c2c 100644 --- a/src/dataframe/old/types.h +++ b/src/dataframe/old/types.h @@ -69,11 +69,7 @@ class SeriesIndex [[nodiscard]] bool isDimension() const { return !aggregator; } - [[nodiscard]] consteval static auto members() - { - return std::tuple{&SeriesIndex::name, - &SeriesIndex::aggregator}; - } + [[nodiscard]] std::string toJSON() const; }; using SeriesList = Type::UniqueList;