Changeset d25e3f in git

Timestamp:

Jul 18, 2018, 1:14:33 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

cebb9879c2629291abb5ffeb202af73fa0749eb3

Parents:

55b29ffa7e5ceaaf5e8681e442c601fdf88fd855

Message:

std(I,p)

Files:

• Singular/iparith.cc (modified) (6 diffs)
• Tst/Short/bug_tr224.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_tr224.stat (modified) (1 diff)

Singular/iparith.cc

@@ -2176 +2176 @@
       // Allow imap/fetch to be make an exception only for:
       if (nCoeff_is_Extension(r->cf) &&  // Q(a..) -> Q(a..) || Q || Zp || Zp(a)
-         ((n_SetMap(r->cf->extRing->cf,currRing->cf)!=NULL) 
-         || (nCoeff_is_Extension(currRing->cf) && (n_SetMap(r->cf->extRing->cf,currRing->cf->extRing->cf)!=NULL))))
+         ((n_SetMap(r->cf->extRing->cf,currRing->cf)!=NULL)
+         || (nCoeff_is_Extension(currRing->cf) && (n_SetMap(r->cf->extRing->cf,currRing->cf->extRing->cf)!=NULL))))
       {
         par_perm_size=rPar(r);
@@ -3296 +3296 @@
   assumeStdFlag(u);
   ideal i1=(ideal)(u->Data());
+  int ii1=idElem(i1); /* size of i1 */
   ideal i0;
   int r=v->Typ();
   if ((/*v->Typ()*/r==POLY_CMD) ||(r==VECTOR_CMD))
   {
-    i0=idInit(1,i1->rank); // TODO: rank is wrong (if v is a vector!)
-    i0->m[0]=(poly)v->Data();
-    int ii0=idElem(i0); /* size of i0 */
+    poly p=(poly)v->Data();
+    i0=idInit(1,i1->rank);
+    i0->m[0]=p;
     i1=idSimpleAdd(i1,i0); //
     memset(i0->m,0,sizeof(poly)*IDELEMS(i0));
@@ -3326 +3327 @@
     SI_SAVE_OPT1(save1);
     si_opt_1|=Sy_bit(OPT_SB_1);
-    /* ii0 appears to be the position of the first element of il that
+    /* ii1 appears to be the position of the first element of il that
        does not belong to the old SB ideal */
-    result=kStd(i1,currRing->qideal,hom,&w,NULL,0,ii0);
+    result=kStd(i1,currRing->qideal,hom,&w,NULL,0,ii1);
     SI_RESTORE_OPT1(save1);
     idDelete(&i1);
@@ -3338 +3339 @@
   {
     i0=(ideal)v->CopyD();
-    int ii0=idElem(i0); /* size of i0 */
     i1=idSimpleAdd(i1,i0); //
     memset(i0->m,0,sizeof(poly)*IDELEMS(i0));
@@ -3359 +3359 @@
       }
     }
-    if (ii0*4 >= 3*IDELEMS(i1)) // MAGIC: add few poly to large SB: 3/4
-    {
-      BITSET save1;
-      SI_SAVE_OPT1(save1);
-      si_opt_1|=Sy_bit(OPT_SB_1);
-      /* ii0 appears to be the position of the first element of il that
-       does not belong to the old SB ideal */
-      result=kStd(i1,currRing->qideal,hom,&w,NULL,0,ii0);
-      SI_RESTORE_OPT1(save1);
-    }
-    else
-    {
-      result=kStd(i1,currRing->qideal,hom,&w);
-    }
+    BITSET save1;
+    SI_SAVE_OPT1(save1);
+    si_opt_1|=Sy_bit(OPT_SB_1);
+    /* ii1 appears to be the position of the first element of i1 that
+     does not belong to the old SB ideal */
+    result=kStd(i1,currRing->qideal,hom,&w,NULL,0,ii1);
+    SI_RESTORE_OPT1(save1);
     idDelete(&i1);
     idSkipZeroes(result);
@@ -6915 +6908 @@
       // Allow imap/fetch to be make an exception only for:
       if (nCoeff_is_Extension(r->cf) &&  // Q(a..) -> Q(a..) || Q || Zp || Zp(a)
-         ((n_SetMap(r->cf->extRing->cf,currRing->cf)!=NULL) 
-         || (nCoeff_is_Extension(currRing->cf) && (n_SetMap(r->cf->extRing->cf,currRing->cf->extRing->cf)!=NULL))))
+         ((n_SetMap(r->cf->extRing->cf,currRing->cf)!=NULL)
+         || (nCoeff_is_Extension(currRing->cf) && (n_SetMap(r->cf->extRing->cf,currRing->cf->extRing->cf)!=NULL))))
       {
         par_perm_size=rPar(r);

Tst/Short/bug_tr224.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_tr224.res.gz
-M'XL("*=C15@``V)U9U]T<C(R-"YR97,`[5C;3MM`$'W/5XRJ/NP2.WC7ZUR%
-M'Z"J%*D@1/I$U5BY&+!*;.1U2M6O[^SZ3DR4DE2`5%O:R^S,V9TSGK&3R==/
-MXPL`8"Y\&9_"AT0FG?M@_F'4FF0KW`44>D$8)(2.6JH'UX7Y^M9+8LY%)_0?
-M.S*9)86%[4(Q%AV(@_`6KN`$"*<&F7O<$X9J'6R%QWK&0G5]8^8QST(9\QB*
-MF,=Q;'L#W3(+3<\)-[@A\&;ZMO&V]&VR:F?5I0TK!Q%N%5/CC)8<.BY<C5K'
-MQ["(_)N;8!'X82*'<'U]S)4T7*_F?@S1#?R<Q1*&,%#2[)K?1XL?*D(HC^*E
-MK^D\KRB4UQ#"V<J7VDK1K%L'4IHAI1DTS:!I!DTS:)HAI?D9W$<_N+U+9#;G
-MM4[4.M;4V5FW$[K5T)EL!^&+T;=M\E?HVQ'V1=_IF/NBOV"3PT;U8.@[[74@
-M]&?V:DAC7DWCLZ)"=%V('I(@"LE#'"65TM%S(5CZLWL88P65R9+H&=%9/.5I
-MT3Q*BZ;.^:.\C&+F9^-<1Q73<LRLS$`;3WE;SZ8\K<"I>CO7**MU!5]L*A4G
-MT:IZHI>=*:_,1,,!,E&QK@"JR-/L=9`?M"ZM6CM5:V=J9R^0S-#9W`YUMFS;
-M3NMF3E/I6^YZZMLF$9F'A7:Q&V^:-EGG(:ES4SU/AI_[-A5/4$IW-,J3:>I?
-M/D]Q*3Y[WQCO#9GUG1/6HY*P+I4V88X:"BH%8;8:<M4P*M4:IZ9C2C)0(DNK
-MH,3LFJF&-M-8N#"@MFD*$QO3["D%1XO["D&8*,>F;TI'[:+5A);9Q:+9PA19
-MKA<)+.(@P42*PF&?P^)N%H05$7.*'.KG.72).93%$=KIV]%(!4;V>C32=V*9
-M?P,79/#;)Q>?B<J^L7%)C72@VDM*JX0QPI6['"G@RE.I_5($=:GV5"B':^PI
-MOA1U?1PB05VB-!75BC+4[.%7DY1]V>`TXVS#:ZMR%K4/&G,IFJR[6VU?WP\R
-M&>+.\>;5LO+@,.MI<+*8&'FHZL%YWX2\I;/L$AQ6_@Q@O`.K61('OXHDHB<G
-M-4F>3?^3Z5_XP8I(X(^S9;`JP_"V^"Z?'E$]9]/#\;X#4CKJ%%]^L;^<G):?
-M?@R_"=]4TJBD1["-:\]L0EB;-L.\5A3W]K3,MUZE"O8[^J\4]6?)&@]#1Q];
-*?P`SX$SL@!$`````
+M'XL("-@@3UL"`V)U9U]T<C(R-"YR97,`Y5=;3]LP%'[OKSA">[!I4F+'[E7D
+M`:9)2`,ANB>F->HE0#2:H#@=TW[]?,NE-'0%BGA8(OER?,YGG\\^Q\GXV^>S
+M"P`@`7P].X&#7.2=^WAV,&J-[0@-0`K#.(ESA$<M54,0P&QU&^89I:R31(\=
+MD4_STL(/H&RS#F1Q<@M7<`R(8@?-0AHR1Y5<EBPD/6>NJKXS#4GH21D)B121
+MD,JV'PYT23QI>HZH0QTF7Z)?7[Z>?EU2K[QU:</(7H1;Q=@YQ16'/("K4>OH
+M".9I=',3S^,HR<40KJ^/J)(FJ^4LRB"]@5_33,`0!DIJG]E].O^I=DC*TVP1
+M:3K/:PK5,X1DNHR$ME(TZY*#H1D,S:!I!DTS:)I!TPR&YF=P'Z/X]BX7MD_7
+M*K96D:;*M]5.Z%Y#Y9(=A*]&WS;)B]"W([P5?:=EOA7]%9/L=U?WAK[37'M"
+M?V:NAC"F]3`^+3-$-X#T(8_3!#UD:5Y+';T`XD4TO8<SF4%%OD"ZAW043ZA)
+MFH<F:>J8/RS2J(Q\VRYT5#*MVL2S!MIX0MNZ-Z$F`QOU=J%19>L:/MM4*E>B
+M575'#_,)K?58PP*LJ!Q7`'7DB;T.BH6N2^O6O&[-)[Z]0*PAWYQ.ZFR9MFWR
+M9D%3Y5OANO%MDPCK8:E=SD:;NDW6Q9:L<U-?C\4O?)NP)RB5.QKE2=?X5_0-
+M+I9G[SNAO2'Q?E!$>E@@TL7"1X2K)L."(>*K)E4%P4*-4>QR5Z"!$GE:14K<
+MKFLTM)G&D@,#[+LN<V7ANCVEP+6XKQ"8*^6RZ+N"JUFT&M,ROQQT6S)$%JMY
+M#O,LSF4@I<FP3V%^-XV3FHCP,H;Z10Q=RABR^PAM<SLZ1N#8Z]$Q=V(5?X,`
+M1/PG0A=?D(J^,^<2.Z:ARDN,ZX01U,>"HI[T7;+"55OZI3FQKNB'-[E`/+;A
+M@U=#5IQ+RJE@HL&ZN\66*EO?E8O15/>QOW4A`]Z`A<9#N7/9YM/R"JJ(]Y0J
+MRY!3$+=.U<<Z]'Y;M@M5I/I$)K0#RVF>Q;_+`X:/C]<DQ4G['PX:*7F1OQ&+
+M>%F1\I[>5SO#ZK,V$?^Q]%0+Y>470Q8MQB?5)P.1WQ+O>*#4\99#&\\;3YJ$
+F]7$SS*LY?<%2_W$6>[5X[7?T#['ZY5U)@O#H4^LO)E_^O$8/````
 `
 end

Tst/Short/bug_tr224.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:117464
-1 >> tst_memory_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_memory_2 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_timer_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:1
+1 >> tst_memory_0 :: 1531912408:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:96824
+1 >> tst_memory_1 :: 1531912408:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2150160
+1 >> tst_memory_2 :: 1531912408:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2191264
+1 >> tst_timer_1 :: 1531912408:4112, 64 bit:4.1.1:x86_64-Linux:nepomuck:2