DataTableNative

morzhovets · Jul 7, 2024 · e6baf71 · e6baf71
1 parent ae546cc
commit e6baf71
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
diff --git a/include/momo/DataColumn.h b/include/momo/DataColumn.h
@@ -1508,10 +1508,7 @@ class DataColumnListStatic
 	MutableOffsets mMutableOffsets;
 };
 
-template<conceptDataStructWithMembers TStruct,
-	conceptMemManager TMemManager = MemManagerDefault,
-	typename TSettings = DataSettings<>>
-using DataColumnListNative = DataColumnListStatic<TStruct,
-	DataColumnInfoNative<TStruct>, TMemManager, TSettings>;
+template<conceptDataStructWithMembers TStruct>
+using DataColumnListNative = DataColumnListStatic<TStruct, DataColumnInfoNative<TStruct>>;
 
 } // namespace momo
diff --git a/include/momo/DataTable.h b/include/momo/DataTable.h
@@ -12,6 +12,7 @@
     concept conceptDataTraits
     class DataTraits
     class DataTable
+    class DataTableNative
 
 \**********************************************************/
 
@@ -1549,4 +1550,8 @@ class DataTable
 	Indexes mIndexes;
 };
 
+template<conceptDataStructWithMembers TStruct,
+	conceptDataTraits TDataTraits = DataTraits>
+using DataTableNative = DataTable<DataColumnListNative<TStruct>, TDataTraits>;
+
 } // namespace momo
diff --git a/test/sources/SimpleDataSampler.cpp b/test/sources/SimpleDataSampler.cpp
@@ -84,14 +84,11 @@ namespace sample_data2
 		double dblCol;
 		std::string strCol;
 	};
-
-	using ColumnList = momo::DataColumnListNative<Struct>;
-	using Table = momo::DataTable<ColumnList>;
 */
 	void Sample(std::ostream& output)
 	{
 		// in this sample the list of columns is specified in accordance with the `Struct` struct
-		Table table;	// construct empty table with 3 columns
+		momo::DataTableNative<Struct> table;	// construct empty table with 3 columns
 
 		// unique index (primary key)
 		table.AddUniqueHashIndex(&Struct::strCol, &Struct::intCol);
@@ -278,8 +275,7 @@ namespace sample_data5
 		std::string strCol{};
 	};
 
-	using ColumnList = momo::DataColumnListNative<Struct>;
-	using Table = momo::DataTable<ColumnList>;
+	using Table = momo::DataTableNative<Struct>;
 */
 	void Sample(std::ostream& output)
 	{

diff --git a/test/sources/SimpleDataSampler.h b/test/sources/SimpleDataSampler.h
@@ -31,9 +31,6 @@ namespace sample_data2
 		double dblCol;
 		std::string strCol;
 	};
-
-	using ColumnList = momo::DataColumnListNative<Struct>;
-	using Table = momo::DataTable<ColumnList>;
 }
 
 namespace sample_data3
@@ -72,6 +69,5 @@ namespace sample_data5
 		std::string strCol{};
 	};
 
-	using ColumnList = momo::DataColumnListNative<Struct>;
-	using Table = momo::DataTable<ColumnList>;
+	using Table = momo::DataTableNative<Struct>;
 }
diff --git a/test/sources/SimpleDataTester.cpp b/test/sources/SimpleDataTester.cpp
@@ -55,7 +55,8 @@ class SimpleDataTester
 	{
 		{
 			std::cout << "momo::DataColumnListNative (-RowNumber): " << std::flush;
-			typedef momo::DataColumnListNative<Struct, momo::MemManagerDict<>> DataColumnList;
+			typedef momo::DataColumnListStatic<Struct, momo::DataColumnInfoNative<Struct>,
+				momo::MemManagerDict<>> DataColumnList;
 			DataColumnList columnList;
 			columnList.SetMutable(&Struct::dblStruct);
 			columnList.PrepareForVisitors(&Struct::intStruct, &Struct::dblStruct, &Struct::strStruct);
@@ -503,9 +504,9 @@ class SimpleDataTester
 		if constexpr (!dynamic)
 		{
 			Row row = table.NewRow(Struct{ .intStruct = 1, .dblStruct = 3.5, .strStruct = "2" });
-			assert(row[intCol] == 1);
-			assert(row[dblCol] == 3.5);
-			assert(row[strCol] == "2");
+			assert(row->intStruct == 1);
+			assert(row->dblStruct == 3.5);
+			assert(row->strStruct == "2");
 		}
 	}
 };