X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=src%2Ffloat%2Ftranscendental%2Fcl_LF_ratseries_pq.cc;h=293990039b9b4d0bb852239d0ddab5dd0c3c6d78;hb=8b3d91dec77438c0fe679b10869ab29e6cdeba58;hp=a5eb904535c0f285a37f9a9b0222bca07ecb614b;hpb=850abfde7f0d985ba01526c346bcd0d733562943;p=cln.git

diff --git a/src/float/transcendental/cl_LF_ratseries_pq.cc b/src/float/transcendental/cl_LF_ratseries_pq.cc
index a5eb904..2939900 100644
--- a/src/float/transcendental/cl_LF_ratseries_pq.cc
+++ b/src/float/transcendental/cl_LF_ratseries_pq.cc
@@ -11,7 +11,8 @@
 
 #include "cln/lfloat.h"
 #include "cln/integer.h"
-#include "cln/abort.h"
+#include "cln/real.h"
+#include "cln/exception.h"
 #include "cl_LF.h"
 
 namespace cln {
@@ -22,13 +23,13 @@ namespace cln {
 // and T = B*Q*S (all integers). On entry N1 < N2.
 // P will not be computed if a NULL pointer is passed.
 
-static void eval_pq_series_aux (uintL N1, uintL N2,
+static void eval_pq_series_aux (uintC N1, uintC N2,
                                 const cl_pq_series& args,
                                 cl_I* P, cl_I* Q, cl_I* T)
 {
 	switch (N2 - N1) {
 	case 0:
-		cl_abort(); break;
+		throw runtime_exception(); break;
 	case 1:
 		if (P) { *P = args.pv[N1]; }
 		*Q = args.qv[N1];
@@ -68,7 +69,7 @@ static void eval_pq_series_aux (uintL N1, uintL N2,
 		break;
 		}
 	default: {
-		var uintL Nm = (N1+N2)/2; // midpoint
+		var uintC Nm = (N1+N2)/2; // midpoint
 		// Compute left part.
 		var cl_I LP, LQ, LT;
 		eval_pq_series_aux(N1,Nm,args,&LP,&LQ,&LT);
@@ -85,13 +86,13 @@ static void eval_pq_series_aux (uintL N1, uintL N2,
 	}
 }
 
-static void eval_pqs_series_aux (uintL N1, uintL N2,
+static void eval_pqs_series_aux (uintC N1, uintC N2,
                                  const cl_pq_series& args,
-                                 cl_I* P, cl_I* Q, uintL* QS, cl_I* T)
+                                 cl_I* P, cl_I* Q, uintC* QS, cl_I* T)
 {
 	switch (N2 - N1) {
 	case 0:
-		cl_abort(); break;
+		throw runtime_exception(); break;
 	case 1:
 		if (P) { *P = args.pv[N1]; }
 		*Q = args.qv[N1];
@@ -135,14 +136,14 @@ static void eval_pqs_series_aux (uintL N1, uintL N2,
 		break;
 		}
 	default: {
-		var uintL Nm = (N1+N2)/2; // midpoint
+		var uintC Nm = (N1+N2)/2; // midpoint
 		// Compute left part.
 		var cl_I LP, LQ, LT;
-		var uintL LQS;
+		var uintC LQS;
 		eval_pqs_series_aux(N1,Nm,args,&LP,&LQ,&LQS,&LT);
 		// Compute right part.
 		var cl_I RP, RQ, RT;
-		var uintL RQS;
+		var uintC RQS;
 		eval_pqs_series_aux(Nm,N2,args,(P?&RP:(cl_I*)0),&RQ,&RQS,&RT);
 		// Put together partial results.
 		if (P) { *P = LP*RP; }
@@ -155,7 +156,7 @@ static void eval_pqs_series_aux (uintL N1, uintL N2,
 	}
 }
 
-const cl_LF eval_rational_series (uintL N, const cl_pq_series& args, uintC len)
+const cl_LF eval_rational_series (uintC N, const cl_pq_series& args, uintC len)
 {
 	if (N==0)
 		return cl_I_to_LF(0,len);
@@ -168,10 +169,10 @@ const cl_LF eval_rational_series (uintL N, const cl_pq_series& args, uintC len)
 		// Split qv[n] into qv[n]*2^qsv[n].
 		{
 			var cl_I* qp = args.qv;
-			var uintL* qsp = args.qsv;
-			for (var uintL n = 0; n < N; n++, qp++, qsp++) {
+			var uintC* qsp = args.qsv;
+			for (var uintC n = 0; n < N; n++, qp++, qsp++) {
 				// Pull out maximal power of 2 out of *qp = args.qv[n].
-				var uintL qs = 0;
+				var uintC qs = 0;
 				if (!zerop(*qp)) {
 					qs = ord2(*qp);
 					if (qs > 0)
@@ -181,11 +182,183 @@ const cl_LF eval_rational_series (uintL N, const cl_pq_series& args, uintC len)
 			}
 		}
 		// Main computation.
-		var uintL QS;
+		var uintC QS;
 		eval_pqs_series_aux(0,N,args,NULL,&Q,&QS,&T);
 		return cl_I_to_LF(T,len) / scale_float(cl_I_to_LF(Q,len),QS);
 	}
 }
+
+static void eval_pq_series_aux (uintC N1, uintC N2,
+                                cl_pq_series_stream& args,
+                                cl_I* P, cl_I* Q, cl_I* T)
+{
+	switch (N2 - N1) {
+	case 0:
+		throw runtime_exception(); break;
+	case 1: {
+		var cl_pq_series_term v0 = args.next(); // [N1]
+		if (P) { *P = v0.p; }
+		*Q = v0.q;
+		*T = v0.p;
+		break;
+		}
+	case 2: {
+		var cl_pq_series_term v0 = args.next(); // [N1]
+		var cl_pq_series_term v1 = args.next(); // [N1+1]
+		var cl_I p01 = v0.p * v1.p;
+		if (P) { *P = p01; }
+		*Q = v0.q * v1.q;
+		*T = v1.q * v0.p
+		   + p01;
+		break;
+		}
+	case 3: {
+		var cl_pq_series_term v0 = args.next(); // [N1]
+		var cl_pq_series_term v1 = args.next(); // [N1+1]
+		var cl_pq_series_term v2 = args.next(); // [N1+2]
+		var cl_I p01 = v0.p * v1.p;
+		var cl_I p012 = p01 * v2.p;
+		if (P) { *P = p012; }
+		var cl_I q12 = v1.q * v2.q;
+		*Q = v0.q * q12;
+		*T = q12 * v0.p
+		   + v2.q * p01
+		   + p012;
+		break;
+		}
+	case 4: {
+		var cl_pq_series_term v0 = args.next(); // [N1]
+		var cl_pq_series_term v1 = args.next(); // [N1+1]
+		var cl_pq_series_term v2 = args.next(); // [N1+2]
+		var cl_pq_series_term v3 = args.next(); // [N1+3]
+		var cl_I p01 = v0.p * v1.p;
+		var cl_I p012 = p01 * v2.p;
+		var cl_I p0123 = p012 * v3.p;
+		if (P) { *P = p0123; }
+		var cl_I q23 = v2.q * v3.q;
+		var cl_I q123 = v1.q * q23;
+		*Q = v0.q * q123;
+		*T = q123 * v0.p
+		   + q23 * p01
+		   + v3.q * p012
+		   + p0123;
+		break;
+		}
+	default: {
+		var uintC Nm = (N1+N2)/2; // midpoint
+		// Compute left part.
+		var cl_I LP, LQ, LT;
+		eval_pq_series_aux(N1,Nm,args,&LP,&LQ,&LT);
+		// Compute right part.
+		var cl_I RP, RQ, RT;
+		eval_pq_series_aux(Nm,N2,args,(P?&RP:(cl_I*)0),&RQ,&RT);
+		// Put together partial results.
+		if (P) { *P = LP*RP; }
+		*Q = LQ*RQ;
+		// S = LS + LP/LQ * RS, so T = RQ*LT + LP*RT.
+		*T = RQ*LT + LP*RT;
+		break;
+		}
+	}
+}
+
+const cl_LF eval_rational_series (uintC N, cl_pq_series_stream& args, uintC len)
+{
+	if (N==0)
+		return cl_I_to_LF(0,len);
+	var cl_I Q, T;
+	eval_pq_series_aux(0,N,args,NULL,&Q,&T);
+	return cl_I_to_LF(T,len) / cl_I_to_LF(Q,len);
+}
+
+static void eval_pq_series_aux (uintC N1, uintC N2,
+                                cl_pq_series_stream& args,
+                                cl_R* P, cl_R* Q, cl_R* T,
+                                uintC trunclen)
+{
+	switch (N2 - N1) {
+	case 0:
+		throw runtime_exception(); break;
+	case 1: {
+		var cl_pq_series_term v0 = args.next(); // [N1]
+		if (P) { *P = v0.p; }
+		*Q = v0.q;
+		*T = v0.p;
+		break;
+		}
+	case 2: {
+		var cl_pq_series_term v0 = args.next(); // [N1]
+		var cl_pq_series_term v1 = args.next(); // [N1+1]
+		var cl_I p01 = v0.p * v1.p;
+		if (P) { *P = p01; }
+		*Q = v0.q * v1.q;
+		*T = v1.q * v0.p
+		   + p01;
+		break;
+		}
+	case 3: {
+		var cl_pq_series_term v0 = args.next(); // [N1]
+		var cl_pq_series_term v1 = args.next(); // [N1+1]
+		var cl_pq_series_term v2 = args.next(); // [N1+2]
+		var cl_I p01 = v0.p * v1.p;
+		var cl_I p012 = p01 * v2.p;
+		if (P) { *P = p012; }
+		var cl_I q12 = v1.q * v2.q;
+		*Q = v0.q * q12;
+		*T = q12 * v0.p
+		   + v2.q * p01
+		   + p012;
+		break;
+		}
+	case 4: {
+		var cl_pq_series_term v0 = args.next(); // [N1]
+		var cl_pq_series_term v1 = args.next(); // [N1+1]
+		var cl_pq_series_term v2 = args.next(); // [N1+2]
+		var cl_pq_series_term v3 = args.next(); // [N1+3]
+		var cl_I p01 = v0.p * v1.p;
+		var cl_I p012 = p01 * v2.p;
+		var cl_I p0123 = p012 * v3.p;
+		if (P) { *P = p0123; }
+		var cl_I q23 = v2.q * v3.q;
+		var cl_I q123 = v1.q * q23;
+		*Q = v0.q * q123;
+		*T = q123 * v0.p
+		   + q23 * p01
+		   + v3.q * p012
+		   + p0123;
+		break;
+		}
+	default: {
+		var uintC Nm = (N1+N2)/2; // midpoint
+		// Compute left part.
+		var cl_R LP, LQ, LT;
+		eval_pq_series_aux(N1,Nm,args,&LP,&LQ,&LT,trunclen);
+		// Compute right part.
+		var cl_R RP, RQ, RT;
+		eval_pq_series_aux(Nm,N2,args,(P?&RP:(cl_I*)0),&RQ,&RT,trunclen);
+		// Put together partial results.
+		if (P) {
+			*P = LP*RP;
+			truncate_precision(*P,trunclen);
+		}
+		*Q = LQ*RQ;
+		truncate_precision(*Q,trunclen);
+		// S = LS + LP/LQ * RS, so T = RQ*LT + LP*RT.
+		*T = RQ*LT + LP*RT;
+		truncate_precision(*T,trunclen);
+		break;
+		}
+	}
+}
+
+const cl_LF eval_rational_series (uintC N, cl_pq_series_stream& args, uintC len, uintC trunclen)
+{
+	if (N==0)
+		return cl_I_to_LF(0,len);
+	var cl_R Q, T;
+	eval_pq_series_aux(0,N,args,NULL,&Q,&T,trunclen);
+	return cl_R_to_LF(T,len) / cl_R_to_LF(Q,len);
+}
 // Bit complexity (if p(n), q(n), a(n), b(n) have length O(log(n))):
 // O(log(N)^2*M(N)).