diff --git a/2025.05.02/03Ex/solve.c b/2025.05.02/03Ex/solve.c index 1be9eba..b89c3b3 100644 --- a/2025.05.02/03Ex/solve.c +++ b/2025.05.02/03Ex/solve.c @@ -46,9 +46,7 @@ int t3_solve ( memcpy(&bits, &y, sizeof(bits)); sgn_c = (bits >> 63) & 1; - if (is_equal(a, c) || is_equal(c, b)) - it = m+1; - else if (is_eps(y, eps)) + if (is_eps(y, eps)) break; else if (sgn_c == sgn_a) { diff --git a/2025.05.02/04Ex/comp.h b/2025.05.02/04Ex/comp.h new file mode 100644 index 0000000..6b09d43 --- /dev/null +++ b/2025.05.02/04Ex/comp.h @@ -0,0 +1,50 @@ +#ifndef COMP_H +#define COMP_H + +#include +#include + +static inline double * fpmax (double *pa, double *pb, double fa, double fb, double *max_f_p) +{ + if ((fa - fb) > DBL_EPSILON) + { + *max_f_p = fa; + return pa; + } else + { + *max_f_p = fb; + return pb; + } +} + +static inline double * fp_abs_max (double *pa, double *pb, double *fa, double *fb, double **max_f_p) +{ + if ((fabs(*fa) - fabs(*fb)) > DBL_EPSILON) + { + *max_f_p = fa; + return pa; + } else + { + *max_f_p = fb; + return pb; + } +} + +static inline int is_equal (const double a, const double b) +{ + double diff = a - b; + double max_val = (a > b) ? a : b; + return ((diff < 0) ? -diff : diff) < (DBL_EPSILON * max_val); +} + +static inline int is_null (const double a) +{ + return ((a < 0) ? -a : a) < DBL_EPSILON; +} + +static inline int is_eps (const double a, const double eps) +{ + return (((a < 0) ? -a : a) - eps) < DBL_EPSILON; +} + +#endif diff --git a/2025.05.02/04Ex/solve.c b/2025.05.02/04Ex/solve.c index 3a8893e..634e532 100644 --- a/2025.05.02/04Ex/solve.c +++ b/2025.05.02/04Ex/solve.c @@ -1,4 +1,5 @@ #include "solve.h" +#include "comp.h" #include #include @@ -11,15 +12,15 @@ int t4_solve ( int it = 0; double c = DBL_MAX, y, y_a = f(a), y_b = f(b); - if (fabs(y_a) - eps < DBL_EPSILON) + if (is_eps(y_a, eps)) { *x = a; return 1; - } if (fabs(y_b) - eps < DBL_EPSILON) + } if (is_eps(y_b, eps)) { *x = b; return 1; - } if (fabs(fabs(y_b) - fabs(y_a)) < DBL_EPSILON) + } if (is_equal(fabs(y_b), fabs(y_a))) { *x = a; return -1; @@ -30,17 +31,20 @@ int t4_solve ( c = b - ((b - a) / (y_b - y_a)) * y_b; y = f(c); - if (fabs(y) - eps < DBL_EPSILON) + if (is_eps(y, eps)) break; else if (fabs(y_a) - fabs(y_b) > DBL_EPSILON) { a = c; y_a = y; - } else if (fabs(y_b) - fabs(y_a) > DBL_EPSILON) + } else + // if (fabs(y_b) - fabs(y_a) > DBL_EPSILON) { b = c; y_b = y; - } else + } + + if (is_equal(y_a, y_b)) it = m+1; } diff --git a/2025.05.02/tests/main_test.sh b/2025.05.02/tests/main_test.sh index 3df2373..14a0360 100755 --- a/2025.05.02/tests/main_test.sh +++ b/2025.05.02/tests/main_test.sh @@ -29,18 +29,21 @@ rm -f $outlog $errlog echo "Тест запущен..." +i=2 + for (( k = 3 ; k < 7; k++ )); do - echo "------- K = $k -------" for (( a = -100 ; a < -40 ; a++ )); do for (( b = -9 ; b < 10 ; b++ )); do echo "./a0$prog.out "$(echo "$a / 10" | bc -l)" "$(echo "$b / 10" | bc -l)" 1e-16 $iter $k" - ./a0$prog.out "$(echo "$a / 10" | bc -l)" "$(echo "$b / 10" | bc -l)" 1e-16 $iter $k + echo "$i $(./a0$prog.out "$(echo "$a / 10" | bc -l)" "$(echo "$b / 10" | bc -l)" 1e-16 $iter $k)" + ((i+=2)) done done for (( a = -9 ; a < 10 ; a++ )); do for (( b = 11 ; b < 100 ; b++ )); do - echo "./a0$prog.out "$(echo "$a / 10" | bc -l)" "$(echo "$b / 10" | bc -l)" 1e-16 $iter $k" - ./a0$prog.out "$(echo "$a / 10" | bc -l)" "$(echo "$b / 10" | bc -l)" 1e-16 $iter $k + echo "$i ./a0$prog.out "$(echo "$a / 10" | bc -l)" "$(echo "$b / 10" | bc -l)" 1e-16 $iter $k" + echo "$i $(./a0$prog.out "$(echo "$a / 10" | bc -l)" "$(echo "$b / 10" | bc -l)" 1e-16 $iter $k)" + ((i+=2)) done done done >$outlog 2>$errlog