diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..cda8daa --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +voronoi1 : voronoi.c + gcc -Wall -Wextra -pedantic -g -o voronoi1 voronoi.c diff --git a/data/dataset_1.csv b/dataset_1.csv similarity index 100% rename from data/dataset_1.csv rename to dataset_1.csv diff --git a/data/dataset_10.csv b/dataset_10.csv similarity index 100% rename from data/dataset_10.csv rename to dataset_10.csv diff --git a/data/dataset_100.csv b/dataset_100.csv similarity index 100% rename from data/dataset_100.csv rename to dataset_100.csv diff --git a/data/dataset_2.csv b/dataset_2.csv similarity index 100% rename from data/dataset_2.csv rename to dataset_2.csv diff --git a/data/dataset_full.csv b/dataset_full.csv similarity index 100% rename from data/dataset_full.csv rename to dataset_full.csv diff --git a/data/poly_1split.txt b/poly_1split.txt similarity index 100% rename from data/poly_1split.txt rename to poly_1split.txt diff --git a/data/poly_2split.txt b/poly_2split.txt similarity index 100% rename from data/poly_2split.txt rename to poly_2split.txt diff --git a/data/poly_3split.txt b/poly_3split.txt similarity index 100% rename from data/poly_3split.txt rename to poly_3split.txt diff --git a/data/poly_4split.txt b/poly_4split.txt similarity index 100% rename from data/poly_4split.txt rename to poly_4split.txt diff --git a/data/poly_5split.txt b/poly_5split.txt similarity index 100% rename from data/poly_5split.txt rename to poly_5split.txt diff --git a/data/polygon_irregular.txt b/polygon_irregular.txt similarity index 100% rename from data/polygon_irregular.txt rename to polygon_irregular.txt diff --git a/data/polygon_square.txt b/polygon_square.txt similarity index 100% rename from data/polygon_square.txt rename to polygon_square.txt diff --git a/data/square_1split.txt b/square_1split.txt similarity index 100% rename from data/square_1split.txt rename to square_1split.txt diff --git a/data/square_2split.txt b/square_2split.txt similarity index 100% rename from data/square_2split.txt rename to square_2split.txt diff --git a/voronoi.c b/voronoi.c new file mode 100644 index 0000000..29a247b --- /dev/null +++ b/voronoi.c @@ -0,0 +1,42 @@ +#include +#include +#include "voronoi.h" + +int main(int argc, char **argv) { + FILE *dataset = NULL, *polygonData = NULL, *output = NULL; + checkInputArgs(argc, argv, &dataset, &polygonData, &output); + + fclose(dataset); + fclose(polygonData); + fclose(output); + return 0; +} + +void checkInputArgs(int argc, char **argv, FILE **datasetFile, \ +FILE **polygonFile, FILE **outputFile) { + char *openFileError = "Error: Unable to open file %s\n"; + char *numFilesError = "Error: Incorrect number of inputs (3 required).\n"; + + if (argc != 4) { + fputs(numFilesError, stderr); + exit(EXIT_FAILURE); + } + + *datasetFile = fopen(argv[1], "r"); + if (*datasetFile == NULL) { + fprintf(stderr, openFileError, argv[1]); + exit(EXIT_FAILURE); + } + + *polygonFile = fopen(argv[2], "r"); + if (*polygonFile == NULL) { + fprintf(stderr, openFileError, argv[2]); + exit(EXIT_FAILURE); + } + + *outputFile = fopen(argv[3], "w"); + if (*outputFile == NULL) { + fprintf(stderr, openFileError, argv[3]); + exit(EXIT_FAILURE); + } +} diff --git a/voronoi.h b/voronoi.h new file mode 100644 index 0000000..2d45b10 --- /dev/null +++ b/voronoi.h @@ -0,0 +1,2 @@ +void checkInputArgs(int argc, char **argv, FILE **datasetFile, \ +FILE **polygonFile, FILE **outputFile); diff --git a/voronoi1 b/voronoi1 index 009550d..196cd80 100644 Binary files a/voronoi1 and b/voronoi1 differ diff --git a/voronoi1.c b/voronoi1.c deleted file mode 100644 index fff9b5d..0000000 --- a/voronoi1.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main(int argc, char **argv) { - puts("Hello World!"); - return 0; -}