From 0f038c1abc6f0e2b3b8edb2f0a3c1dec27260b81 Mon Sep 17 00:00:00 2001 From: Daniele Fucini Date: Thu, 19 Sep 2019 15:19:54 +0200 Subject: [PATCH] Clean code --- C/p001.c | 2 +- C/p002.c | 2 +- C/p004.c | 2 +- C/p006.c | 2 +- C/p008.c | 2 +- C/p010.c | 9 ++++++--- C/p011.c | 4 ++-- C/p012.c | 2 +- C/p015.c | 4 ++-- C/p016.c | 2 +- C/p017.c | 6 +++--- C/p018.c | 4 ++-- C/p019.c | 2 +- 13 files changed, 23 insertions(+), 20 deletions(-) diff --git a/C/p001.c b/C/p001.c index 9f23dcb..2df1027 100644 --- a/C/p001.c +++ b/C/p001.c @@ -22,7 +22,7 @@ int main(int argc, char **argv) elapsed = (end.tv_sec - start.tv_sec) + (double)(end.tv_nsec - start.tv_nsec) / 1000000000; - printf("Project Euler, Problem 1\n"); + printf("Project Euler, Problem 1\n"); printf("Answer: %d\n", sum); printf("Elapsed time: %.9lf seconds\n", elapsed); diff --git a/C/p002.c b/C/p002.c index 7b36133..2914b78 100644 --- a/C/p002.c +++ b/C/p002.c @@ -28,7 +28,7 @@ int main(int argc, char **argv) elapsed = (end.tv_sec - start.tv_sec) + (double)(end.tv_nsec - start.tv_nsec) / 1000000000; - printf("Project Euler, Problem 2\n"); + printf("Project Euler, Problem 2\n"); printf("Answer: %d\n", sum); printf("Elapsed time: %.9lf seconds\n", elapsed); diff --git a/C/p004.c b/C/p004.c index 879e911..76204e3 100644 --- a/C/p004.c +++ b/C/p004.c @@ -28,7 +28,7 @@ int main(int argc, char **argv) elapsed = (end.tv_sec - start.tv_sec) + (double)(end.tv_nsec - start.tv_nsec) / 1000000000; - printf("Project Euler, Problem 4\n"); + printf("Project Euler, Problem 4\n"); printf("Answer: %d\n", max); printf("Elapsed time: %.9lf seconds\n", elapsed); diff --git a/C/p006.c b/C/p006.c index 67b5862..617f8b9 100644 --- a/C/p006.c +++ b/C/p006.c @@ -22,7 +22,7 @@ int main(int argc, char **argv) elapsed = (end.tv_sec - start.tv_sec) + (double)(end.tv_nsec - start.tv_nsec) / 1000000000; - printf("Project Euler, Problem 6\n"); + printf("Project Euler, Problem 6\n"); printf("Answer: %d\n", square_sum-sum_squares); printf("Elapsed time: %.9lf seconds\n", elapsed); diff --git a/C/p008.c b/C/p008.c index 5b6649f..cc5b071 100644 --- a/C/p008.c +++ b/C/p008.c @@ -72,7 +72,7 @@ int main(int argc, char **argv) elapsed = (end.tv_sec - start.tv_sec) + (double)(end.tv_nsec - start.tv_nsec) / 1000000000; - printf("Project Euler, Problem 8\n"); + printf("Project Euler, Problem 8\n"); printf("Answer: %ld\n", max); printf("Elapsed time: %.9lf seconds\n", elapsed); diff --git a/C/p010.c b/C/p010.c index afb3b36..f86eb6a 100644 --- a/C/p010.c +++ b/C/p010.c @@ -14,8 +14,11 @@ int main(int argc, char **argv) struct timespec start, end; clock_gettime(CLOCK_MONOTONIC, &start); - - primes = sieve(N); + + if(primes = sieve(N) == NULL) + { + fprintf(stderr, "Error! Sieve function returned NULL\n"); + return 1; for(i = 0; i < N; i++) { @@ -33,7 +36,7 @@ int main(int argc, char **argv) printf("Project Euler, Problem 10\n"); printf("Answer: %ld\n", sum); - + printf("Elapsed time: %.9lf seconds\n", elapsed); return 0; diff --git a/C/p011.c b/C/p011.c index f6103e9..322cabb 100644 --- a/C/p011.c +++ b/C/p011.c @@ -4,7 +4,7 @@ int main(int argc, char **argv) { - int grid[][20] = {{8, 2, 22, 97, 38, 15, 0, 40, 0, 75, 4, 5, 7, 78, 52, 12, 50, 77, 91, 8}, + int grid[][20] = {{8, 2, 22, 97, 38, 15, 0, 40, 0, 75, 4, 5, 7, 78, 52, 12, 50, 77, 91, 8}, {49, 49, 99, 40, 17, 81, 18, 57, 60, 87, 17, 40, 98, 43, 69, 48, 4, 56, 62, 0}, {81, 49, 31, 73, 55, 79, 14, 29, 93, 71, 40, 67, 53, 88, 30, 03, 49, 13, 36, 65}, {52, 70, 95, 23, 4, 60, 11, 42, 69, 24, 68, 56, 1, 32, 56, 71, 37, 2, 36, 91}, @@ -59,7 +59,7 @@ int main(int argc, char **argv) max = prod; } } - + prod = 1; for(k = i; k < i + 4 && k < 20; k++) { diff --git a/C/p012.c b/C/p012.c index f1f8fbb..e420431 100644 --- a/C/p012.c +++ b/C/p012.c @@ -27,7 +27,7 @@ int main(int argc, char **argv) elapsed = (end.tv_sec - start.tv_sec) + (double)(end.tv_nsec - start.tv_nsec) / 1000000000; - printf("Project Euler, Problem 12\n"); + printf("Project Euler, Problem 12\n"); printf("Answer: %d\n", triang); printf("Elapsed time: %.9lf seconds\n", elapsed); diff --git a/C/p015.c b/C/p015.c index f760731..ed7c530 100644 --- a/C/p015.c +++ b/C/p015.c @@ -10,7 +10,7 @@ int main(int argc, char **argv) mpz_t count, tmp; clock_gettime(CLOCK_MONOTONIC, &start); - + mpz_inits(count, tmp, NULL); mpz_fac_ui(count, 40); mpz_fac_ui(tmp, 20); @@ -25,7 +25,7 @@ int main(int argc, char **argv) gmp_printf("Answer: %Zd\n", count); printf("Elapsed time: %.9lf seconds\n", elapsed); - + mpz_clears(count, tmp, NULL); return 0; diff --git a/C/p016.c b/C/p016.c index 9be74a9..9c3558e 100644 --- a/C/p016.c +++ b/C/p016.c @@ -31,7 +31,7 @@ int main(int argc, char **argv) gmp_printf("Answer: %Zd\n", sum); printf("Elapsed time: %.9lf seconds\n", elapsed); - + mpz_clears(p, sum, r, NULL); return 0; diff --git a/C/p017.c b/C/p017.c index 8976c6d..c5c2d44 100644 --- a/C/p017.c +++ b/C/p017.c @@ -18,7 +18,7 @@ int main(int argc, char **argv) { sum += n1_19[i]; } - + for(i = 0; i < 8; i++) { n20_90[i] *= 10; @@ -28,7 +28,7 @@ int main(int argc, char **argv) } sum += n20_90[i]; } - + for(i = 0; i < 9; i++) { n100_900[i] *= 100; @@ -42,7 +42,7 @@ int main(int argc, char **argv) } sum += n100_900[i] - 3; } - + sum += n1000; clock_gettime(CLOCK_MONOTONIC, &end); diff --git a/C/p018.c b/C/p018.c index 81e2c36..83e51a6 100644 --- a/C/p018.c +++ b/C/p018.c @@ -44,9 +44,9 @@ int main(int argc, char **argv) fscanf(fp, "%d", &triang[i-1][j]); } } - + fclose(fp); - + sum_triangle(triang, 15, 0, 0, 0); clock_gettime(CLOCK_MONOTONIC, &end); diff --git a/C/p019.c b/C/p019.c index 6bf977f..ce4f365 100644 --- a/C/p019.c +++ b/C/p019.c @@ -49,7 +49,7 @@ int main(int argc, char **argv) day = (day + 1) % 7; } month = (month + 1) % 12; - + if(month == jan) { year++;