From 04045bae520b9ba906a3a25eb6c0b97a770d117c Mon Sep 17 00:00:00 2001
From: mika <mika@mika-ideacentre-Y710-Cube-15ISH>
Date: Thu, 15 Nov 2018 08:02:51 +0100
Subject: [PATCH] seg fault fix
---
src/constant-workspace-algorithms-c.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/constant-workspace-algorithms-c.c b/src/constant-workspace-algorithms-c.c
index a1b0d6c..185fcfe 100644
--- a/src/constant-workspace-algorithms-c.c
+++ b/src/constant-workspace-algorithms-c.c
@@ -12,6 +12,7 @@
#include <stdlib.h>
#include <math.h>
#include <stdint.h>
+#include <time.h>
/* Image parameters */
#define W 1000
@@ -59,21 +60,29 @@ int main(int argc, char *argv[]) {
//create_image();
//write_ppm ( "sine.ppm" );
int numberOfPoints = 10;
- puts("!!!Hello World!!!"); /* prints !!!Hello World!!! */
- printf("%d\n", RAND_MAX);
+ if(argc > 0) {
+ //printf("%s\n", argv[0]);
+ }
+ //printf("%d\n", argc);
+ if(argc == 2) {
+ //printf("%s\n", argv[1]);
+ numberOfPoints = atoi(argv[1]);
+ }
+ //puts("!!!Hello World!!!"); /* prints !!!Hello World!!! */
+ //printf("%d\n", RAND_MAX);
vertex points[numberOfPoints];
generatePoints(points, numberOfPoints);
drawPoints(points, numberOfPoints);
for(int i = 0; i < numberOfPoints; i++) {
- printf("%f, %f\n", points[i].x, points[i].y);
+ //printf("%f, %f\n", points[i].x, points[i].y);
}
FILE *out = fopen ( "delaunay.html", "w" );
writeSvgStart ( out );
delaunayCws(points, numberOfPoints, out);
writeSvgEnd ( out );
fclose(out);
- readFile("test.txt", "r");
+ //readFile("test.txt", "r");
return EXIT_SUCCESS;
}
@@ -262,7 +271,7 @@ circle circle_vvv(vertex v1, vertex v2, vertex v3)
printf("%f, %f - %f, %f - %f, %f\n", triangle.a.x, triangle.a.y, triangle.b.x, triangle.b.y, triangle.c.x, triangle.c.y);
}*/
void printPoint(vertex point) {
- printf("%f, %f\n", point.x, point.y);
+ //printf("%f, %f\n", point.x, point.y);
}
void generatePoints(vertex points[], int sizeOfPoints) {
@@ -289,7 +298,7 @@ void readFile(char* location, char* rw){
f=fopen("test.txt","rt");
while((c=fgetc(f))!=EOF){
- printf("%c",c);
+ //printf("%c",c);
}
fclose(f);
@@ -458,19 +467,19 @@ void delaunayCws(vertex* S, int size, FILE *out) {
/*if(k == j1) {
break;
}*/
- printf("%d, %d, %d, %d\n", i, j, k, isTriangle);
+ //printf("%d, %d, %d, %d\n", i, j, k, isTriangle);
if(i < j && i < k) {
if(isTriangle == 2){
vertex tri[3] = {S[i], S[j], S[k]};
reportTriangle(tri, 3, out);
}
}
- printf("j = %d, k = %d\n", j, k);
+ //printf("j = %d, k = %d\n", j, k);
//printf("jAlreadyUsed = ");
/*for(int a = 0; a < numberOfJ; a++) {
printf("%d, ", jAlreadyUsed[a]);
}*/
- printf("\n");
+ //printf("\n");
//j1 = j;
j = k;
} while(/*!arrayContains(jAlreadyUsed, numberOfJ, j)*/ j != j0);
--
GitLab