데이터 유형 추가.

WETSort/WETSort.cpp

@@ -27,9 +27,9 @@ const size_t testLength[] = {
 	1ULL << 24,
 	1ULL << 29,
 #else
-	1ULL << 31,
-	1ULL << 32,
-	1ULL << 33
+	1ULL << 31, // 2G (4G)
+	1ULL << 32, // 4G (8G)
+	1ULL << 33  // 8G (16G)
 #endif
 };
 
@@ -74,6 +74,8 @@ enum GenerateDataTypes
 	GenUniform16,
 	GenUniform16Xor,
 	GenUniform8,
+	GenUniform4,
+	GenUniform1,
 	GenUniform8Xor,
 	GenNormal64,
 	GenNormal32,
@@ -132,8 +134,7 @@ TestResult TestUnit(int index)
 	case insun:
 		fn = [](ElementType* items, size_t numItems)
 		{
-			// ERROR
-			//SunSort::SSort(items, &items[0], &items[numItems - 1], std::less<ElementType>());
+			SunSort::SSort(items, &items[0], &items[numItems - 1], std::less<ElementType>());
 		};
 		break;
 	case prauser:
@@ -287,6 +288,28 @@ void RunTest(size_t size, GenerateDataTypes type)
 			}
 		}
 		break;
+	case GenUniform4:
+		if (1)
+		{
+			printf("Generating random data... (%zu bytes, type: Uniform8)\n", size);
+			std::uniform_int_distribution<uint16_t> dist(0, 0xff);
+			for (size_t i = 0, e = size / sizeof(uint32_t); i < e; ++i)
+			{
+				reinterpret_cast<uint32_t*>(data0.data())[i] = dist(re) & 0x7;
+			}
+		}
+		break;
+	case GenUniform1:
+		if (1)
+		{
+			printf("Generating random data... (%zu bytes, type: Uniform8)\n", size);
+			std::uniform_int_distribution<uint16_t> dist(0, 0xff);
+			for (size_t i = 0, e = size / sizeof(uint32_t); i < e; ++i)
+			{
+				reinterpret_cast<uint32_t*>(data0.data())[i] = dist(re) & 0x1;
+			}
+		}
+		break;
 	case GenNormal64:
 		if (1)
 		{
@@ -317,7 +340,7 @@ void RunTest(size_t size, GenerateDataTypes type)
 	DoSortTest<2>();
 	// 3 bytes
 	DoSortTest<3>();
-	// 4 bytes
+	//4 bytes
 	DoSortTest<4>();
 	// 5 bytes
 	DoSortTest<5>();
@@ -355,6 +378,18 @@ int main()
 	testScore[prauser].error  = 1;
 	testScore[witdrg].error   = 1;
 
+	auto dataTypes = {
+				GenUniform32,
+				GenUniform16,
+				GenUniform16Xor,
+				GenUniform8,
+				GenUniform8Xor,
+				GenUniform4,
+				GenUniform1,
+				GenNormal64,
+				GenNormal32
+	};
+
 	auto PrintScore = [](int phase)
 	{
 		printf("------------ SCORE (%d/%d) --------------\n", phase, int(std::size(testLength)));
@@ -384,19 +419,10 @@ int main()
 	for (size_t n : testLength)
 	{
 		printf("========= Phase %d / %d (%zu) ==========\n", index, int(std::size(testLength)), n);
-		for (auto t : {
-				GenUniform32,
-				GenUniform16,
-				GenUniform16Xor,
-				GenUniform8,
-				GenUniform8Xor,
-				GenNormal64,
-				GenNormal32
-			 })
+		for (auto t : dataTypes)
 		{
 			RunTest(n, t);
 		}
-		//RunTest(n, GenNormal64);
 		PrintScore(index);
 		index++;
 	}

WETSort/WETSort.vcxproj

@@ -103,6 +103,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <StackReserveSize>134217728</StackReserveSize>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -118,6 +119,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <StackReserveSize>134217728</StackReserveSize>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -137,6 +139,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <StackReserveSize>134217728</StackReserveSize>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -156,6 +159,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <StackReserveSize>134217728</StackReserveSize>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

djarksnd

@@ -1 +1 @@
-Subproject commit fb7676ce27fc4a83d507f6e8078b896b87745817
+Subproject commit 367c4bf3c9e18765f0f1086d345d818886f2ebfa

insun

@@ -1 +1 @@
-Subproject commit 8c1a3c74ebf712341707d138111e5aa0bdcbc3af
+Subproject commit 47dc36c71c1c47cb7d45ff7f7288f5868d67243b