42/42_EXT_05_computorv1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pure quadratic is working

Browse Source
This commit is contained in:
hugogogo
2026-05-14 23:43:58 +02:00
parent 6c6accc289
commit aa78af4e0f
7 changed files with 83 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -108,7 +108,7 @@ run: $(NAME)
test: $(NAME) test: $(NAME)
@echo $(B_PURPLE)"\n---------------------------------------------\nlaunch tests\n"$(RESET) @echo $(B_PURPLE)"\n---------------------------------------------\nlaunch tests\n"$(RESET)
-@bash tester.sh -@bash tester.sh --skip-reduced
clean: clean:
$(RM_OBJS) $(RM_OBJS)

11
headers/computorv1.h
View File

@@ -164,10 +164,12 @@ typedef struct
e_radicand_sign radicand_sign; // RADICAND_PLUS or RADICAND_MINUS or RADICAND_ZERO e_radicand_sign radicand_sign; // RADICAND_PLUS or RADICAND_MINUS or RADICAND_ZERO
double radicand_absolute; // |radicand| double radicand_absolute; // |radicand|
double radicand_sqrt; // √|radicand| double radicand_sqrt; // √|radicand|
double numerator_sqrt; // √a double numerator; // |c|
bool numerator_sqrt_is_int; // false if √a is a double double numerator_sqrt; // √c
double denominator_sqrt; // √c bool numerator_sqrt_is_int; // false if √c is a double
bool denominator_sqrt_is_int; // false if √c is a double double denominator; // |a|
double denominator_sqrt; // √a
bool denominator_sqrt_is_int; // false if √a is a double
} s_solution_degree_2_pure; } s_solution_degree_2_pure;
typedef struct typedef struct
@@ -188,6 +190,7 @@ void solve(const s_polynom *polynom, s_solution *solution);
* UTILS/MATH.C * UTILS/MATH.C
*/ */
bool is_nearly_equal(double num, int compare);
bool is_nearly_equal_zero(double num); bool is_nearly_equal_zero(double num);
bool has_decimal_part(double num); bool has_decimal_part(double num);
bool any_has_decimal_part(double *num, size_t len); bool any_has_decimal_part(double *num, size_t len);

72
src/printer_solutions.c
View File

@@ -33,26 +33,42 @@ static void print_solution_pure_radicand_positiv(s_solution_degree_2_pure soluti
numerator = solution.numerator_sqrt; numerator = solution.numerator_sqrt;
denominator = solution.denominator_sqrt; denominator = solution.denominator_sqrt;
reduce_fraction(&numerator, &denominator); reduce_fraction(&numerator, &denominator);
printf("%g/%g\n", numerator, denominator); if (is_nearly_equal(denominator, 1))
printf("-%g/%g\n", numerator, denominator); {
printf("%g\n", numerator);
printf("-%g\n", numerator);
}
else
{
printf("%g/%g\n", numerator, denominator);
printf("-%g/%g\n", numerator, denominator);
}
} }
else if (solution.numerator_sqrt_is_int) else if (solution.numerator_sqrt_is_int)
{ {
printf("%g/√(%g)\n", solution.numerator_sqrt, solution.c); printf("%g/√(%g)\n", solution.numerator_sqrt, solution.denominator);
printf("-%g/√(%g)\n", solution.numerator_sqrt, solution.c); printf("-%g/√(%g)\n", solution.numerator_sqrt, solution.denominator);
} }
else if (solution.denominator_sqrt_is_int) else if (solution.denominator_sqrt_is_int)
{ {
printf("√(%g)/%g\n", solution.a, solution.denominator_sqrt); printf("√(%g)/%g\n", solution.numerator, solution.denominator_sqrt);
printf("-√(%g)/%g\n", solution.a, solution.denominator_sqrt); printf("-√(%g)/%g\n", solution.numerator, solution.denominator_sqrt);
} }
else else
{ {
numerator = solution.numerator_sqrt; numerator = solution.numerator;
denominator = solution.denominator_sqrt; denominator = solution.denominator;
reduce_fraction(&numerator, &denominator); reduce_fraction(&numerator, &denominator);
printf("√(%g/%g)\n", numerator, denominator); if (is_nearly_equal(denominator, 1))
printf("-√(%g/%g)\n", numerator, denominator); {
printf("√(%g)\n", numerator);
printf("-√(%g)\n", numerator);
}
else
{
printf("√(%g/%g)\n", numerator, denominator);
printf("-√(%g/%g)\n", numerator, denominator);
}
} }
} }
@@ -67,26 +83,42 @@ static void print_solution_pure_radicand_negativ(s_solution_degree_2_pure soluti
numerator = solution.numerator_sqrt; numerator = solution.numerator_sqrt;
denominator = solution.denominator_sqrt; denominator = solution.denominator_sqrt;
reduce_fraction(&numerator, &denominator); reduce_fraction(&numerator, &denominator);
printf("i%g/%g\n", numerator, denominator); if (is_nearly_equal(denominator, 1))
printf("-i%g/%g\n", numerator, denominator); {
printf("i%g\n", numerator);
printf("-i%g\n", numerator);
}
else
{
printf("i%g/%g\n", numerator, denominator);
printf("-i%g/%g\n", numerator, denominator);
}
} }
else if (solution.numerator_sqrt_is_int) else if (solution.numerator_sqrt_is_int)
{ {
printf("i%g/√(%g)\n", solution.numerator_sqrt, solution.c); printf("i%g/√(%g)\n", solution.numerator_sqrt, solution.denominator);
printf("-i%g/√(%g)\n", solution.numerator_sqrt, solution.c); printf("-i%g/√(%g)\n", solution.numerator_sqrt, solution.denominator);
} }
else if (solution.denominator_sqrt_is_int) else if (solution.denominator_sqrt_is_int)
{ {
printf("i√(%g)/%g\n", solution.a, solution.denominator_sqrt); printf("i√(%g)/%g\n", solution.numerator, solution.denominator_sqrt);
printf("-i√(%g)/%g\n", solution.a, solution.denominator_sqrt); printf("-i√(%g)/%g\n", solution.numerator, solution.denominator_sqrt);
} }
else else
{ {
numerator = solution.a; numerator = solution.numerator;
denominator = solution.c; denominator = solution.denominator;
reduce_fraction(&numerator, &denominator); reduce_fraction(&numerator, &denominator);
printf("i√(%g/%g)\n", numerator, denominator); if (is_nearly_equal(denominator, 1))
printf("-i√(%g/%g)\n", numerator, denominator); {
printf("i√(%g)\n", numerator);
printf("-i√(%g)\n", numerator);
}
else
{
printf("i√(%g/%g)\n", numerator, denominator);
printf("-i√(%g/%g)\n", numerator, denominator);
}
} }
} }

6
src/solver.c
View File

@@ -106,9 +106,11 @@ static void solve_degree_2_pure(s_solution_degree_2_pure *solution, double a, do
* SQARE ROOTS * SQARE ROOTS
*/ */
solution->numerator_sqrt = ft_sqrt(a, DOUBLE_PRECISION); solution->numerator = ft_fabs(c);
solution->numerator_sqrt = ft_sqrt(ft_fabs(c), DOUBLE_PRECISION);
solution->numerator_sqrt_is_int = !has_decimal_part(solution->numerator_sqrt); solution->numerator_sqrt_is_int = !has_decimal_part(solution->numerator_sqrt);
solution->denominator_sqrt = ft_sqrt(c, DOUBLE_PRECISION); solution->denominator = ft_fabs(a);
solution->denominator_sqrt = ft_sqrt(ft_fabs(a), DOUBLE_PRECISION);
solution->denominator_sqrt_is_int = !has_decimal_part(solution->denominator_sqrt); solution->denominator_sqrt_is_int = !has_decimal_part(solution->denominator_sqrt);
} }

10
src/utils/errors.c
View File

@@ -101,10 +101,12 @@ static void print_context_solution()
dprintf(STDERR_FILENO, "radicand_absolute : %15g ( |r| )\n", solution_d2_pure.radicand_absolute); dprintf(STDERR_FILENO, "radicand_absolute : %15g ( |r| )\n", solution_d2_pure.radicand_absolute);
dprintf(STDERR_FILENO, "radicand_sqrt : %15g ( √|r| )\n", solution_d2_pure.radicand_sqrt); dprintf(STDERR_FILENO, "radicand_sqrt : %15g ( √|r| )\n", solution_d2_pure.radicand_sqrt);
dprintf(STDERR_FILENO, "numerator_sqrt : %15g ( √a )\n", solution_d2_pure.numerator_sqrt); dprintf(STDERR_FILENO, "numerator : %15g ( |c| )\n", solution_d2_pure.numerator);
dprintf(STDERR_FILENO, "numerator_sqrt_is_int : %15i ( false if √a is double )\n", solution_d2_pure.numerator_sqrt_is_int); dprintf(STDERR_FILENO, "numerator_sqrt : %15g ( √c )\n", solution_d2_pure.numerator_sqrt);
dprintf(STDERR_FILENO, "denominator_sqrt : %15g ( √c )\n", solution_d2_pure.denominator_sqrt); dprintf(STDERR_FILENO, "numerator_sqrt_is_int : %15i ( false if √c is double )\n", solution_d2_pure.numerator_sqrt_is_int);
dprintf(STDERR_FILENO, "denominator_sqrt_is_int: %15i ( false if √c is double )\n", solution_d2_pure.denominator_sqrt_is_int); dprintf(STDERR_FILENO, "denominator : %15g ( |a| )\n", solution_d2_pure.denominator);
dprintf(STDERR_FILENO, "denominator_sqrt : %15g ( √a )\n", solution_d2_pure.denominator_sqrt);
dprintf(STDERR_FILENO, "denominator_sqrt_is_int: %15i ( false if √a is double )\n", solution_d2_pure.denominator_sqrt_is_int);
} }
else else
{ {

7
src/utils/math.c
View File

@@ -2,6 +2,11 @@
#include "computorv1.h" #include "computorv1.h"
bool is_nearly_equal(double num, int compare)
{
return is_nearly_equal_zero(num - compare);
}
bool is_nearly_equal_zero(double num) bool is_nearly_equal_zero(double num)
{ {
if (num > DOUBLE_PRECISION) if (num > DOUBLE_PRECISION)
@@ -13,7 +18,7 @@ bool is_nearly_equal_zero(double num)
bool has_decimal_part(double num) bool has_decimal_part(double num)
{ {
return (num != (int)num); return (!is_nearly_equal(num, (int)num));
} }
bool any_has_decimal_part(double *num, size_t len) bool any_has_decimal_part(double *num, size_t len)

14
tester.sh
View File

@@ -330,7 +330,7 @@ run_test \
"3 * x^2 + 5 * x^1 - 2 * x^0 = 5 * x" "\ "3 * x^2 + 5 * x^1 - 2 * x^0 = 5 * x" "\
Reduced form: -2 * x^0 + 0 * x^1 + 3 * x^2 = 0 Reduced form: -2 * x^0 + 0 * x^1 + 3 * x^2 = 0
Polynomial degree: 2 Polynomial degree: 2
Discriminant is strictly positive, the two solutions are: Radicant is strictly positive, the two solutions are:
√(2/3) √(2/3)
-√(2/3)" -√(2/3)"
@@ -339,16 +339,16 @@ run_test \
"9 * x^2 + 5 * x^1 - 2 * x^0 = 5 * x" "\ "9 * x^2 + 5 * x^1 - 2 * x^0 = 5 * x" "\
Reduced form: -2 * x^0 + 0 * x^1 + 9 * x^2 = 0 Reduced form: -2 * x^0 + 0 * x^1 + 9 * x^2 = 0
Polynomial degree: 2 Polynomial degree: 2
Discriminant is strictly positive, the two solutions are: Radicant is strictly positive, the two solutions are:
(√2)/3 √(2)/3
-(√2)/3" -√(2)/3"
run_test \ run_test \
"28. degree 2 pure" \ "28. degree 2 pure" \
"3 * x^2 + 5 * x^1 - 4 * x^0 = 5 * x" "\ "3 * x^2 + 5 * x^1 - 4 * x^0 = 5 * x" "\
Reduced form: -4 * x^0 + 0 * x^1 + 3 * x^2 = 0 Reduced form: -4 * x^0 + 0 * x^1 + 3 * x^2 = 0
Polynomial degree: 2 Polynomial degree: 2
Discriminant is strictly positive, the two solutions are: Radicant is strictly positive, the two solutions are:
2/√(3) 2/√(3)
-2/√(3)" -2/√(3)"
@@ -358,7 +358,7 @@ run_test \
"16 * x^2 + 5 * x^1 - 4 * x^0 = 5 * x" "\ "16 * x^2 + 5 * x^1 - 4 * x^0 = 5 * x" "\
Reduced form: -4 * x^0 + 0 * x^1 + 3 * x^2 = 0 Reduced form: -4 * x^0 + 0 * x^1 + 3 * x^2 = 0
Polynomial degree: 2 Polynomial degree: 2
Discriminant is strictly positive, the two solutions are: Radicant is strictly positive, the two solutions are:
1/2 1/2
-1/2" -1/2"
@@ -368,6 +368,6 @@ run_test \
"4 * x^2 + 5 * x^1 - 16 * x^0 = 5 * x" "\ "4 * x^2 + 5 * x^1 - 16 * x^0 = 5 * x" "\
Reduced form: -4 * x^0 + 0 * x^1 + 3 * x^2 = 0 Reduced form: -4 * x^0 + 0 * x^1 + 3 * x^2 = 0
Polynomial degree: 2 Polynomial degree: 2
Discriminant is strictly positive, the two solutions are: Radicant is strictly positive, the two solutions are:
2 2
-2" -2"