Починил, понял, что неверно работает функция
This commit is contained in:
parent
610ed3990a
commit
c14c8ef9c2
4 changed files with 64 additions and 70 deletions
|
@ -1,5 +1,36 @@
|
|||
#include "tools.h"
|
||||
|
||||
points getPoints(void) {
|
||||
int fileOrRandom;
|
||||
|
||||
printf("0 - if points from file\n1 - if random generation of points\nYour choice: ");
|
||||
|
||||
if (scanf("%d", &fileOrRandom) < 1) {
|
||||
printf("Enter error!\n");
|
||||
return (points){NULL, 0};
|
||||
}
|
||||
|
||||
if (fileOrRandom == 0) {
|
||||
return getPointsFromFile();
|
||||
} else if (fileOrRandom == 1) {
|
||||
return getRandomPoints();
|
||||
} else {
|
||||
printf("Wrong enter!\n");
|
||||
return (points){NULL, 0};
|
||||
}
|
||||
}
|
||||
|
||||
points getPointsFromFile(void) {
|
||||
FILE * file = getFile();
|
||||
points pts = (points){NULL, 0};
|
||||
|
||||
if (file == NULL) return (points){NULL, 0};
|
||||
pts = getFilePoints(file);
|
||||
|
||||
fclose(file);
|
||||
return pts;
|
||||
}
|
||||
|
||||
FILE * getFile(void) {
|
||||
char filename[50];
|
||||
|
||||
|
@ -18,7 +49,7 @@ FILE * getFile(void) {
|
|||
}
|
||||
}
|
||||
|
||||
points * getFilePoints(FILE * file) {
|
||||
points getFilePoints(FILE * file) {
|
||||
int i, size = 2;
|
||||
point * array = NULL;
|
||||
point p;
|
||||
|
@ -26,7 +57,7 @@ points * getFilePoints(FILE * file) {
|
|||
|
||||
if (fscanf(file, "%lf", ¤t) != 1) {
|
||||
printf("File is empty!\n");
|
||||
return NULL;
|
||||
return (points){NULL, 0};
|
||||
}
|
||||
|
||||
array = (point *)malloc(size * sizeof(point));
|
||||
|
@ -36,7 +67,7 @@ points * getFilePoints(FILE * file) {
|
|||
if (++i / 2 >= size) {
|
||||
size *= 2;
|
||||
array = (point *)realloc(array, size * sizeof(point));
|
||||
if (array == NULL) return NULL;
|
||||
if (array == NULL) return (points){NULL, 0};
|
||||
}
|
||||
|
||||
if (i % 2 == 1) {
|
||||
|
@ -48,72 +79,40 @@ points * getFilePoints(FILE * file) {
|
|||
if (i == 0) {
|
||||
printf("Array is empty!\n");
|
||||
free(array);
|
||||
return NULL
|
||||
return (points){NULL, 0};
|
||||
}
|
||||
|
||||
return &(points){array, (i + 1) / 2};
|
||||
return (points){array, (i + 1) / 2};
|
||||
}
|
||||
|
||||
points * GetPointsFromFile(void) {
|
||||
FILE * file = getFile();
|
||||
points * pts = NULL;
|
||||
|
||||
if (file == NULL) return NULL;
|
||||
getFilePoints(file)
|
||||
|
||||
fclose(file);
|
||||
return pts;
|
||||
}
|
||||
|
||||
points * getRandomPoints(void) {
|
||||
points * pts = &(points){.array=NULL, .length=0};
|
||||
points getRandomPoints(void) {
|
||||
points pts = (points){.array=NULL, .length=0};
|
||||
int length;
|
||||
|
||||
printf("Enter the number of points: ");
|
||||
if (scanf("%d", &length) < 1) return NULL;
|
||||
pts->length = length;
|
||||
if (scanf("%d", &length) < 1) return pts;
|
||||
pts.length = length;
|
||||
|
||||
pts->array = (point *)malloc(length * sizeof(point));
|
||||
if (pts->array == NULL) return NULL;
|
||||
pts.array = (point *)malloc(length * sizeof(point));
|
||||
if (pts.array == NULL) return pts;
|
||||
|
||||
generate(pts);
|
||||
generatePoints(&pts);
|
||||
|
||||
return pts
|
||||
return pts;
|
||||
}
|
||||
|
||||
points * getPoints(void) {
|
||||
int fileOrRandom;
|
||||
void generatePoints(points * pts) {
|
||||
srand(time(NULL));
|
||||
|
||||
printf("0 - if points from file\n1 - if random generation of points\nYour choice: ");
|
||||
|
||||
if (scanf("%d", &fileOrRandom) < 1) {
|
||||
printf("Wrong enter!\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (fileOrRandom == 0) {
|
||||
return getPointsFromFile();
|
||||
} else (fileOrRandom == 1) {
|
||||
return getRandomPoints();
|
||||
} else {
|
||||
printf("Wrong enter!\n");
|
||||
return NULL;
|
||||
for (int i = 0; i < pts->length; i++) {
|
||||
(pts->array[i]).x = (rand() % (2*MAX_RAND_COORD + 1) - MAX_RAND_COORD) * RAND_MULTIPLIER;
|
||||
(pts->array[i]).y = (rand() % (2*MAX_RAND_COORD + 1) - MAX_RAND_COORD) * RAND_MULTIPLIER;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void printPoints(points pts) {
|
||||
for (int i = 0; i < ((MAX_PRINT_POINTS < pts.length) ? MAX_PRINT_POINTS : pts.length); ++i) {
|
||||
printf("%c = (%.4lf, %.4lf)\n", i + ASCII_FIRST_LETTER, pts.array[i].x, pts.array[i].y);
|
||||
}
|
||||
}
|
||||
|
||||
void generate(points * pts)
|
||||
{
|
||||
srand(time(NULL));
|
||||
|
||||
for (int i = 0; pts->length; i++)
|
||||
{
|
||||
(pts->array[i]).x = (rand() % (2*MAX_RAND_COORD + 1) - MAX_RAND_COORD) * RAND_MULTIPLIER;
|
||||
(pts->array[i]).y = (rand() % (2*MAX_RAND_COORD + 1) - MAX_RAND_COORD) * RAND_MULTIPLIER;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue