From ca1953ec9cf3bad2f5038dc5284775b8692d7c51 Mon Sep 17 00:00:00 2001 From: AstroFloyd Date: Mon, 19 Nov 2018 11:45:18 +0100 Subject: sci-mathematics/giac: Adding more patches to files/ Signed-off-by: AstroFloyd Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- sci-mathematics/giac/ChangeLog | 37 +++ sci-mathematics/giac/Manifest | 4 +- .../giac/files/giac-1.2.2-test_with_nofltk.patch | 285 +++++++++++++++++++++ sci-mathematics/giac/files/pari_2_11.patch | 17 ++ 4 files changed, 342 insertions(+), 1 deletion(-) create mode 100644 sci-mathematics/giac/files/giac-1.2.2-test_with_nofltk.patch create mode 100644 sci-mathematics/giac/files/pari_2_11.patch diff --git a/sci-mathematics/giac/ChangeLog b/sci-mathematics/giac/ChangeLog index 17ff8c5..52f02cc 100644 --- a/sci-mathematics/giac/ChangeLog +++ b/sci-mathematics/giac/ChangeLog @@ -1,3 +1,40 @@ + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + sci-mathematics/giac: Adding more patches to files/ + + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + sci-mathematics/giac: Test + + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + sci-mathematics/giac: Test + + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + sci-mathematics/giac: Test + + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + sci-mathematics/giac: Test + + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + sci-mathematics/giac: Test + + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + sci-mathematics/giac: Test + + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + sci-mathematics/giac: Test + + 19 Nov 2018; AstroFloyd + +files/giac-1.2.2-test_with_nofltk.patch, +files/pari_2_11.patch: + cat/pkg: Signed-off-by: AstroFloyd # Used commit- + message template ../../AstroFloyd/commit_message_template + *giac-1.4.9.71-r1 (19 Nov 2018) 19 Nov 2018; AstroFloyd diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest index ca6f2dc..1739d27 100644 --- a/sci-mathematics/giac/Manifest +++ b/sci-mathematics/giac/Manifest @@ -1,5 +1,7 @@ AUX giac-1.2.2-gsl_lapack.patch 2658 BLAKE2B ffaece9f76504c4f53a305e2c7782db38de219bd5d2b777424b280a13e415bdf02935da6b6fd85e7e1138a3b8c42a8bb05edba99e0ec204dbc2d6ac109cb56b9 SHA512 0c929cd5c20ccb7720aabb611d3cf2a52d8a8113d4d81831dc5becfbc27e7df1c6ed9be85dd14e42e9af0b78f31973b260ff2db47df8c54e90a387e794eb0218 +AUX giac-1.2.2-test_with_nofltk.patch 10444 BLAKE2B 641058e3f41d8907e51ebba2bfeac2800b7ccc19b16d6afdadf3f3a77196904cb4f8f8a20d0a1c6ec2542e564517364dca02d5f963d65b1183764b5801f8a92d SHA512 804f8380469624a75983becc320da50700f64f5aa3bf8ca6e2c63dd53a10d6f67a5d6fd6c4b005fbf39e4e8354db65ed3ec2c46b706bef1f3f2ef240a44b315b +AUX pari_2_11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b05151b126cf74a5bccf5036e1fd3aa97f12fd91808fab7fe23a3194e6a4a7a9f12be5b69a5dfda5aedec8a0117c SHA512 56102439f05f0e27bda49f1e9803bbba7921c87eab383fc2f068ccca6ef598f11e35d00f5a737076a6a41df08ef9065e567cb84030ba6ea928520f371d51b9ed DIST giac_1.4.9-71.tar.gz 61615928 BLAKE2B c6c2ce8d6164d95a7886c53770f7f725b94184d700a1e0e481f254d124be4b09ad13d56b6b223726aceaeeb64fa8f1253238514c14c7fc2f6024c772afa86c6f SHA512 04840243957d6072070188139d9890e3214f051f1b7a14d77ecbc1ef0f3fe72940f38a1bbf038779d1b21aba7c79fcad4dda268ded7dfe739a72433b84b125a9 EBUILD giac-1.4.9.71-r1.ebuild 2469 BLAKE2B 12638d7a77a94601856fdedac00b836974aaa3730b5f8f16ccb6906a27a82c3422a1464a1565161e6d810034378380d0634a96d8e684424a52180446beee5329 SHA512 7f4df0dd177852b0e62a230f86ee9168b458a0cac5347bafc0d24779cc5fb9ba8dabdde7ff64d1d15b32fe53738d84041591a7a3c7c2f37e3d0bbaca6b7850d8 -MISC ChangeLog 231 BLAKE2B 68ee38a3cc32858545a434ead2ce2e22d9225912260ba95aabd015523d9e351a86ecbd9d96b24e6dc23af02a259f663162d333f7e1b49212dac3e82da3aa3353 SHA512 6d3824824ea8f38935fabd8d9d62f8d01b1313e704ba84153e2908682a6fb0b0077a88a1a260cd5225347ff18e2b6b04fe0bb1d8eadd260d1f8de5408fed330d +MISC ChangeLog 1687 BLAKE2B d3cc89017a7ad0a5bdcdf7d930d93d198cb0548169f093358d64978c4a9b7b4db54c87952031ecf86d06a93fb03b5939f893fd1ac64c6df79cb1979b80cd0e64 SHA512 b15f20db406ad10f47b1063bc4db87ab7516ffb621795c36e80b519dba04dd1d6016553665e5bd622574f58acc3f088ab2dae6a0d52075f7ac7968cefb28d0b6 MISC metadata.xml 865 BLAKE2B f108ce3b030f42fba510279ad054333e21446460f2cc23381a5f7c2b19b595ae5b164df85f1bd9634cb8970b52c278d297d46fc4a09e8fea77e371b2bdeb9e28 SHA512 5705fe7b0cf98c0ae9581c2fbe663532a4688c342c4c976dc0124cae658a75d7c14e5e8d6e9f82ce72755bf8d3c3549669f20acba71468ac51edf4d7d0a7436c diff --git a/sci-mathematics/giac/files/giac-1.2.2-test_with_nofltk.patch b/sci-mathematics/giac/files/giac-1.2.2-test_with_nofltk.patch new file mode 100644 index 0000000..67eb82e --- /dev/null +++ b/sci-mathematics/giac/files/giac-1.2.2-test_with_nofltk.patch @@ -0,0 +1,285 @@ +diff -ruN check/testgeo check.new/testgeo +--- a/check/testgeo 2013-02-15 13:47:55.000000000 +0100 ++++ b/check/testgeo 2015-03-02 16:32:35.000000000 +0100 +@@ -3,63 +3,63 @@ + nodisp(print("medianes")) ; + assume(Ax=-1) ; + assume(Ay=-1) ; +-A:=point(Ax,Ay) ; ++A:=point(Ax,Ay,display=536870968) ; + assume(Bx=0.5) ; + assume(By=1) ; +-B:=point(Bx,By) ; ++B:=point(Bx,By,display=536870968) ; + assume(Cx=1) ; + assume(Cy=-1) ; +-C:=point(Cx,Cy) ; +-triangle(A,B,C) ; +-a:=median_line(A,B,C) ; +-b:=median_line(B,C,A) ; +-c:=median_line(C,A,B) ; +-M:=head(inter(a,b)) ; +-N:=head(inter(b,c)) ; ++C:=point(Cx,Cy,display=536870968) ; ++triangle(A,B,C,color=56) ; ++a:=median_line(A,B,C,color=56) ; ++b:=median_line(B,C,A,color=56) ; ++c:=median_line(C,A,B,color=56) ; ++M:=head(inter(a,b,color=56)) ; ++N:=head(inter(b,c,color=56)) ; + normal(distance2(M,N)) ; + + nodisp(print("mediatrices")) ; +-a:=perpen_bisector(A,B) ; +-b:=perpen_bisector(B,C) ; +-c:=perpen_bisector(C,A) ; +-M:=head(inter(a,b)) ; +-N:=head(inter(b,c)) ; ++a:=perpen_bisector(A,B,color=56) ; ++b:=perpen_bisector(B,C,color=56) ; ++c:=perpen_bisector(C,A,color=56) ; ++M:=head(inter(a,b,color=56)) ; ++N:=head(inter(b,c,color=56)) ; + normal(distance2(M,N)) ; + + nodisp(print("bissectrices")) ; +-A:=point(0) ; +-B:=point(1,0) ; ++A:=point(0,display=536870968) ; ++B:=point(1,0,display=536870968) ; + assume(x=1.2) ; + assume(y=-1) ; + +-C:=point(x,y) ; +-triangle(A,B,C) ; +-a:=bisector(A,B,C) ; +-b:=bisector(B,C,A) ; +-c:=bisector(C,A,B) ; +-M:=head(inter(a,b)) ; +-N:=head(inter(a,c)) ; ++C:=point(x,y,display=536870968) ; ++triangle(A,B,C,color=56) ; ++a:=bisector(A,B,C,color=56) ; ++b:=bisector(B,C,A,color=56) ; ++c:=bisector(C,A,B,color=56) ; ++M:=head(inter(a,b,color=56)) ; ++N:=head(inter(a,c,color=56)) ; + normal(M-N) ; + purge(x,y) ; + + nodisp(print("Napoleon theorem")) ; + assume(a=-1) ; + assume(b=-1) ; +-A:=point(0) ; +-B:=point(2,0) ; +-C:=point(a,b) ; ++A:=point(0,display=536870968) ; ++B:=point(2,0,display=536870968) ; ++C:=point(a,b,display=536870968) ; + T1:=color(equilateral_triangle(A,B),green) ; + T2:=color(equilateral_triangle(B,C),green) ; + T3:=color(equilateral_triangle(C,A),green) ; + color(circumcircle(T1),green) ; + color(circumcircle(T2),green) ; + color(circumcircle(T3),green) ; +-AB:=segment(A,B) ; +-AC:=segment(A,C) ; +-CB:=segment(C,B) ; +-M:=normal(isobarycenter(T1)) ; +-N:=normal(isobarycenter(T2)) ; +-O:=normal(isobarycenter(T3)) ; ++AB:=segment(A,B,color=56) ; ++AC:=segment(A,C,color=56) ; ++CB:=segment(C,B,color=56) ; ++M:=display(normal(isobarycenter(T1)),536870968) ; ++N:=display(normal(isobarycenter(T2)),536870968) ; ++O:=display(normal(isobarycenter(T3)),536870968) ; + MN:=color(segment(M,N),red) ; + NO:=color(segment(N,O),red) ; + OM:=color(segment(O,M),red) ; +@@ -70,18 +70,18 @@ + nodisp(print("Feuerbach theorem")) ; + assume(xa=(1/2)) ; + assume(ya=1) ; +-A:=point(xa,ya) ; +-B:=point(-1,0) ; +-AB:=segment(A,B) ; +-C:=point(1,0) ; +-AC:=segment(A,C) ; +-CB:=segment(C,B) ; +-E:=midpoint(AB) ; +-F:=midpoint(AC) ; +-G:=midpoint(CB) ; +-c:=circumcircle(E,F,G) ; +-H:=altitude(A,B,C) ; +-I:=(inter(H,CB))[0] ; ++A:=point(xa,ya,display=536870968) ; ++B:=point(-1,0,display=536870968) ; ++AB:=segment(A,B,color=56) ; ++C:=point(1,0,display=536870968) ; ++AC:=segment(A,C,color=56) ; ++CB:=segment(C,B,color=56) ; ++E:=color(midpoint(AB),56) ; ++F:=color(midpoint(AC),56) ; ++G:=color(midpoint(CB),56) ; ++c:=circumcircle(E,F,G,color=56) ; ++H:=altitude(A,B,C,color=56) ; ++I:=(inter(H,CB,color=56))[0] ; + nodisp(print("teste que le pied de la altitude est sur c de 2 facons, doit renvoyer 1 puis 0")) ; + is_element(I,c) ; + nodisp(O:=center(c)) ; +@@ -90,7 +90,7 @@ + normal(l2-rc2) ; + nodisp(print("circle incircle de A,B,C, center")) ; + nodisp(d:=incircle(A,B,C)) ; +-P:=center(d) ; ++P:=color(center(d),56) ; + OP:=distance2(O,P) ; + rd:=radius(d) ; + rd2:=normal(rd^2) ; +@@ -104,17 +104,17 @@ + yb:=0 ; + assume(xc=-1) ; + assume(yc=1) ; +-A:=point(xa,ya) ; +-B:=point(xb,yb) ; +-C:=point(xc,yc) ; +-triangle(A,B,C) ; +-G:=circumcircle(A,B,C) ; ++A:=point(xa,ya,display=536870968) ; ++B:=point(xb,yb,display=536870968) ; ++C:=point(xc,yc,display=536870968) ; ++triangle(A,B,C,color=56) ; ++G:=circumcircle(A,B,C,color=56) ; + assume(x=1) ; + assume(y=1) ; +-M:=point(x,y) ; +-P:=projection(line(B,C),M) ; +-Q:=projection(line(C,A),M) ; +-R:=projection(line(A,B),M) ; ++M:=point(x,y,display=536870968) ; ++P:=projection(line(B,C),M,color=56) ; ++Q:=projection(line(C,A),M,color=56) ; ++R:=projection(line(A,B),M,color=56) ; + D1:=factor(numer(im((Q-P)*conj(R-P)))) ; + D12:=normal(-D1/yc^2) ; + D2:=equation(G) ; +@@ -124,8 +124,8 @@ + nodisp(print("Morley theorem")) ; + assume(a1=0.3) ; + assume(a2=0.4) ; +-A:=point(0) ; +-B:=point(1) ; ++A:=point(0,display=536870968) ; ++B:=point(1,display=536870968) ; + nodisp(C:=point(texpand((tan(a2*3))/(tan(a1*3)+tan(a2*3))*(1+(i)*tan(a1*3))))) ; + nodisp(P:=normal(point(texpand((tan(a2))/(tan(a1)+tan(a2))*(1+(i)*tan(a1)))))) ; + nodisp(R:=normal(single_inter(line(0,1+(i)*texpand(tan(2*a1))),line(C,C+1+(i)*texpand(tan(pi/3+2*a1-a2)))))) ; +diff -ruN check/TP00-sol.cas check.new/TP00-sol.cas +--- a/check/TP00-sol.cas 2014-07-02 15:06:55.000000000 +0200 ++++ b/check/TP00-sol.cas 2015-03-02 15:43:16.000000000 +0100 +@@ -67,7 +67,7 @@ + a:=exp(2*I*Pi/n); + S:=seq(point(a^i,display=point_width_3+blue),i=1..n): + /* Un cercle passe par 3 sommets ssi il coincide avec le cercle £unite. Donc si l'angle au centre n'est pas multiple de (2IPi/n) c'est bon. */ +-f:=(i,j,k)->if k=1 then segment(a^i,a^j) else seq(arc(a^i,a^j,l/k),l=1..k) fi; ++f:=(i,j,k)->if k=1 then segment(a^i,a^j,color=56) else seq(arc(a^i,a^j,l/k,color=56),l=1..k) fi; + G:=[[1,3,1],[1,2,3],[2,4,2],[2,3,1],[3,5,3],[3,4,1],[4,1,2]]: + S;seq(f(op(l)),l=G); #op pour enlever les crochets + /* -------------------------------------EXERCICE-----------------------------------------*/ +diff -ruN check/TP00-sol.cas.out1 check.new/TP00-sol.cas.out1 +--- a/check/TP00-sol.cas.out1 2015-02-02 14:47:11.000000000 +0100 ++++ b/check/TP00-sol.cas.out1 2015-03-02 15:44:22.000000000 +0100 +@@ -66,7 +66,7 @@ + 5, + (sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4, + "Done", +- (i,j,k)->if k=1 then segment(a^i,a^j); else seq(arc(a^i,a^j,l/k),l=(1 .. k)); ++ (i,j,k)->if k=1 then segment(a^i,a^j,'color'=56); else seq(arc(a^i,a^j,l/k,'color'=56),l=(1 .. k)); + fi , + "Done", + pnt(pnt[(sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4,1048580]),pnt(pnt[((sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4)^2,1048580]),pnt(pnt[((sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4)^3,1048580]),pnt(pnt[((sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4)^4,1048580]),pnt(pnt[((sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4)^5,1048580]), +diff -ruN check/TP02-sol.cas check.new/TP02-sol.cas +--- a/check/TP02-sol.cas 2014-06-26 17:24:46.000000000 +0200 ++++ b/check/TP02-sol.cas 2015-03-02 15:38:02.000000000 +0100 +@@ -7,7 +7,7 @@ + /* premiere methode: On prend la premiere ligne de la transpos\'ee. Seconde methode avec une suite indexee par la liste*/ + listecondi:=transpose(l)[1]; + listecondi:=[seq(k[1],k=l)]; +-histogram(classes(listecondi,0,10)); ++histogram(classes(listecondi,0,10),color=56); + ml:=max(listecondi);# le max de la suite + ecart_type(listecondi);#ou bien: stddev donne l'ecart type + moyenne(listecondi); +diff -ruN check/TP09-sol.cas check.new/TP09-sol.cas +--- a/check/TP09-sol.cas 2014-04-07 11:23:50.000000000 +0200 ++++ b/check/TP09-sol.cas 2015-03-02 15:34:47.000000000 +0100 +@@ -26,12 +26,12 @@ + 8*2+7 mod 7; (8*2+7) mod 7; #Attention mod est prioritaire sous xcas + /* Si a=1, on a x_n=x_0+n.c [m], on fait donc par exemple: c=7,x0=1*/ + l:=[seq((n*7+1) mod 1001,n=1..100)]; +-histogram(classes(l,0,1001/20)); #C'est tout a fait plat. Trop! ++histogram(classes(l,0,1001/20),color=56); #C'est tout a fait plat. Trop! + /* Remplacer les crochets par des incolades cree un ensemble, ce qui simplifie£ automatiquement les elements egaux */ + nops(l);nops({op(l)}); #ils sont tous distincts + l:=[seq(rand(1001),n=1..100)]; +- histogram(classes(l,0,1001/5)); +- histogram(classes(l,0,1001/20)); ++ histogram(classes(l,0,1001/5),color=56); ++ histogram(classes(l,0,1001/20),color=56); + nops(l);nops({op(l)});#il y a bien des anniversaires identiques + /* On a en fait 1001^100 suites possibles, et 1001!/901! suites dont£ tous les termes sont distincts.*/ + 1001!/901!/1001.^100; +@@ -39,30 +39,30 @@ + for i from 1 to 500 do x:=(a*x+c) mod m; l:=[op(l),x] ; od: + l1:=[seq(i mod 10^2,i=l)]; + l2:=[seq(trunc(i/10^2),i=l)]; +-histogram(classes(l1,0,5)); +-histogram(classes(l2,0,5)); ++histogram(classes(l1,0,5),color=56); ++histogram(classes(l2,0,5),color=56); + l1:=[seq(i mod 10,i=l)]; +-histogram(classes(l1,0,1)); ++histogram(classes(l1,0,1),color=56); + /* Si d est un diviseur de m et que $y_n=x_n [d]$, alors $y_{n+1}=ay_n+c [d]$£Donc si d=10^2, les 2 derniers chiffres de x_n ont p\'eriode d'au plus d.*/ + x:=1; a:=237;c:=54321;m:=10^4-1; l:=[]; + for i from 1 to 500 do x:=(a*x+c) mod m; l:=[op(l),x] ; od: + l1:=[seq(i mod 10^2,i=l)]; + l2:=[seq(trunc(i/10^2),i=l)]; +- histogram(classes(l1,0,5)); +-histogram(classes(l2,0,5)); ++ histogram(classes(l1,0,5),color=56); ++histogram(classes(l2,0,5),color=56); + l1:=[seq(i mod 10,i=l)]; +- histogram(classes(l1,0,1)); ++ histogram(classes(l1,0,1),color=56); + x:=1; a:=237;c:=54321;m:=prevprime(10^4); l:=[]; + for i from 1 to 500 do x:=(a*x+c) mod m; l:=[op(l),x] ; od: + l1:=[seq(i mod 10^2,i=l)]; + l2:=[seq(trunc(i/10^2),i=l)]; +- histogram(classes(l1,0,5)); +-histogram(classes(l2,0,5)); ++ histogram(classes(l1,0,5),color=56); ++histogram(classes(l2,0,5),color=56); + l1:=[seq(i mod 10,i=l)]; +- histogram(classes(l1,0,1)); ++ histogram(classes(l1,0,1),color=56); + x:=1; a:=237;c:=54321;m:=10; l:=[]; + for i from 1 to 100 do x:=(a*x+c) mod m; l:=[op(l),x] ; od: +-histogram(classes(l,0,1)); #certaines valeurs ne sont pas atteintes. ++histogram(classes(l,0,1),color=56); #certaines valeurs ne sont pas atteintes. + periode:=proc(a) + x:=1;p:=1; + if (a mod 5 <> 0) then while x>0 do p:=p+1;x:=(a*x+1) mod 125; od; fi; +diff -ruN check/TP19-sol.cas check.new/TP19-sol.cas +--- a/check/TP19-sol.cas 2014-04-07 11:23:50.000000000 +0200 ++++ b/check/TP19-sol.cas 2015-03-02 15:40:39.000000000 +0100 +@@ -24,7 +24,7 @@ + dernierfacteury:=quo(resultant(P,C1+t*C2,x),y^3*(y-1)^4,y); + yt:=solve(dernierfacteury,y); + /* On verifie graphiquement la parametrisation.*/ +- paramplot(xt+I*yt,t=-75..75,tstep=0.01); ++ paramplot(xt+I*yt,t=-75..75,tstep=0.01,color=56); + /* ----------------------------Exercice---------------------------------------------*/ + P:=x^4+x+1; + A:=1/d*add(a[i]*x^i,i=0..degree(P)-1); diff --git a/sci-mathematics/giac/files/pari_2_11.patch b/sci-mathematics/giac/files/pari_2_11.patch new file mode 100644 index 0000000..2414225 --- /dev/null +++ b/sci-mathematics/giac/files/pari_2_11.patch @@ -0,0 +1,17 @@ +Change test output for PARI 2.11 + +See https://trac.sagemath.org/ticket/25567 +and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102 + +diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1 +--- a/check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200 ++++ b/check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200 +@@ -10,7 +10,7 @@ + 1073741824000000000000000000061203284109000000000000000000000000008409, + 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241, + "Done", +-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]], ++1, + 0, + [], + 1, -- cgit v1.2.3