diff --git a/.gitignore b/.gitignore index 6600a98..beb26d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ wordlists +bin/*.out +build/*.o diff --git a/Makefile b/Makefile index d98aed7..589b77f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ +INC := -I include + main: compile link compile: - g++ -c -o build/main.o src/main.cpp + g++ $(INC) -c -o build/main.o src/main.cpp + g++ $(INC) -c -o build/sorts.o src/sorts.cpp link: g++ -o bin/main.out build/*.o diff --git a/bin/main.out b/bin/main.out index 446ace6..f1ab970 100755 Binary files a/bin/main.out and b/bin/main.out differ diff --git a/build/main.o b/build/main.o index bce0179..ba8cc5d 100644 Binary files a/build/main.o and b/build/main.o differ diff --git a/include/sorts.h b/include/sorts.h index e69de29..d53cd3d 100644 --- a/include/sorts.h +++ b/include/sorts.h @@ -0,0 +1,21 @@ +#ifndef SORTS_H +#define SORTS_H + +#include +#include + +class Sorter +{ +private: + std::string filename; + std::vector wordList; +public: + void SetFileName(std::string newName); + std::string GetFileName(void); + void SetWordList(void); + void InsertionSort(void); + void MergeSort(void); + void HeapSort(void); +}; + +#endif \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 4d31658..f9efdb7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,9 @@ -#include +#include "sorts.h" -int main(void) +int main(int argc, char** argv) { - std::cout << "hello world\n"; + Sorter newSort; + newSort.SetFileName(argv[1]); + newSort.SetWordList(); return 0; } diff --git a/src/sorts.cpp b/src/sorts.cpp index e69de29..383078b 100644 --- a/src/sorts.cpp +++ b/src/sorts.cpp @@ -0,0 +1,44 @@ +#include "sorts.h" +#include +#include +#include +#include + +void Sorter::SetFileName(std::string newName) +{ + this->filename = newName; +} + +std::string Sorter::GetFileName(void) +{ + return this->filename; +} + +void Sorter::SetWordList(void) +{ + std::string bufferStr; + std::ifstream file(this->filename); + if (!file.is_open()) + { + std::cout << "Failed opening file\n"; + exit(1); + } + while (getline(file, bufferStr)) + wordList.push_back(bufferStr); + return; +} + +void Sorter::InsertionSort(void) +{ + ; +} + +void Sorter::MergeSort(void) +{ + ; +} + +void Sorter::HeapSort(void) +{ + ; +} \ No newline at end of file