no message

TestApp1/TestApp1.cpp

@@ -9,7 +9,7 @@
 #include <DK.h>
 
 
-#define MAX_SIZE 50000000ULL
+#define MAX_SIZE 80000000ULL
 
 struct Value64
 {
@@ -60,9 +60,11 @@ void DoTest(bool dkFirst, Rand&& r)
 	
 	DKThread::Sleep(0.2);
 
-	auto testSTL = [](T* val, size_t len)->DKHashResultSHA1
+	using ResultTuple = DKTuple<DKHashResultSHA1, double>;
+
+	auto testSTL = [](T* val, size_t len)->ResultTuple
 	{
-		DKLogI("Sorting by std::sort...");
+		DKLog("Sorting by std::sort...");
 		DKTimer timer;
 		timer.Reset();
 		std::sort(val, val + len, [](const auto& lhs, const auto& rhs)->bool
@@ -73,12 +75,12 @@ void DoTest(bool dkFirst, Rand&& r)
 		DKLogW("std::sort: %f", e1);
 		auto hash = DKHashSHA1(val, sizeof(T) * len);
 		DKLog("std::sort hash: %ls", (const wchar_t*)hash.String());
-		return hash;
+		return ResultTuple::Make(hash, e1);
 	};
 
-	auto testDK = [](T* val, size_t len)->DKHashResultSHA1
+	auto testDK = [](T* val, size_t len)->ResultTuple
 	{
-		DKLogI("Sorting by DKStaticArray::Sort...");
+		DKLog("Sorting by DKStaticArray::Sort...");
 		DKStaticArray<T> tmp(val, len);
 		DKTimer timer;
 		timer.Reset();
@@ -86,24 +88,34 @@ void DoTest(bool dkFirst, Rand&& r)
 		{
 			return lhs < rhs;
 		});
-		double e2 = timer.Elapsed();
-		DKLogW("DKStaticArray::Sort: %f (SwapMethod:%d)", e2, tmp.SwapMethod);
+		double e1 = timer.Elapsed();
+		DKLogW("DKStaticArray::Sort: %f (SwapMethod:%d)", e1, tmp.SwapMethod);
 		auto hash = DKHashSHA1(val, sizeof(T) * len);
 		DKLog("DKStaticArray::Sort hash: %ls", (const wchar_t*)hash.String());
-		return hash;
+		return ResultTuple::Make(hash, e1);
 	};
 
 	if (dkFirst)
 	{
-		auto hash1 = testDK(val1, MAX_SIZE);
-		auto hash2 = testSTL(val2, MAX_SIZE);
-		DKLog("Hash compare: %d", hash1.Compare(hash2));
+		auto result1 = testDK(val1, MAX_SIZE);
+		auto result2 = testSTL(val2, MAX_SIZE);
+		if (result1.Value<0>().Compare(result2.Value<0>()))
+			DKLogE("Hash Compare: %d (ERROR)", result1.Value<0>().Compare(result2.Value<0>()));
+		else
+			DKLogI("Hash compare: %d (time: %f)",
+				  result1.Value<0>().Compare(result2.Value<0>()),
+				  result1.Value<1>() - result2.Value<1>());
 	}
 	else
 	{
-		auto hash1 = testSTL(val1, MAX_SIZE);
-		auto hash2 = testDK(val2, MAX_SIZE);
-		DKLog("Hash compare: %d", hash1.Compare(hash2));
+		auto result1 = testDK(val1, MAX_SIZE);
+		auto result2 = testSTL(val2, MAX_SIZE);
+		if (result1.Value<0>().Compare(result2.Value<0>()))
+			DKLogE("Hash Compare: %d (ERROR)", result1.Value<0>().Compare(result2.Value<0>()));
+		else
+			DKLogI("Hash compare: %d (time: %f)",
+				  result1.Value<0>().Compare(result2.Value<0>()),
+				  result1.Value<1>() - result2.Value<1>());
 	}
 
 	delete[] val1;
@@ -125,13 +137,13 @@ int main(int argc, const char * argv[])
 
 	DoTest<Value64>(true, []()->Value64
 	{
-		Value64 val;
+		Value64 val = { 0 };
 		val.num = DKRandom();
 		return val;
 	});
 	DoTest<Value16>(true, []()->Value16
 	{
-		Value16 val;
+		Value16 val = { 0 };
 		val.num = DKRandom();
 		return val;
 	});