Fix spacing + remove DataTable interface

schaumb · schaumb · commit d8c68f633f77 · 2024-11-29T17:54:20.000+01:00
diff --git a/src/apps/weblib/interface.cpp b/src/apps/weblib/interface.cpp
@@ -322,10 +322,11 @@ void Interface::addDimension(ObjectRegistryHandle chart,
     std::uint32_t categoryIndicesCount,
     bool isContiguous)
 {
-	getChart(chart)->getTable().addColumn(name,
+	getChart(chart)->getTable().add_dimension(
 	    {categories, categoriesCount},
 	    {categoryIndices, categoryIndicesCount},
-	    isContiguous);
+	    name,
+	    {{{"isContiguous", isContiguous ? "true" : "false"}}});
 }
 
 void Interface::addMeasure(ObjectRegistryHandle chart,
@@ -334,22 +335,22 @@ void Interface::addMeasure(ObjectRegistryHandle chart,
     const double *values,
     std::uint32_t count)
 {
-	getChart(chart)->getTable().addColumn(name,
-	    unit,
-	    {values, count});
+	getChart(chart)->getTable().add_measure({values, count},
+	    name,
+	    {{std::pair{"unit", unit}}});
 }
 
 void Interface::addRecord(ObjectRegistryHandle chart,
     const char *const *cells,
     std::uint32_t count)
 {
-	getChart(chart)->getTable().pushRow({cells, count});
+	getChart(chart)->getTable().add_record({cells, count});
 }
 
 const char *Interface::dataMetaInfo(ObjectRegistryHandle chart)
 {
 	thread_local std::string res;
-	res = getChart(chart)->getTable().getInfos();
+	res = getChart(chart)->getTable().as_string();
 	return res.c_str();
 }
 
diff --git a/src/apps/weblib/typeschema-api/data.yaml b/src/apps/weblib/typeschema-api/data.yaml
@@ -75,7 +75,6 @@ definitions:
                     like timestamps.
                 type: boolean
 
-
     IndexDimension:
         $extends: SeriesBase
         description: Name of a dimension data series.
diff --git a/src/base/conv/auto_json.h b/src/base/conv/auto_json.h
@@ -336,11 +336,15 @@ struct JSONObj : protected JSONRepeat<'{', '}'>
 		return std::move(*this);
 	}
 
-	template <class T> JSONObj &&mergeObj(const T &obj) &&
+	template <bool isStatic = true, class T>
+	JSONObj &mergeObj(const T &obj)
 	{
 		auto pre_size = json.size();
 
-		staticObj(obj);
+		if constexpr (isStatic)
+			staticObj(obj);
+		else
+			dynamicObj(obj);
 
 		json.pop_back();
 
@@ -351,7 +355,7 @@ struct JSONObj : protected JSONRepeat<'{', '}'>
 		else
 			was = true;
 
-		return std::move(*this);
+		return *this;
 	}
 };
 
diff --git a/src/chart/generator/plotbuilder.cpp b/src/chart/generator/plotbuilder.cpp
@@ -369,7 +369,8 @@ void PlotBuilder::calcLegendAndLabel(const Data::DataTable &dataTable)
 					calcLegend.title = dataCube.getName(*meas);
 				calcLegend.measure = {std::get<0>(stats.at(type)),
 				    meas->getColIndex(),
-				    dataTable.getUnit(meas->getColIndex()),
+				    dataTable.get_series_info(meas->getColIndex(),
+				        "unit"),
 				    scale.step.getValue()};
 			}
 		}
@@ -410,8 +411,9 @@ void PlotBuilder::calcLegendAndLabel(const Data::DataTable &dataTable)
 	                      .at(ChannelId::label)
 	                      .measure())
 		plot->axises.label = {
-		    ::Anim::String{
-		        std::string{dataTable.getUnit(meas->getColIndex())}},
+		    ::Anim::String{std::string{
+		        dataTable.get_series_info(meas->getColIndex(),
+		            "unit")}},
 		    ::Anim::String{meas->getColIndex()}};
 }
 
@@ -440,7 +442,7 @@ void PlotBuilder::calcAxis(const Data::DataTable &dataTable,
 		else
 			axis.measure = {std::get<0>(stats.at(type)),
 			    meas.getColIndex(),
-			    dataTable.getUnit(meas.getColIndex()),
+			    dataTable.get_series_info(meas.getColIndex(), "unit"),
 			    scale.step.getValue()};
 	}
 	else {
diff --git a/src/chart/main/events.h b/src/chart/main/events.h
@@ -224,7 +224,7 @@ class Events
 			void appendToJSON(Conv::JSONObj &&jsonObj) const override
 			{
 				Element::appendToJSON(
-				    std::move(jsonObj).mergeObj(properties));
+				    std::move(jsonObj.mergeObj(properties)));
 			}
 		};
 
diff --git a/src/dataframe/impl/dataframe.cpp b/src/dataframe/impl/dataframe.cpp
@@ -204,8 +204,8 @@ void dataframe::add_dimension(
     std::span<const char *const> dimension_categories,
     std::span<const std::uint32_t> dimension_values,
     std::string_view name,
-    adding_type adding_strategy,
-    std::span<const std::pair<const char *, const char *>> info) &
+    std::span<const std::pair<const char *, const char *>> info,
+    adding_type adding_strategy) &
 {
 	change_state_to(state_type::modifying,
 	    state_modification_reason::needs_series_type);
@@ -276,8 +276,8 @@ void dataframe::add_dimension(
 
 void dataframe::add_measure(std::span<const double> measure_values,
     std::string_view name,
-    adding_type adding_strategy,
-    std::span<const std::pair<const char *, const char *>> info) &
+    std::span<const std::pair<const char *, const char *>> info,
+    adding_type adding_strategy) &
 {
 	change_state_to(state_type::modifying,
 	    state_modification_reason::needs_series_type);
@@ -656,17 +656,18 @@ std::string dataframe::as_string() const &
 		default: error(error_type::series_not_found, name);
 		case dimension: {
 			const auto &[name, dim] = unsafe_get<dimension>(ser);
-			obj("name", name)("type", "dimension")("isContiguous",
-			    dim.info.at("isContiguous"))("length",
-			    dim.values.size())("categories", dim.categories);
+			obj("name", name)("type", "dimension")("length",
+			    dim.values.size())("categories", dim.categories)
+			    .mergeObj<false>(dim.info);
 			break;
 		}
 		case measure: {
 			const auto &[name, mea] = unsafe_get<measure>(ser);
 			auto &&[min, max] = mea.get_min_max();
-			obj("name", name)("type", "measure")("unit",
-			    mea.info.at("unit"))("length", mea.values.size())
-			    .nested("range")("min", min)("max", max);
+			obj("name", name)("type", "measure")("length",
+			    mea.values.size())
+			    .nested("range")("min", min)("max", max)
+			    .mergeObj<false>(mea.info);
 			break;
 		}
 		}
diff --git a/src/dataframe/impl/dataframe.h b/src/dataframe/impl/dataframe.h
@@ -69,15 +69,17 @@ class dataframe
 	    std::span<const char *const> dimension_categories,
 	    std::span<const std::uint32_t> dimension_values,
 	    std::string_view name,
-	    adding_type adding_strategy,
-	    std::span<const std::pair<const char *, const char *>> info)
-	    &;
+	    std::span<const std::pair<const char *, const char *>> info =
+	        {},
+	    adding_type adding_strategy =
+	        adding_type::create_or_override) &;
 
 	void add_measure(std::span<const double> measure_values,
 	    std::string_view name,
-	    adding_type adding_strategy,
-	    std::span<const std::pair<const char *, const char *>> info)
-	    &;
+	    std::span<const std::pair<const char *, const char *>> info =
+	        {},
+	    adding_type adding_strategy =
+	        adding_type::create_or_override) &;
 
 	void add_series_by_other(std::string_view curr_series,
 	    std::string_view name,
diff --git a/src/dataframe/interface.cpp b/src/dataframe/interface.cpp
@@ -66,26 +66,26 @@ void dataframe_interface::add_dimension(
     std::span<const char *const> dimension_categories,
     std::span<const std::uint32_t> dimension_values,
     std::string_view name,
-    adding_type adding_strategy,
-    std::span<const std::pair<const char *, const char *>> info) &
+    std::span<const std::pair<const char *, const char *>> info,
+    adding_type adding_strategy) &
 {
 	as_impl(this).add_dimension(dimension_categories,
 	    dimension_values,
 	    name,
-	    adding_strategy,
-	    info);
+	    info,
+	    adding_strategy);
 }
 
 void dataframe_interface::add_measure(
     std::span<const double> measure_values,
     std::string_view name,
-    adding_type adding_strategy,
-    std::span<const std::pair<const char *, const char *>> info) &
+    std::span<const std::pair<const char *, const char *>> info,
+    adding_type adding_strategy) &
 {
 	as_impl(this).add_measure(measure_values,
 	    name,
-	    adding_strategy,
-	    info);
+	    info,
+	    adding_strategy);
 }
 
 void dataframe_interface::add_series_by_other(
diff --git a/src/dataframe/interface.h b/src/dataframe/interface.h
@@ -106,15 +106,13 @@ class alignas(align_impl) dataframe_interface
 	    std::span<const char *const> dimension_categories,
 	    std::span<const std::uint32_t> dimension_values,
 	    std::string_view name,
-	    adding_type adding_strategy,
-	    std::span<const std::pair<const char *, const char *>> info)
-	    &;
+	    std::span<const std::pair<const char *, const char *>> info,
+	    adding_type adding_strategy) &;
 
 	void add_measure(std::span<const double> measure_values,
 	    std::string_view name,
-	    adding_type adding_strategy,
-	    std::span<const std::pair<const char *, const char *>> info)
-	    &;
+	    std::span<const std::pair<const char *, const char *>> info,
+	    adding_type adding_strategy) &;
 
 	void add_series_by_other(std::string_view curr_series,
 	    std::string_view name,
diff --git a/src/dataframe/old/datatable.cpp b/src/dataframe/old/datatable.cpp
@@ -27,36 +27,6 @@
 
 namespace Vizzu::Data
 {
-
-void DataTable::addColumn(std::string_view name,
-    std::string_view unit,
-    const std::span<const double> &values)
-{
-	df.add_measure(values,
-	    name.data(),
-	    dataframe::adding_type::create_or_override,
-	    {{std::pair{"unit", unit.data()}}});
-}
-
-void DataTable::addColumn(std::string_view name,
-    const std::span<const char *const> &categories,
-    const std::span<const std::uint32_t> &values,
-    bool isContiguous)
-{
-	df.add_dimension(categories,
-	    values,
-	    name.data(),
-	    dataframe::adding_type::create_or_override,
-	    {{std::pair{"contiguous", isContiguous ? "true" : "false"}}});
-}
-
-void DataTable::pushRow(const std::span<const char *const> &cells)
-{
-	df.add_record(cells);
-}
-
-std::string DataTable::getInfos() const { return df.as_string(); }
-
 bool DataCube::iterator_t::operator!=(const iterator_t &other) const
 {
 	return parent != other.parent;
@@ -78,7 +48,7 @@ SeriesIndex::SeriesIndex(dataframe::series_meta_t const &meta) :
 
 SeriesIndex::SeriesIndex(std::string const &str,
     const DataTable &table) :
-    SeriesIndex(table.getDf().get_series_meta(str))
+    SeriesIndex(table.get_series_meta(str))
 {}
 
 void SeriesIndex::setAggr(const std::string &aggr)
@@ -137,7 +107,7 @@ DataCube::DataCube(const DataTable &table,
 	auto empty = dimensions.empty() && measures.empty();
 
 	df = {empty ? dataframe::dataframe::create_new()
-	            : table.getDf().copy(false)};
+	            : table.copy(false)};
 
 	if (empty) {
 		df->finalize();
@@ -242,17 +212,6 @@ const std::string &DataCube::getName(
 	    {seriesId.getColIndex(), seriesId.getAggr()});
 }
 
-std::string_view DataTable::getUnit(
-    std::string_view const &colIx) const
-{
-	return df.get_series_info(colIx, "unit");
-}
-
-bool DataTable::getIsContiguous(std::string_view const &colIx) const
-{
-	return df.get_series_info(colIx, "contiguous") == "true";
-}
-
 MarkerId DataCube::getId(const SeriesList &sl,
     const std::optional<std::size_t> &ll,
     const MultiIndex &mi) const
diff --git a/src/dataframe/old/datatable.h b/src/dataframe/old/datatable.h
@@ -19,39 +19,6 @@ enum class ChannelId : std::uint8_t;
 namespace Vizzu::Data
 {
 
-class DataTable
-{
-public:
-	using Type = dataframe::series_type;
-
-	void addColumn(std::string_view name,
-	    std::string_view unit,
-	    const std::span<const double> &values);
-
-	void addColumn(std::string_view name,
-	    const std::span<const char *const> &categories,
-	    const std::span<const std::uint32_t> &values,
-	    bool isContiguous);
-
-	void pushRow(const std::span<const char *const> &cells);
-
-	[[nodiscard]] std::string_view getUnit(
-	    std::string_view const &colIx) const;
-
-	[[nodiscard]] bool getIsContiguous(
-	    std::string_view const &colIx) const;
-
-	[[nodiscard]] std::string getInfos() const;
-
-	[[nodiscard]] const dataframe::dataframe &getDf() const
-	{
-		return df;
-	}
-
-private:
-	dataframe::dataframe df;
-};
-
 class DataCube
 {
 	struct iterator_t;
diff --git a/src/dataframe/old/types.h b/src/dataframe/old/types.h
@@ -10,12 +10,13 @@
 namespace Vizzu::dataframe
 {
 struct series_meta_t;
+class dataframe;
 }
 
 namespace Vizzu::Data
 {
 
-class DataTable;
+using DataTable = dataframe::dataframe;
 class DataCube;
 
 struct RowWrapper
diff --git a/test/qtest/chart.cpp b/test/qtest/chart.cpp
@@ -26,15 +26,13 @@ void TestChart::prepareData()
 	std::vector<double>
 	    val{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0};
 	auto &table = chart.getChart().getTable();
-	table.addColumn("Cat1",
-	    std::span(cat1),
+	table.add_dimension(cat1,
 	    std::array{0u, 0u, 0u, 1u, 1u, 1u, 2u, 2u, 2u},
-	    false);
-	table.addColumn("Cat2",
-	    std::span(cat2),
+	    "Cat1");
+	table.add_dimension(cat2,
 	    std::array{0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u},
-	    false);
-	table.addColumn("Val", "", std::span(val));
+	    "Cat2");
+	table.add_measure(val, "Val");
 
 	chart.getChart()
 	    .getEventDispatcher()
diff --git a/test/unit/chart/events.cpp b/test/unit/chart/events.cpp

Original file line number	Diff line number	Diff line change
`@@ -322,10 +322,11 @@ void Interface::addDimension(ObjectRegistryHandle chart,`
`322`	`322`	`std::uint32_t categoryIndicesCount,`
`323`	`323`	`bool isContiguous)`
`324`	`324`	`{`
`325`		`- getChart(chart)->getTable().addColumn(name,`
	`325`	`+ getChart(chart)->getTable().add_dimension(`
`326`	`326`	`{categories, categoriesCount},`
`327`	`327`	`{categoryIndices, categoryIndicesCount},`
`328`		`- isContiguous);`
	`328`	`+ name,`
	`329`	`+ {{{"isContiguous", isContiguous ? "true" : "false"}}});`
`329`	`330`	`}`
`330`	`331`
`331`	`332`	`void Interface::addMeasure(ObjectRegistryHandle chart,`
`@@ -334,22 +335,22 @@ void Interface::addMeasure(ObjectRegistryHandle chart,`
`334`	`335`	`const double *values,`
`335`	`336`	`std::uint32_t count)`
`336`	`337`	`{`
`337`		`- getChart(chart)->getTable().addColumn(name,`
`338`		`- unit,`
`339`		`- {values, count});`
	`338`	`+ getChart(chart)->getTable().add_measure({values, count},`
	`339`	`+ name,`
	`340`	`+ {{std::pair{"unit", unit}}});`
`340`	`341`	`}`
`341`	`342`
`342`	`343`	`void Interface::addRecord(ObjectRegistryHandle chart,`
`343`	`344`	`const char const cells,`
`344`	`345`	`std::uint32_t count)`
`345`	`346`	`{`
`346`		`- getChart(chart)->getTable().pushRow({cells, count});`
	`347`	`+ getChart(chart)->getTable().add_record({cells, count});`
`347`	`348`	`}`
`348`	`349`
`349`	`350`	`const char *Interface::dataMetaInfo(ObjectRegistryHandle chart)`
`350`	`351`	`{`
`351`	`352`	`thread_local std::string res;`
`352`		`- res = getChart(chart)->getTable().getInfos();`
	`353`	`+ res = getChart(chart)->getTable().as_string();`
`353`	`354`	`return res.c_str();`
`354`	`355`	`}`
`355`	`356`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ class Events`
`224`	`224`	`void appendToJSON(Conv::JSONObj &&jsonObj) const override`
`225`	`225`	`{`
`226`	`226`	`Element::appendToJSON(`
`227`		`- std::move(jsonObj).mergeObj(properties));`
	`227`	`+ std::move(jsonObj.mergeObj(properties)));`
`228`	`228`	`}`
`229`	`229`	`};`
`230`	`230`