Merge pull request #502 from vizzuhq/old_dataframe_rename

Rename DataTable to DataTableOld.

Author: schaumb

src/apps/weblib/interface.cpp

@@ -322,7 +322,7 @@ void Interface::addRecord(ObjectRegistry::Handle chart,
 const char *Interface::dataMetaInfo(ObjectRegistry::Handle chart)
 {
 	thread_local std::string res;
-	res = Conv::toJSON(getChart(chart)->getTable().getInfos());
+	res = getChart(chart)->getTable().getInfos();
 	return res.c_str();
 }
 

src/chart/generator/marker.cpp

@@ -158,15 +158,17 @@ Conv::JSONObj &&Marker::appendToJSON(Conv::JSONObj &&jsonObj) const
 	    std::ranges::views::transform(cellInfo.categories,
 	        [this](const auto &pair)
 	        {
-		        return std::make_pair(pair.first.toString(table),
+		        return std::make_pair(
+		            pair.first.toString(table.get()),
 		            table.get()
 		                .getInfo(pair.first.getColIndex().value())
 		                .categories()[pair.second]);
 	        }))("values",
 	    std::ranges::views::transform(cellInfo.values,
 	        [this](const auto &pair)
 	        {
-		        return std::make_pair(pair.first.toString(table),
+		        return std::make_pair(
+		            pair.first.toString(table.get()),
 		            pair.second);
 	        }))("index", idx);
 }

src/chart/options/optionssetter.h

@@ -5,15 +5,7 @@
 
 #include "options.h"
 
-namespace Vizzu
-{
-
-namespace Data
-{
-class DataTable;
-}
-
-namespace Gen
+namespace Vizzu::Gen
 {
 
 class OptionsSetter
@@ -59,7 +51,6 @@ class OptionsSetter
 	const Data::DataTable *table{};
 };
 
-}
 }
 
 #endif

src/data/datacube/datacube.cpp

@@ -23,7 +23,8 @@ DataCube::DataCube(const DataTable &table,
 		auto size =
 		    idx.getType().isReal()
 		        ? table.getInfo(idx.getColIndex().value())
-		              .dimensionValueCnt()
+		              .categories()
+		              .size()
 		    : idx.getType() == SeriesType::Index
 		        ? table.getRowCount()
 		        : throw std::logic_error("internal error: cannot "
@@ -63,7 +64,7 @@ DataCube::DataCube(const DataTable &table,
 	}
 }
 
-MultiIndex DataCube::getIndex(const TableRow<double> &row,
+MultiIndex DataCube::getIndex(const DataTable::Row &row,
     const std::vector<SeriesIndex> &indices,
     size_t rowIndex)
 {
@@ -238,9 +239,9 @@ MultiDim::SubSliceIndex DataCube::subSliceIndex(
 	for (const auto &pair : stringMarkerId) {
 		auto colIdx = table->getColumn(pair.first);
 		auto seriesIdx = table->getIndex(colIdx);
-		const auto &values =
-		    table->getInfo(colIdx).dimensionValueIndexes();
-		auto valIdx = values.at(pair.second);
+		auto valIdx =
+		    table->getInfo(colIdx).dimensionValueIndexes().at(
+		        pair.second);
 		auto dimIdx = getDimBySeries(SeriesIndex(seriesIdx));
 		index.push_back(
 		    MultiDim::SliceIndex{dimIdx, MultiDim::Index{valIdx}});

src/data/datacube/datacube.h

@@ -15,7 +15,6 @@
 namespace Vizzu::Data
 {
 
-class DataTable;
 template <typename T> class TableRow;
 
 using SubCellIndex =
@@ -101,7 +100,7 @@ class DataCube
 	std::map<SeriesIndex, SubCellIndex> subIndexBySeries;
 	std::vector<SeriesIndex> seriesBySubIndex;
 
-	static MultiDim::MultiIndex getIndex(const TableRow<double> &row,
+	static MultiDim::MultiIndex getIndex(const DataTable::Row &row,
 	    const std::vector<SeriesIndex> &indices,
 	    size_t rowIndex);
 

src/data/datacube/datastat.cpp

@@ -11,7 +11,8 @@ DataStat::DataStat(const DataTable &table,
 	for (const auto &idx : indices) {
 		if (idx.getType().isReal()) {
 			auto valueCnt = table.getInfo(idx.getColIndex().value())
-			                    .dimensionValueCnt();
+			                    .categories()
+			                    .size();
 			usedColumnIDs.insert(
 			    {static_cast<size_t>(idx.getColIndex().value()),
 			        usedValues.size()});
@@ -37,7 +38,7 @@ size_t DataStat::usedValueCntOf(const SeriesIndex &index) const
 	return 0;
 }
 
-void DataStat::trackIndex(const TableRow<double> &row,
+void DataStat::trackIndex(const DataTable::Row &row,
     const std::vector<SeriesIndex> &indices)
 {
 	for (auto i = 0U; i < indices.size(); ++i) {

src/data/datacube/datastat.h

@@ -9,8 +9,6 @@
 namespace Vizzu::Data
 {
 
-class DataTable;
-
 class DataStat
 {
 public:
@@ -21,7 +19,7 @@ class DataStat
 	size_t usedValueCntOf(const SeriesIndex &index) const;
 
 private:
-	void trackIndex(const TableRow<double> &row,
+	void trackIndex(const DataTable::Row &row,
 	    const std::vector<SeriesIndex> &indices);
 
 	void countValues();

src/data/table/columninfo.cpp

@@ -71,11 +71,9 @@ const ColumnInfo::Values &ColumnInfo::categories() const
 	return values;
 }
 
-size_t ColumnInfo::dimensionValueCnt() const { return values.size(); }
-
 std::string ColumnInfo::getName() const { return name; }
 
-std::string ColumnInfo::getUnit() const { return unit; }
+const std::string &ColumnInfo::getUnit() const { return unit; }
 
 Math::Range<double> ColumnInfo::getRange() const { return range; }
 

src/data/table/columninfo.h

@@ -10,7 +10,7 @@
 namespace Vizzu::Data
 {
 
-enum TextType : uint32_t { Number, String };
+enum class TextType : uint32_t { Number, String };
 
 class ColumnInfo
 {
@@ -34,10 +34,9 @@ class ColumnInfo
 	[[nodiscard]] ContiType getContiType() const;
 	[[nodiscard]] const ValueIndexes &dimensionValueIndexes() const;
 	[[nodiscard]] const Values &categories() const;
-	[[nodiscard]] size_t dimensionValueCnt() const;
 
 	[[nodiscard]] std::string getName() const;
-	[[nodiscard]] std::string getUnit() const;
+	[[nodiscard]] const std::string &getUnit() const;
 	[[nodiscard]] Math::Range<double> getRange() const;
 	[[nodiscard]] std::string toString() const;
 	[[nodiscard]] size_t minByteWidth() const;

src/data/table/datatable.cpp

@@ -1,17 +1,19 @@
 #include "datatable.h"
 
+#include "base/conv/auto_json.h"
+
 namespace Vizzu::Data
 {
 
-DataTable::DataTable() = default;
+DataTableOld::DataTableOld() = default;
 
-void DataTable::pushRow(const std::span<const char *> &cells)
+void DataTableOld::pushRow(const std::span<const char *> &cells)
 {
 	std::vector<std::string> strCells(cells.begin(), cells.end());
 	pushRow(TableRow<std::string>(std::move(strCells)));
 }
 
-void DataTable::pushRow(const TableRow<std::string> &textRow)
+void DataTableOld::pushRow(const TableRow<std::string> &textRow)
 {
 	Row row;
 	for (auto i = 0U; i < getColumnCount(); ++i) {
@@ -23,7 +25,7 @@ void DataTable::pushRow(const TableRow<std::string> &textRow)
 }
 
 template <typename T>
-DataTable::DataIndex DataTable::addTypedColumn(
+DataTableOld::DataIndex DataTableOld::addTypedColumn(
     const std::string &name,
     const std::string &unit,
     const std::span<T> &values)
@@ -83,14 +85,16 @@ DataTable::DataIndex DataTable::addTypedColumn(
 	return getIndex(ColumnIndex(colIndex));
 }
 
-DataTable::DataIndex DataTable::addColumn(const std::string &name,
+DataTableOld::DataIndex DataTableOld::addColumn(
+    const std::string &name,
     const std::string &unit,
     const std::span<const double> &values)
 {
 	return addTypedColumn(name, unit, values);
 }
 
-DataTable::DataIndex DataTable::addColumn(const std::string &name,
+DataTableOld::DataIndex DataTableOld::addColumn(
+    const std::string &name,
     const std::span<const char *> &categories,
     const std::span<const std::uint32_t> &values)
 {
@@ -101,29 +105,35 @@ DataTable::DataIndex DataTable::addColumn(const std::string &name,
 	return addTypedColumn<const char *>(name, {}, realValues);
 }
 
-const ColumnInfo &DataTable::getInfo(ColumnIndex index) const
+const ColumnInfo &DataTableOld::getInfo(ColumnIndex index) const
 {
 	return infos[index];
 }
 
-DataTable::DataIndex DataTable::getIndex(ColumnIndex index) const
+DataTableOld::DataIndex DataTableOld::getIndex(
+    ColumnIndex index) const
 {
 	return {index, infos[index].getType()};
 }
 
-ColumnIndex DataTable::getColumn(const std::string &name) const
+ColumnIndex DataTableOld::getColumn(const std::string &name) const
 {
 	auto it = indexByName.find(name);
 	if (it != indexByName.end()) return it->second;
 	throw std::logic_error("No column name exists: " + name);
 }
 
-DataTable::DataIndex DataTable::getIndex(
+DataTableOld::DataIndex DataTableOld::getIndex(
     const std::string &name) const
 {
 	return getIndex(getColumn(name));
 }
 
-size_t DataTable::columnCount() const { return infos.size(); }
+size_t DataTableOld::columnCount() const { return infos.size(); }
+
+std::string DataTableOld::getInfos() const
+{
+	return Conv::toJSON(infos);
+}
 
 }