From ca827dcc712378dae759100fd6dac161551688d3 Mon Sep 17 00:00:00 2001 From: Rory Healy Date: Thu, 12 Aug 2021 20:41:48 +1000 Subject: [PATCH] checks for input, restructured project files --- Makefile | 2 + data/dataset_1.csv => dataset_1.csv | 0 data/dataset_10.csv => dataset_10.csv | 0 data/dataset_100.csv => dataset_100.csv | 0 data/dataset_2.csv => dataset_2.csv | 0 data/dataset_full.csv => dataset_full.csv | 0 data/poly_1split.txt => poly_1split.txt | 0 data/poly_2split.txt => poly_2split.txt | 0 data/poly_3split.txt => poly_3split.txt | 0 data/poly_4split.txt => poly_4split.txt | 0 data/poly_5split.txt => poly_5split.txt | 0 ...gon_irregular.txt => polygon_irregular.txt | 0 data/polygon_square.txt => polygon_square.txt | 0 data/square_1split.txt => square_1split.txt | 0 data/square_2split.txt => square_2split.txt | 0 voronoi.c | 42 ++++++++++++++++++ voronoi.h | 2 + voronoi1 | Bin 16696 -> 20040 bytes voronoi1.c | 6 --- 19 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 Makefile rename data/dataset_1.csv => dataset_1.csv (100%) rename data/dataset_10.csv => dataset_10.csv (100%) rename data/dataset_100.csv => dataset_100.csv (100%) rename data/dataset_2.csv => dataset_2.csv (100%) rename data/dataset_full.csv => dataset_full.csv (100%) rename data/poly_1split.txt => poly_1split.txt (100%) rename data/poly_2split.txt => poly_2split.txt (100%) rename data/poly_3split.txt => poly_3split.txt (100%) rename data/poly_4split.txt => poly_4split.txt (100%) rename data/poly_5split.txt => poly_5split.txt (100%) rename data/polygon_irregular.txt => polygon_irregular.txt (100%) rename data/polygon_square.txt => polygon_square.txt (100%) rename data/square_1split.txt => square_1split.txt (100%) rename data/square_2split.txt => square_2split.txt (100%) create mode 100644 voronoi.c create mode 100644 voronoi.h delete mode 100644 voronoi1.c 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 009550d20d12bc49b33e628ff268f3ae5fe9723d..196cd80ff21f9f666bbe13afa56ee9a3b1bb4f2a 100644 GIT binary patch literal 20040 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 MTjNtM0~ag)6YP!^jsO4v delta 2325 zcmZ`)eQZ-z6u)4VB@|B?5kP)Vv8(U{E zkuZiR4J=tX#P~ss6JwYW0uGb@LmXgqL?SGHYc#{CDTrYpL@-D_x4lUovvp(-2z*UGvRZiHH&n#Z+t@S?NXPJ?!HhjRGH?(Gp5E> z5=jOj;S%ge#F>!3ymkx0(bB|1csP8!X0H2{q%bzkPM|!cni^nxiao=~xeTUYYl~y!v3qRh+92dQTz5Z7Y#_V+hq}QP2lXJq*fkg>3p>lgi}XVbh*}c^>l1IPAz>Z z9uFZFBOXNbAf7;MK-_@1_*y)E4siqG6~uFhizpm*73RmT#^Y>*WO-_$5@w^g2-^_a zUGSUh0lEhiw|!YZ>bz7Ko6N$t4_hlPF_#%?GUXSf>Wq}f(oUfINriEqe5Z|oUTx* z6|SLi9riYZ4Y%p`*m0X~kIi5wHLx~wyvH?mf=j}M2 zpxVgvnWqyhjGjLP2^w~vaK3mrg#CwvkVC{vDeTu!pu|DM4Ga4bta6E@!&j9`ZYs*z zxVK5ZH-62;4%BDQ?ZigYWm(H3X}wn-{7J)y1T_ZBuKg z6+Wvf0b6y2+}ymex3{@B)Y=mwovrOp!-4AR(O;|cDDwLa-Efy=e3 zA__&|0MN=D@YKyxM5zeOg!VcO9Cb35$w-~1h`JOw2A6RBWgK@vk-h_dGRUxA&w`J2 z#p35D<%f%UnWc$qO{mQSJt$|3lN7j{!jnNYO*p}k(Sh@6eWaDACYWc(OhL`~%RIJj4o{qr70`GxAxzM@MJmm@!v^lna^ z(4EE%ur&B0$BeMA(Q5PaK?nas%tx*Y?>82kmn3JUz@^5rw8xhwHN1{@Y6|`aS$oLe 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; -}