Improve functions UpdateRow

morzhovets · May 14, 2024 · 764535d · 764535d
1 parent 9b38f69
commit 764535d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/include/momo/DataTable.h b/include/momo/DataTable.h
@@ -608,7 +608,8 @@ class DataTable
 	}
 
 	template<typename Item>
-	RowReference UpdateRow(ConstRowReference rowRef, const Column<Item>& column, Item&& newItem)
+	RowReference UpdateRow(ConstRowReference rowRef, const Column<Item>& column,
+		internal::Identity<Item>&& newItem)
 	{
 		TryResult res = pvTryUpdateRow(rowRef, column, std::move(newItem));
 		if (res.uniqueHashIndex != UniqueHashIndex::empty)
@@ -617,7 +618,8 @@ class DataTable
 	}
 
 	template<typename Item>
-	RowReference UpdateRow(ConstRowReference rowRef, const Column<Item>& column, const Item& newItem)
+	RowReference UpdateRow(ConstRowReference rowRef, const Column<Item>& column,
+		const internal::Identity<Item>& newItem)
 	{
 		TryResult res = pvTryUpdateRow(rowRef, column, newItem);
 		if (res.uniqueHashIndex != UniqueHashIndex::empty)
@@ -641,13 +643,15 @@ class DataTable
 	}
 
 	template<typename Item>
-	TryResult TryUpdateRow(ConstRowReference rowRef, const Column<Item>& column, Item&& newItem)
+	TryResult TryUpdateRow(ConstRowReference rowRef, const Column<Item>& column,
+		internal::Identity<Item>&& newItem)
 	{
 		return pvTryUpdateRow(rowRef, column, std::move(newItem));
 	}
 
 	template<typename Item>
-	TryResult TryUpdateRow(ConstRowReference rowRef, const Column<Item>& column, const Item& newItem)
+	TryResult TryUpdateRow(ConstRowReference rowRef, const Column<Item>& column,
+		const internal::Identity<Item>& newItem)
 	{
 		return pvTryUpdateRow(rowRef, column, newItem);
 	}

diff --git a/test/sources/SimpleDataSampler.cpp b/test/sources/SimpleDataSampler.cpp
@@ -44,22 +44,23 @@ namespace sample_data1
 		table.AddUniqueHashIndex(strCol, intCol);
 
 		table.AddRow(strCol = "b", intCol = 1, dblCol = 0.5);
-		table.AddRow(intCol = 2, dblCol = 0.5);	// strCol = ""
+		table.AddRow(intCol = 2, dblCol = 2.5);	// strCol = ""
 
 		table.TryAddRow(intCol = 2);	// not added because of unique index
 
 		std::cout << table.GetCount() << std::endl;	// 2
 
-		// table[0][dblCol] = 1.5;
-		table.UpdateRow(table[0], dblCol, 1.5);
+		// table[0][dblCol] returns `const double&`
+		std::cout << table[0][dblCol] << std::endl;	// 0.5
 
-		// table[1][strCol] = "a";
-		table.UpdateRow(table[1], strCol, std::string("a"));
+		// after adding the row can be modified by function `UpdateRow`
+		table.UpdateRow(table[0], dblCol, 1.5);
+		table.UpdateRow(table[1], strCol, "a");
 
 		for (auto row : table)
 			std::cout << row[intCol] << " " << row[dblCol] << " " << row[strCol] << std::endl;
 		// 1 1.5 b
-		// 2 0.5 a
+		// 2 2.5 a
 
 		{
 			// select by condition

diff --git a/test/sources/SimpleDataTester.cpp b/test/sources/SimpleDataTester.cpp
@@ -217,7 +217,7 @@ class SimpleDataTester
 		}
 
 		for (size_t i = 0; i < count; i += 2)
-			table.UpdateRow(table[i], strCol, std::string("0"));
+			table.UpdateRow(table[i], strCol, "0");
 
 		for (size_t i = 1; i < count; i += 2)
 		{