X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=src%2Ffloat%2Ftranscendental%2Fcl_LF_coshsinh_aux.cc;h=0612b2c959d60b503a93b4cd50071b0134fbc164;hb=3af2cde18b3aabed4c808b0113daa81c2263b0bd;hp=5aebbf1743d627dffb764ecbcde92ca0c3b9b4f4;hpb=749cf017b2954ea256ce006b2d8b0b815c2ff131;p=cln.git

diff --git a/src/float/transcendental/cl_LF_coshsinh_aux.cc b/src/float/transcendental/cl_LF_coshsinh_aux.cc
index 5aebbf1..0612b2c 100644
--- a/src/float/transcendental/cl_LF_coshsinh_aux.cc
+++ b/src/float/transcendental/cl_LF_coshsinh_aux.cc
@@ -1,20 +1,20 @@
 // cl_coshsinh_aux().
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
-#include "cl_F_tran.h"
+#include "float/transcendental/cl_F_tran.h"
 
 
 // Implementation.
 
 #include "cln/lfloat.h"
-#include "cl_LF_tran.h"
-#include "cl_LF.h"
+#include "float/transcendental/cl_LF_tran.h"
+#include "float/lfloat/cl_LF.h"
 #include "cln/integer.h"
-#include "cl_alloca.h"
-#include "cln/abort.h"
+#include "base/cl_alloca.h"
+#include "cln/exception.h"
 
 #undef floor
 #include <cmath>
@@ -30,7 +30,7 @@ const cl_LF_cosh_sinh_t cl_coshsinh_aux (const cl_I& p, uintE lq, uintC len)
 {
  {	Mutable(cl_I,p);
 	var uintE lp = integer_length(p); // now |p| < 2^lp.
-	if (!(lp <= lq)) cl_abort();
+	if (!(lp <= lq)) throw runtime_exception();
 	lp = lq - lp; // now |p/2^lq| < 2^-lp.
 	// Minimize lq (saves computation time).
 	{
@@ -52,8 +52,8 @@ const cl_LF_cosh_sinh_t cl_coshsinh_aux (const cl_I& p, uintE lq, uintC len)
 	//   a(n) = 1, b(n) = 1,
 	//   p(0) = p, p(n) = p^2 for n>0,
 	//   q(0) = 2^lq, q(n) = (2*n)*(2*n+1)*(2^lq)^2 for n>0.
-	var uintC actuallen = len+1; // 1 Schutz-Digit
-	// How many terms to we need for M bits of precision? N/2 terms suffice,
+	var uintC actuallen = len+1; // 1 guard digit
+	// How many terms do we need for M bits of precision? N/2 terms suffice,
 	// provided that
 	//   1/(2^(N*lp)*N!) < 2^-M
 	// <==   N*(log(N)-1)+N*lp*log(2) > M*log(2)
@@ -73,7 +73,6 @@ const cl_LF_cosh_sinh_t cl_coshsinh_aux (const cl_I& p, uintE lq, uintC len)
 	CL_ALLOCA_STACK;
 	var cl_I* pv = (cl_I*) cl_alloca(N*sizeof(cl_I));
 	var cl_I* qv = (cl_I*) cl_alloca(N*sizeof(cl_I));
-	var uintC* qsv = (uintC*) cl_alloca(N*sizeof(uintC));
 	var uintC n;
 	var cl_I p2 = square(p);
 	var cl_LF sinhsum;
@@ -85,8 +84,8 @@ const cl_LF_cosh_sinh_t cl_coshsinh_aux (const cl_I& p, uintE lq, uintC len)
 			init1(cl_I, qv[n]) (((cl_I)n*(cl_I)(2*n+1)) << (2*lq+1));
 		}
 		var cl_pq_series series;
-		series.pv = pv; series.qv = qv; series.qsv = qsv;
-		sinhsum = eval_rational_series(N,series,actuallen);
+		series.pv = pv; series.qv = qv;
+		sinhsum = eval_rational_series<true>(N,series,actuallen);
 		for (n = 0; n < N; n++) {
 			pv[n].~cl_I();
 			qv[n].~cl_I();
@@ -102,8 +101,8 @@ const cl_LF_cosh_sinh_t cl_coshsinh_aux (const cl_I& p, uintE lq, uintC len)
 			init1(cl_I, qv[n]) (((cl_I)n*(cl_I)(2*n-1)) << (2*lq+1));
 		}
 		var cl_pq_series series;
-		series.pv = pv; series.qv = qv; series.qsv = qsv;
-		coshsum = eval_rational_series(N,series,actuallen);
+		series.pv = pv; series.qv = qv;
+		coshsum = eval_rational_series<true>(N,series,actuallen);
 		for (n = 0; n < N; n++) {
 			pv[n].~cl_I();
 			qv[n].~cl_I();
@@ -112,7 +111,7 @@ const cl_LF_cosh_sinh_t cl_coshsinh_aux (const cl_I& p, uintE lq, uintC len)
 	#else // TRIVIAL_SPEEDUP
 	var cl_LF coshsum = sqrt(cl_I_to_LF(1,actuallen) + square(sinhsum));
 	#endif
-	return cl_LF_cosh_sinh_t(shorten(coshsum,len),shorten(sinhsum,len)); // verkürzen und fertig
+	return cl_LF_cosh_sinh_t(shorten(coshsum,len),shorten(sinhsum,len)); // verkürzen und fertig
 }}
 // Bit complexity (N = len, and if p has length O(log N) and ql = O(log N)):
 // O(log(N)*M(N)).