Changeset 4e5e15 in git

Timestamp:

Dec 21, 2018, 5:18:47 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '873fc1222e995d7cb33f79d8f1792ce418c8c72c')

Children:

38f8079d872564961e7c1925071e5ea7f3dd7ddb

Parents:

8c61b767c5f86dee89ff29213d49b7d5ad5f91720bcd38b9e3cddfc8f897c2059a425d598786f9ad

Message:

Merge branch 'christmas-release' of https://github.com/kabouzeid/Singular into t

Files:

• Singular/iparith.cc (modified) (1 diff)
• Tst/Manual/fullSerreRelations.res.gz.uu (modified) (1 diff)
• Tst/Manual/fullSerreRelations.stat (modified) (1 diff)
• Tst/Manual/fullSerreRelations.tst (modified) (1 diff)
• Tst/Manual/makeLetterplaceRing.res.gz.uu (modified) (1 diff)
• Tst/Manual/makeLetterplaceRing.stat (modified) (1 diff)
• Tst/Manual/makeLetterplaceRing.tst (modified) (1 diff)
• Tst/Manual/setLetterplaceAttributes.res.gz.uu (modified) (1 diff)
• Tst/Manual/setLetterplaceAttributes.stat (modified) (1 diff)
• Tst/Manual/setLetterplaceAttributes.tst (modified) (1 diff)
• Tst/Short/nchilb_test2.res.gz.uu (modified) (1 diff)
• Tst/Short/nchilb_test2.stat (modified) (1 diff)
• Tst/Short/nchilb_test2.tst (modified) (1 diff)
• libpolys/polys/shiftop.cc (modified) (6 diffs)

Singular/iparith.cc

@@ -4242 +4242 @@
     int deg = (int)(long)v->Data();
     if (deg > currRing->N/currRing->isLPring) {
-      WerrorS("deg of letterplace ring to small");
+      WerrorS("degree bound of Letterplace ring is to small");
       return TRUE;
     }

Tst/Manual/fullSerreRelations.res.gz.uu

@@ -1 @@
-begin 640 fullSerreRelations.res.gz
-M'XL("./FO5L"`V9U;&Q397)R95)E;&%T:6]N<RYR97,`95--:^,P$+WG5PQE
-M#_F0W8S2)"W&AK2]%$H/\=Z*">Y&C@RN'2R%[L]?C;X26!!(FGGSWIL1*G^_
-MOGT``!;P_O8,=UKIM&N_[C(PIT/;MWHZRR:T0U%`<^FZ4HRCV(NNUNW0J[07
-M/ZG2M9Z4GHE[IF84XO3ER&)R54#;Z^]:P^Z35V9!'G,/*7`&";(86:=T!9[!
-M_3WL#AQR4-UA!2_UJ.L>#,W8_HWH30%CVY]@-+`EFS;(&LXD,LF90";XC!W/
-M5R=;X^0HZ@YZ<1J'02M394LR'_]C12AL.4+X/*@`MZQ7QD?;&US.>CB*D\FO
-MK[FG`HZB@7U)*O\-<;ICP07SLBSH,,\WBV2X+$`);7O=EQDTRA!E$[M]8I4W
-M.&^X60FW.]T6C3][%'<H]"A7@`L/#ZA5E0N<"VY6PNU.MX7P9X]Z<"CT*%>`
-M"P\/J+51I$@B2,P'-]:&J1,WWK95GE#44)"71(;$(R6X=V",RT#S5.42YY(B
-M\XC&I8TZ18G)C6-T0Y+$30HWXLA=E;4DJ8N06-D&?`T--"1,_S)T)HVW2+5V
-M*M86#3<F-J[":;C1AM36J;@:]X+QV<T7I3])G^VBICC+?DW^`5H0B2>^`P``
+begin 644 fullSerreRelations.res.gz
+M'XL("*SE'%P"`V9U;&Q397)R95)E;&%T:6]N<RYR97,`95--:^,P$+WG5PRE
+MAWS(;D9IDA9C0[:]%)8]Q+T5$]Q&B@RN'6R%[<]?C;X26!!(FGGSWIL1*M]?
+MW_X``!;P^^T7W.E1IVWS>9>!.1V:KM'363:A'8H"Y*5M2S$,8B_:6C=]-Z:=
+M^)N.NM:3TC-QSR0'(4Z?CBPF5P4TG?ZN->P^>&46Y#'WF`)GD""+D75*5^`9
+M/#S`[L`AA[$]K."E'G3=@:$9FI^(WA0P--T)!@-;LJE$)CE3R!1G`IG@,_9Z
+MOCK9&B='4;?0B=/0]WHT5;8D\_$O*T)ARQ'"YWX,<,MZ97RRO<'EK/NC.)G\
+M^II[+N`H).Q+4OEOB-,="RZ8EV5!AWF^623#90&CT+;7?9F!'`U1-K';!U:Y
+MQ+GD9B7<[G1;2'_V*.Y0Z%&N`!<>'E"K*A<X%]RLA-N=;@OASQ[UZ%#H4:X`
+M%QX>4&NC2)%$D)@/;JP-4R=NO&VK/*&HH2`OB0J))TIP[\`85X'FN<H5SA5%
+MYA&-2QMUB@J3&\?HAJ2(FQ1NQ)&[*FM)41<AL;(-^!H::$B8_E7H3!EOD6KM
+M5*PM&FY,;%R%TW"C#:FM4W$U[@7CLYLO2G^2/MMEG.(LNY_\`ZH*'\.^`P``
 `
 end

Tst/Manual/fullSerreRelations.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1539172067:4113, 64 bit:4.1.1:x86_64-Linux:nepomuck:306336
-1 >> tst_memory_1 :: 1539172067:4113, 64 bit:4.1.1:x86_64-Linux:nepomuck:2199552
-1 >> tst_memory_2 :: 1539172067:4113, 64 bit:4.1.1:x86_64-Linux:nepomuck:2232320
-1 >> tst_timer_1 :: 1539172067:4113, 64 bit:4.1.1:x86_64-Linux:nepomuck:8
+1 >> tst_memory_0 :: 1545397676:4114, 64 bit:4.1.1:x86_64-Linux:megrez:311032
+1 >> tst_memory_1 :: 1545397676:4114, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
+1 >> tst_memory_2 :: 1545397676:4114, 64 bit:4.1.1:x86_64-Linux:megrez:2227696
+1 >> tst_timer_1 :: 1545397676:4114, 64 bit:4.1.1:x86_64-Linux:megrez:8

Tst/Manual/fullSerreRelations.tst

@@ -4 +4 @@
 2, -1,
 -1, 2; // A_2 = sl_3 Cartan matrix
-ring r = 0,(f1,f2,h1,h2,e1,e2),dp;
+ring r = 0,(f1,f2,h1,h2,e1,e2),Dp;
 ideal negroots = f1,f2; ideal cartans = h1,h2; ideal posroots = e1,e2;
 int uptodeg = 5;

Tst/Manual/makeLetterplaceRing.res.gz.uu

@@ -1 +1 @@
 begin 644 makeLetterplaceRing.res.gz
-M'XL(")XK$5P"`VUA:V5,971T97)P;&%C95)I;F<N<F5S`*U4:TO#,!3]WE]Q
-M$#^T4*;MYFO%PNH0!!'F_"[M>EO#NK8DF8_]>F_:V:I,!FJ@3;@Y.?=Q;C)_
-MF-[<`?!"W-Y$.-!*#PJ1'`3@U:,HA;:=P#(SPA"K>$FWI#7)NH@7="_*?%#2
-MRT#I6%OS+96_I<HD49ZT;-WF,(3D4Y"XQ+%KO[IO[L9QIW6/&(5(*<.$`3O<
-MV;[30T]"*-(-WR0`?];1$18599E8""JU&F,V,[9RO4I(HLKP'$N%,4Z-=3N2
-MHEHL30G87LF4&KYI_0G1CS'*>$7*+%_QADW[WT'F?R:[,H"B3Z0M@=UBE=@0
-MADZ7U&D(H:ZY=I,BIT3&]H0S]KKMLQ!%/:4\JM9E:O8`)D\IYQ-(C-'R._"Y
-M`4?&S9R]-.COU1!Q4G!"HH1^(JXX+YJXK&''<O&AF?]%-#NM;<]QP9/O]*IX
-MQ[TJT@\:,:.?Q'2]-B1=L6ZK.I8T[GB\GB?B+*-_5+?8K^X^3=.]%+L;8_CW
-@.$;_$<?);QO4X_MMW@9SY]>*.R`XM-X!A7"/B$8$````
+M'XL("$KF'%P"`VUA:V5,971T97)P;&%C95)I;F<N<F5S`*U476O;,!1]]Z\X
+MA#[88-+::;HN9H:XH5`(@RYCKT..KSU1QS:2TC;Y];NR,[LM*8&N`EN7JZ-S
+M/XZDU<_%W7<`08SE78*1T69<RG04@:W?LI+&]2+'SHAC;,0#+<D84DTIUO1#
+M5L6XHJ>Q-L(XJP-5>*#*%5&1=FS]XB2&XEU0^(8+WWWV=_[>\Q?-@+B,D5&.
+M.0..A'-#;X!.8V@R+=\\`G_.^3G6->6Y7$NJC)[A_M[ZJNTF)84ZQZ-0&C-<
+M6>]AI&6]?K`M8'^M,FKY%LT+Q#!FJ,2&M#6?L<.^^Q\A"U^2W5A`.132M<#M
+ML%KN"1.O+^HJAM2WW+MY65"JA#OGBH-^^4N,LEE0D=3;*K-K`)-G5/`.I-;I
+MA#WXVH)_"9782"L.U&YXVQ`ITI)KDA7,'^*FL]&FYDQZHJ__9`M?Z>9FC1MX
+M/G@*O4&8X&(01H51JV?RGIY^T*5D:I9NTPA%LYXG&'@2+C3Y1('+TP*?DC4[
+G27'\;$S^/X_+S\AC^M$S&O`5M\^#O?9;S2<@.G/^`D2O4CY)!```
 `
 end

Tst/Manual/makeLetterplaceRing.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1544629151:4113, 64 bit:4.1.1:x86_64-Linux:megrez:300232
-1 >> tst_memory_1 :: 1544629151:4113, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
-1 >> tst_memory_2 :: 1544629151:4113, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
-1 >> tst_timer_1 :: 1544629151:4113, 64 bit:4.1.1:x86_64-Linux:megrez:7
+1 >> tst_memory_0 :: 1545397834:4114, 64 bit:4.1.1:x86_64-Linux:megrez:300232
+1 >> tst_memory_1 :: 1545397834:4114, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
+1 >> tst_memory_2 :: 1545397834:4114, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
+1 >> tst_timer_1 :: 1545397834:4114, 64 bit:4.1.1:x86_64-Linux:megrez:8

Tst/Manual/makeLetterplaceRing.tst

@@ -6 +6 @@
 isFreeAlgebra(A);
 lpDegBound(A);  // degree bound
-lpBlockSize(A); // number of variables in the main block
+lpVarBlockSize(A); // number of variables in the main block
 ring r2 = 0,(x,y,z),(dp(1), dp(2));
 setring r2; def B = makeLetterplaceRing(2,1); // to compare:

Tst/Manual/setLetterplaceAttributes.res.gz.uu

@@ -1 @@
-begin 640 setLetterplaceAttributes.res.gz
-M'XL("/M']%H"`W-E=$QE='1E<G!L86-E071T<FEB=71E<RYR97,`=9!!B\(P
-M$(7O_15#\9!TLT73[NZA;&#%BR`>JG=I=91@*9*,;/WW9JI6+UZ21][CRYM9
-MK6?S)0!,#"SF4XC)4]K8.BX@J(UM+0E91'R#,>"1%DB$[M146_PC<K8^$_JT
-MQ?_44T71ZL[3=][>(1[J&W(P,P/.M@=P\`MC)3HQD>K"1R<T*\TJ8Y6QREGE
-M4JK=Z<G(#>QP#V5`O&LEG()<@98%1_H?RR?@RT#51T6I8NM?"&5(QF%J/62_
-M#306IZ[:'I%>^@9TQ"+AX@EW_M0)V\GE\?#1#3Z/,R!_3+]A7MK9AT@QBJX_
-'+B3PC`$`````
+begin 644 setLetterplaceAttributes.res.gz
+M'XL("._D'%P"`W-E=$QE='1E<G!L86-E071T<FEB=71E<RYR97,`=9%+:X0P
+M%(7W_HK+T$6T5FJT+Z2!D:$P,'2AI=OBXXZ$$4>22)W^^N;::::;;I)#OLO)
+M.4GYMMF^`D`L8+?-866TB7I9KS*PZD,.TC`_\V@'(4"CV:$QJ,:^:G!MC)+U
+M9%!'`WY&VE3&*\]^_.RW5XA=_6/I8")`R:$#!<]P&[*9Q7YXHF5FG!0GE9!*
+M2*6D4M\/V_'BD0IH<0^%M?@O%5,AI"%P/Z.1Y<;B8G`G0.H7&V_==UBKBA6V
+M:.SPO8!^W&"7'Z>A75CJV`.Q]TKE_;$YE/(+%\X=?[1<8JZJYH#F3SV;Q",1
+F4,^`*M[P@'!P^CVXGAVG]L[R22P?0F\\:3N277G?JOSS(;L!````
 `
 end

Tst/Manual/setLetterplaceAttributes.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1525958650:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:292688
-1 >> tst_memory_1 :: 1525958650:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2215936
-1 >> tst_memory_2 :: 1525958650:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2232216
-1 >> tst_timer_1 :: 1525958650:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:6
+1 >> tst_memory_0 :: 1545397487:4114, 64 bit:4.1.1:x86_64-Linux:megrez:297504
+1 >> tst_memory_1 :: 1545397487:4114, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
+1 >> tst_memory_2 :: 1545397487:4114, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
+1 >> tst_timer_1 :: 1545397487:4114, 64 bit:4.1.1:x86_64-Linux:megrez:7

Tst/Manual/setLetterplaceAttributes.tst

@@ -5 +5 @@
 isFreeAlgebra(R);
 lpDegBound(R);
-lpBlockSize(R);
+lpVarBlockSize(R);
 lieBracket(x(1),y(1),2);
 tst_status(1);$

Tst/Short/nchilb_test2.res.gz.uu

@@ -1 @@
-begin 664 nchilb_test2.res.gz
-M'XL("%J!`%H"`VYC:&EL8E]T97-T,BYR97,`79+/;\(@%,?O_!4O9H>R8B=0
-MZS93#LL.,UFV@[L98_S!E`1K4S!6__I!:ZT=E_<%/M_W@,?TYWWR!0!4P.?D
-M#7K6V$BK56^,IM<=)L`M+E2F;(#'R$<0`K+U3NG5PDIC693)4V3LTMY,O$K7
-MR]8?#OJ7,!;@1Z&R+13I@`0E.9,+)IN\988";CJ)*GY_V!RUA)RF,^H-<S+K
-M4W(AYWEK&XD.RCQ:.J9L8#>YPY^[.&_PFFLM58;6]M*UQ:WM6J!CK*SEXU9F
-MP0B'M4@:P7%XJ<2P$7$C&.[[0'%3EP[JNEH9"YJE/@8Y)3DC.2=YC&\GI+1]
-M/LKJYZO[%6A&$D(=BO;+4NV7&K3,MG8'AU\X'8J-@10X0NVBW4GX+E:NZ2DD
-K""'?4%E8,+)0TKPB^A18'EK6YS:\.RNO?XW_%$?C+C%^0'^Y&RIR:P(`````
+begin 644 nchilb_test2.res.gz
+M'XL("#/J'%P"`VYC:&EL8E]T97-T,BYR97,`79+/;\(@%,?O_!4O9H=VQ4Z@
+MUFVF'!8/6[)L!W<SQOB#*0EB4S!6__J5UHH=E_<%/M_W@,?T9_+Q!0"$P^?'
+M&_2LL;&2J]X83:\[E$.UN)!:VB`<(Q>!<]#KG52KA17&TEB+4VSLTMY,K$[7
+MT^OW"OJ7,.'@1B'U%HIL@(,2G_$EQ)/<,T,.-YW&-;\_;(Y*0$ZR&7&&.9[U
+M";[@\]S;1KR#4H>6%5.V<#6YPY^[.&OQAO.6.H.WO71MB;=="W2,M;5\W`H=
+MC,*H$6DK6!A=:C%L1=(*&O9=(&%;EPR:NDH:"XIF+@8YP3G%.<-Y$MY.2(A_
+M/D*;YVOZ%2B*4TPJ%.V7I=PO%2BAMW8'AU\X'8J-@0P80G[1[@1\%ZNJZ1FD
+L""'74%%8,**0PKPB\A18%EG:9S:Z.RMK?HW[%$=376+\@/X`CN#UGFL"````
 `
 end

Tst/Short/nchilb_test2.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1509982554:4103, 64 bit:4.1.0:x86_64-Linux:topgun:283696
-1 >> tst_memory_1 :: 1509982554:4103, 64 bit:4.1.0:x86_64-Linux:topgun:2203648
-1 >> tst_memory_2 :: 1509982554:4103, 64 bit:4.1.0:x86_64-Linux:topgun:2236416
-1 >> tst_timer_1 :: 1509982554:4103, 64 bit:4.1.0:x86_64-Linux:topgun:7
+1 >> tst_memory_0 :: 1545398835:4114, 64 bit:4.1.1:x86_64-Linux:megrez:304320
+1 >> tst_memory_1 :: 1545398835:4114, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
+1 >> tst_memory_2 :: 1545398835:4114, 64 bit:4.1.1:x86_64-Linux:megrez:2215936
+1 >> tst_timer_1 :: 1545398835:4114, 64 bit:4.1.1:x86_64-Linux:megrez:4

Tst/Short/nchilb_test2.tst

@@ -2 +2 @@
 tst_init();
 LIB"ncHilb.lib";
-    ring r=0,(x,y,z),dp;
+    ring r=0,(x,y,z),Dp;
 
     module p1=[1,y,z],[-1,z,y];

libpolys/polys/shiftop.cc

@@ -370 +370 @@
   if (p_mLastVblock(m, e, ri) + sh > ri->N/lV)
   {
-    Werror("letterplace degree bound is %d, but at least %d is needed for this shift", ri->N/lV, p_mLastVblock(m, e, ri) + sh);
+    Werror("degree bound of Letterplace ring is %d, but at least %d is needed for this shift", ri->N/lV, p_mLastVblock(m, e, ri) + sh);
   }
   for (int i = ri->N - sh*lV; i > 0; i--)
@@ -513 +513 @@
   if (last > ri->N)
   {
-    Werror("letterplace degree bound is %d, but at least %d is needed for this multiplication", ri->N/ri->isLPring, last/ri->isLPring);
+    Werror("degree bound of Letterplace ring is %d, but at least %d is needed for this multiplication", ri->N/ri->isLPring, last/ri->isLPring);
     last = ri->N;
   }
@@ -540 +540 @@
   if (last > ri->N)
   {
-    Werror("letterplace degree bound is %d, but at least %d is needed for this multiplication", ri->N/ri->isLPring, last/ri->isLPring);
+    Werror("degree bound of Letterplace ring is %d, but at least %d is needed for this multiplication", ri->N/ri->isLPring, last/ri->isLPring);
     last = ri->N;
   }
@@ -824 +824 @@
       if(has_order_a)
       {
-        WerrorS("ordering (a(..),lp/rp not implemented for LP-rings");
+        WerrorS("ordering (a(..),lp/rp not implemented for Letterplace rings");
         return NULL;
       }
@@ -860 +860 @@
       else
       { // should never happen:
-        WerrorS("ordering not implemented for LP-rings");
+        WerrorS("ordering not implemented for Letterplace rings");
         return NULL;
       }
@@ -867 +867 @@
       break;
     }
-    default: WerrorS("ordering not implemented for LP-rings");
+    default: WerrorS("ordering not implemented for Letterplace rings");
       return NULL;
   }