Changeset 432937c in git

Timestamp:

Jul 20, 2018, 3:19:35 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

79d81e55c8fa0bafcf778605ad3ed28e8b9a1321

Parents:

603a9894476eb0322bbfbcb93b58502145498740

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-07-20 15:19:35+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-07-20 15:40:47+02:00

Message:

fix: accuracy for sqr/nt_solve (atkins.lib/ntsolve.lib)

Files:

• Singular/LIB/atkins.lib (modified) (2 diffs)
• Singular/LIB/ntsolve.lib (modified) (2 diffs)
• Tst/Manual/nt_solve.res.gz.uu (modified) (1 diff)
• Tst/Manual/nt_solve.stat (modified) (1 diff)
• Tst/Manual/sqr.res.gz.uu (modified) (1 diff)
• Tst/Manual/sqr.stat (modified) (1 diff)
• Tst/Manual/sqr.tst (modified) (1 diff)

Singular/LIB/atkins.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="version atkins.lib 4.1.1.0 Dec_2017 ";
+version="version atkins.lib 4.1.1.2 Dec_2017 ";
 category="Teaching";
 info="
@@ -368 +368 @@
   poly f=var(1)^2-w;
   def S=basering;
-  ring R=(real,k),var(1),dp;
+  ring R=(real,k+1),var(1),dp;
   poly f=imap(S,f);
-  ideal I=nt_solve(f,1.1,list(k,k div 5));
+  ideal I=nt_solve(f,1.1,list(1000,k));
   number c=leadcoef(I[1]);
   setring S;

Singular/LIB/ntsolve.lib

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
-version="version ntsolve.lib 4.1.1.0 Dec_2017 "; // $ID$
+version="version ntsolve.lib 4.1.1.2 Dec_2017 "; // $ID$
 category="Symbolic-numerical solving";
 info="
@@ -55 +55 @@
     int prot = printlevel-voice+2;  // prot=printlevel (default:prot=0)
     if (i1 < 1){itmax = 100;}else{itmax = ipar[1];}
-    if (i1 < 2){acc = prec div 2;}else{acc = ipar[2];}
+    if (i1 < 2){acc = prec;}else{acc = ipar[2];}
     if ((acc <= 0)||(acc > prec-1)){acc = prec-1;}
 

Tst/Manual/nt_solve.res.gz.uu

@@ -1 +1 @@
 begin 640 nt_solve.res.gz
-M'XL("**B+%<``VYT7W-O;'9E+G)E<P!%DDU+Q$`,AN_[*X)X:.GLD&2^6=J#
-M>!'$B]YDD547*92JVVJW^^M-JVL/,Q/(\[Y)9N;^X?KF#@"H@MN;*[CHNUXW
-M]?/%!B1ZJMNZS_+-:CJAJJ#MG[KWYGNOV_V@NW[7K^[_]/RG;_M?8/;XSYH*
-M#G7[!H?N$TK(#OM=HRSF*CNJ49W4D*OF8Z%M!?6K(/#6=(+#D8N1BQ.O"15,
-MD2F&=51P'(OQ5!Q/Q>!@#:0&4XR+BSN[2//B8C0IUDF1G*C=PGGAVOY[_P+U
-MQ^X@)",J7/+A[".#2?9\!9DTI\1:3:I\P6,U@9N5;(^T+5%'GR*A=9&<0Y05
-MI4!$ML%A,BD0&N.<";."MR7KR.1"L-8)8=AZP6WR[-E1"!0HLO')TBPPVU(F
-M,FQH<K7>6PHI(:+'9%%\B-C[*#+#L\!NRS5I2P:E,GN+WH<H_M))2DF:<@DI
-<6392,?Y/E:KY/TQ/_M5EE&\N5S\G(C:N.@(`````
+M'XL("$3F45L"`VYT7W-O;'9E+G)E<P!%DDUKXT`,0._Y%:+LP<:30=)\$^Q#
+MZ:6P]-*]+2&D;2@&X^W&WCK.KU]-FM08>P;KZ4FRY_G7P^,3`%`#/Q_OX6X<
+M1MVU+W<;D-VN[=NQ*#>KO$+30#_NAC_=YT'WATD/XWY</5_S^9K?CU_`Q?$=
+M-0T<V_X=CL-?J*$X'O:=LEBJXJ1F=593J;J/A;8-M&^"P'LW"`XGKF:NSKPF
+M5)!WIIK64<%IKN9S=3I7DX,UD)I,-2\6=[-(\V(QFA3KI$A6U&[AO'#]^'EX
+MA?9C?Q22$14N\7#SR&`2O7V"0II3HE8YJUSPV&1PLY+';]K6J*-/D="Z2,XA
+MRAVE0$2VP3DV7EY00@E<,GA;LXY,+@1K77!HV'K!;?+LV8F"Y$K!8PJ7!+.M
+M92+#AK+5>F\II.P3PF(N:4VDB#Y>*]AMO29MR6`@9&_1^Q#%;Y+DI=R4^-E(
+;>4[N>ZK47,Y#_N7_AH+*S8_5?VA%H'8Z`@``
 `
 end

Tst/Manual/nt_solve.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:229572
-1 >> tst_memory_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:669968
-1 >> tst_memory_2 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:722780
-1 >> tst_timer_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:20
+1 >> tst_memory_0 :: 1532094020:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:191200
+1 >> tst_memory_1 :: 1532094020:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2199552
+1 >> tst_memory_2 :: 1532094020:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2232320
+1 >> tst_timer_1 :: 1532094020:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:5

Tst/Manual/sqr.res.gz.uu

@@ -1 +1 @@
 begin 640 sqr.res.gz
-M'XL(".2B+%<``W-Q<BYR97,`18]-:\,P#(;O^16B[)!`"/Z09)M0'\8NA=%#
-MN_M(:1AFG=EB%_?G-^E*>Y)`S_.B=__QMMD"@/3POGF%54ZY.X7#JH=Y^PPQ
-MY+KIJV6"]Y#^IBZ.I4MYR-7^KJJ[.N3O$-.__3AJ#U.(7["#-=33.)Q:%DU[
-M:8^_3P8]Q///89R@E+6R%MDQ"2DLLR--1K&P\HG3[8^ZE"6JKT@;X;1!E"@Z
-M91T;(5`1(1(;JXTD=A8-&J4-HT;)SME9FDDE'Z'L;X678N=4RZ9_J:Y)$6?-
-$&P$`````
+M'XL("#_A45L"`W-Q<BYR97,`E9--2\-`$(;O^15#\9!*#?.QGX3F(%X*XL%Z
+MEQ:+!&O0)"7^?#>TW91&H0V$+#O/;.9]2)8O#XLG`*`"'A?W,&F;-MN6ZTD.
+M8?5:5F6;3O.D?T)10/-=9]6FRYIVU2;+0RL?6E?M1UDU^^Y8E`+JLGJ'9]8P
+MA[3>K+8SUM/9S^SM:Z!4`=7N<[VIH>OF[)PRWF@D=,9X+=JR04<#KB->S\-(
+M:=?U9PYU$UZ:)UHL^G!;1)\A$CO1Q"2D(F@#>%O?=5V>D%AGA;6U&2LQSJ,E
+M8JTIPJZ`'OQOO,CY8V3!&%GP+#+A59&)QI'#F4.=_XI\=G&D9<B->XZ,L@I%
+M/(DB;_LY/"OEPI8C'QO590Y('QV8P8$9.3#7.;!C!^;4@1LYB"5_$OBXR7A9
+8&`[N^Y^A_^AW34K3_";Y!4"[04`W`P``
 `
 end

Tst/Manual/sqr.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:236008
-1 >> tst_memory_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:669968
-1 >> tst_memory_2 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:739172
-1 >> tst_timer_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:28
+1 >> tst_memory_0 :: 1532092735:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:223824
+1 >> tst_memory_1 :: 1532092735:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2179072
+1 >> tst_memory_2 :: 1532092735:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2232320
+1 >> tst_timer_1 :: 1532092735:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:50

Tst/Manual/sqr.tst

@@ -1 +1 @@
 LIB "tst.lib"; tst_init();
 LIB "atkins.lib";
-ring R = (real,60),x,dp;
+ring R25 = (real,25),x,dp;
 number ww=288469650108669535726081;
-sqr(ww,60);
+number r=sqr(ww,25);
+r;
+r*r-ww;
+ww;
+ring R30 = (real,30),x,dp;
+number ww=288469650108669535726081;
+number r=sqr(ww,30);
+r;
+r*r-ww;
+ww;
+ring R60 = (real,60),x,dp;
+number ww=288469650108669535726081;
+number r=sqr(ww,60);
+r;
+r*r-ww;
+ww;
 tst_status(1);$