Finished Insertion Sort and fixed Output naming
This commit is contained in:
Vendored
+2
@@ -1,3 +1,5 @@
|
|||||||
wordlists
|
wordlists
|
||||||
|
test/OUTPUT
|
||||||
bin/*.out
|
bin/*.out
|
||||||
build/*.o
|
build/*.o
|
||||||
|
*.swp
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -24,6 +24,8 @@ public:
|
|||||||
void PrintToFile(std::string outputFilename);
|
void PrintToFile(std::string outputFilename);
|
||||||
void InsertionSort(void);
|
void InsertionSort(void);
|
||||||
void MergeSort(void);
|
void MergeSort(void);
|
||||||
|
void __MergeSort__(void);
|
||||||
|
void __Merge__(void);
|
||||||
void HeapSort(void);
|
void HeapSort(void);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
+24
-2
@@ -76,7 +76,7 @@ void Sorter::PrintToFile(std::string outputFilename)
|
|||||||
{
|
{
|
||||||
std::string outputPath = "test/OUTPUT/";
|
std::string outputPath = "test/OUTPUT/";
|
||||||
outputPath += outputFilename;
|
outputPath += outputFilename;
|
||||||
outputPath += std::to_string(lineCount % 1000);
|
outputPath += std::to_string(lineCount / 1000);
|
||||||
outputPath += "K.txt";
|
outputPath += "K.txt";
|
||||||
std::ofstream file(outputPath);
|
std::ofstream file(outputPath);
|
||||||
if (!file.is_open())
|
if (!file.is_open())
|
||||||
@@ -91,7 +91,19 @@ void Sorter::PrintToFile(std::string outputFilename)
|
|||||||
|
|
||||||
void Sorter::InsertionSort(void)
|
void Sorter::InsertionSort(void)
|
||||||
{
|
{
|
||||||
;
|
int i;
|
||||||
|
std::string key;
|
||||||
|
for (int j = 1; j < lineCount; j++)
|
||||||
|
{
|
||||||
|
key = newWordList[j];
|
||||||
|
i = j - 1;
|
||||||
|
while ((i >= 0) && (newWordList[i] > key))
|
||||||
|
{
|
||||||
|
newWordList[i + 1] = newWordList[i];
|
||||||
|
i = i - 1;
|
||||||
|
}
|
||||||
|
newWordList[i + 1] = key;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sorter::MergeSort(void)
|
void Sorter::MergeSort(void)
|
||||||
@@ -99,6 +111,16 @@ void Sorter::MergeSort(void)
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Sorter::__MergeSort__(void)
|
||||||
|
{
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Sorter::__Merge__(void)
|
||||||
|
{
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
void Sorter::HeapSort(void)
|
void Sorter::HeapSort(void)
|
||||||
{
|
{
|
||||||
;
|
;
|
||||||
|
|||||||
-15000
File diff suppressed because it is too large
Load Diff
-15000
File diff suppressed because it is too large
Load Diff
-15000
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user