Changeset 17bc740 in git

Timestamp:

Feb 5, 2021, 6:59:30 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

ff4cbacc83944accd7caea5f872dc17187736644

Parents:

66805e9596322cdaf1ea898965d3b22dfc939b1d

Message:

fix: liftstd

Files:

• Tst/Old/liftstan.res.gz.uu (modified) (1 diff)
• Tst/Old/liftstan.stat (modified) (1 diff)
• Tst/Short/liftstd_s.res.gz.uu (modified) (1 diff)
• Tst/Short/liftstd_s.stat (modified) (1 diff)
• kernel/GBEngine/kutil.cc (modified) (8 diffs)

Tst/Old/liftstan.res.gz.uu

@@ -1 +1 @@
 begin 644 liftstan.res.gz
-M'XL("%Q2!&`"`VQI9G1S=&%N+G)E<P"555%OVC`0?L^O.*$]A.E&8R>PMBAY
-MJ/8R:=I+]U2$4!I"935.JCAE3G[]S@8<=ZL*LT"<[>\[W_D['_>_OGW_"0`L
-M@ZNKX/XXXS.:05>J#E31BI<.=DT+E=AUJMM"T4B9UUN'CF<^-YE!*^HG:!FD
-M$/,HBC'4V.,PQ;#`2DV7#CK/"+4,Z*BB*7<[48BR[M0M/#Q<6:+9J5_E8]E"
-MLX-]WBJX!;MZ'(]54SR;Z&F]:;>E/;AX!\!]0*4\Q#ANH<YEJ8RIH8?!A;G(
-MX,?W.YA4XC&:C-%_S6#RY>-!Z#,(Y^TZ`[$M\PH$2V6NK1W&WF7=.`!/]0+[
-M!(<YZA[[`?7@8"PB&%\&@J_8FG#&X.NT3XP1K]-A;HR$MGICS&EK,,:"5ES&
-MC*I!YETK-$A&+$.T$M))V&MD?-`88<\QUCT?S^89O!`OE(SBU@C0TW=`<Z,!
-M,8&B)9"Q@LCL<@3CP/'C[%1CH>!HO6Q,&A3TQF8QT&]LL]G8',Q\;G/9V`P6
-MSE5R7IQ+Y!D%8E2L^[+HZ!WL6;K2B4E?#WP]IK\8$3Q=]3'J:^1#XB&H9&2S
-M?:U*D.F>X=Z[.])?+@-ITO6<TP+E[?ER^!O_KNDV_0\[7/#!<JL!>XN*',K'
-M!G^QWJ".&Z<@>#0*)CV]_'BM<'Y&)RZ[0*$+!'+^N(E%==0EPKRJIK:M4`_Z
-M:*RB-<!GTQ-<0Y!PGG&0$*%]AABIM3R5==GFI'NHIL[1GI]W=*B6D<+^FR(O
-MH!Q?,J>NQAU17!">;3<(B_<3%.Q"#Q#>WTVI=J)__%#A;%27=Z]JLQ/T*-YS
-MH;I#S[9EEM>SNOP],QRG.S6-9U%5]I_DM)8<.S919M2U)\OQI)"J]-,R^`/@
-',$9R^`8`````
+M'XL("!B''6`"`VQI9G1S=&%N+G)E<P"55<%NVS`,O?LKB&`'9U!32W:RMH%]
+M*'8I,.S2G1H$@>LXA5#++BPWD_3UHY145K>BR80$H:GW*#Z19NY_?;_["0"T
+M@,O+Z/[XQ&;X!$,M!Y!5SU\&V'4]-'PWR&$+52=$V6X].IV%W&P&/6^?H*>0
+M0\J2)"6Q(IJ8*8DKTLCITD/G!:*6$1Y5=?5NQRM>MX.\@8>'2T>T.^VK>*Q[
+MZ':P+WL)-^"\Q_78=-6SS1[]7;^MW<'5!P`6`AH9(,9U`VTI:FE-!1J,3W-1
+MP(^[6Y@T_#&9C-E_*V!R\?E"]`F$CW95`-_690.<YJ)4SH[3X+*N/8#E:D%T
+M1LR<*$VT(<IX&$T0QI819RNZ1IPUV#K7F372=6[FULAP2UMCCEO&&@OT>,44
+MNT&40\\5"(HL2W0EQ).(5H0RHTA"-".ITFP\FQ7P@KQ84,Q;$0"-7T/LC4;(
+M!,P60=:*$KO+"-@`GI\6;ST6<T9<E(V5@4EOG`J#OZE3LW$:[//<:=DX!0L?
+M*CM=G'/*,Q:(8K/NZVK`]V!/\Y7*K'QEV'J4OQ@1+%_IE*@KPDP6(+!E1+=]
+M;6H0^9Z2?7!W6'^QC(25&P1'!^H.8GG\=7C7>)OAAQXN^&!Y;T3?HQ*/"K'1
+M7ZQWJ./&6Q(L&0LF@GJ%^;K"A8I<!5?8/?,+1=&G4\,NF,H"<8R>4;TSBN?C
+M,9NG''""Q&733-W(P?GTV5HE:X"O=E[X82'@-.-07@+],Z0$Q\Y3W=9]B3T1
+MRZD/M&>G`QTZ::30_Z:(,RC'MYSAQ!OG*C\C/3>*""P^%LCIF1$@OK^=8E\E
+M_\3!IMK(H1Q>Y6;'\87Y*(0<#O/<M6#9SMKZ]\QR?-UQH#SSIG'_,F^^[#C-
+7D3+#B3Y9CB?%V,%?EM$?RH5>AQ0'````
 `
 end

Tst/Old/liftstan.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1610895964:4201, 64 bit:4.2.0:x86_64-Linux:terra:87656
-1 >> tst_memory_1 :: 1610895964:4201, 64 bit:4.2.0:x86_64-Linux:terra:2277376
-1 >> tst_memory_2 :: 1610895964:4201, 64 bit:4.2.0:x86_64-Linux:terra:2308048
-1 >> tst_timer_1 :: 1610895964:4201, 64 bit:4.2.0:x86_64-Linux:terra:3
+1 >> tst_memory_0 :: 1612547864:4201, 64 bit:4.2.0:x86_64-Linux:terra:87656
+1 >> tst_memory_1 :: 1612547864:4201, 64 bit:4.2.0:x86_64-Linux:terra:2277376
+1 >> tst_memory_2 :: 1612547864:4201, 64 bit:4.2.0:x86_64-Linux:terra:2308048
+1 >> tst_timer_1 :: 1612547864:4201, 64 bit:4.2.0:x86_64-Linux:terra:3

Tst/Short/liftstd_s.res.gz.uu

@@ -1 +1 @@
 begin 644 liftstd_s.res.gz
-M'XL("!V;!6`"`VQI9G1S=&1?<RYR97,`G1A=;YM(\-V_8I3>`Z[7E`4#=G)8
-M5G4OE:I[N.:ID641@E.N@"W`*5#=?[_9-<PNMM/X#B7VL/.Q\SV[_G+_QZ<_
-M`8`OX?.GCW!3E969)H\W=Z,O'<9>`BYNDCRIC/'=2'S#<@EILL7EITUIYO$/
-MLZS"BCB<)7SX0&\S$]^@BLL*RJA(]A5L=T7/#M$NR\+\B:A=4^?U3"B2_!D*
-M#@$XMF4YS*A9P]HQ,R*6EF.EIK]$JKL1;A7MXNTVB9(XK\I;^/KU@V04F/R0
-M/<8%[+;P$A8EW()<[9['=!=]%Y[`]5WQ%,N-HPL$MDZ0EAJ%>FXA#[.X%&`-
-M#;2DYGP)!"],V!>["/996(&!'T520\;2!%WU;MR3<<N$G_3"361,MF!`F;2Q
-M\6X,00"6(G8$7I%+=T[U![(PR2$*R_@6DGQ_J"`I(83C[@SR'91QM,N?("R>
-M#QGZ<#I\2+1O2DN3O()5G,992;'@"PV5I7%.&)MKF'*`<31,I)9=;;E0R_Z9
-M75.,^P&ILK!.LC"5[A&1CL/H&Z+20Y8SP$R#\I#!80_35^RR4?D>=CIU1<(:
-MJ%;`[_#S]R!'>:61C<5;L(HFG/SO=&;\[%1&$XU5I-+4Z>SI9*X**;)`D<7N
-M1R>R"%:%+M+O62BLSL*D3#OZ'LNC`R;`:;<95W1E)?-U51I'0DR<;LW('E8%
-M6T7K\>2&J<*?.=HF(E:"0>2<$J'LFKF*6&3GD6%)#B!K9KXB)'MFFCU`/,*F
-M08ZXFCG_T"*IJ99(&9E]0H[\GIS'P^W44;R+\\RB#-L7(JAAFL(4XCJ*L9>E
-M(1;K%$3TX#(799;'569YG=9]5,*#*A_/'>+*>(\FW(`*C=?7GO"T-&T9P#Y\
-MCG\D3]4W\K77N97\[),#.Z'8NM,DCTFP[YRXPW>5SKYO7LC<UQ/7/]U^KK:G
-MI%4U/:=`"F\(BY7!\Y.RN:(2Y^=E,]?+YKB'_)IH5?'`69\D:XF(]Z3%@O^J
-M[,@11'Z>F0M7MU%1GF;AXE(6=NDG,P[W`@-[M1R?$&XK'&L2@0V[:,;P:A9R
-M2V4AMSH-SQS.K4Y1,O/4.FX-LJ$/R*OQX-9)-G#.S?\?"\X=\^I(<.X._<O[
-MX37<F=IA+X#UYJPU60OS+("\GVM%7!V*W%#4Q[%&^]K#>=R/VE>G\<DH%LCG
-MY`7K_3RN8B02O+AT2N!`P3@.-@I%/[4D1]7LX]W6>/?`UY+M!I/N1F-U3^*H
-MYM.%9L;5J.JQ5::BJ`;4<5JF"N,,,)%"N`-$H1#^H$?`%;.5J\%#YNA#YKPN
-M7&TH7MN*N.N>SSSN^H.9AUZY,)#5OL,).2P8Y,52$0$39:(-"NY=F)C<<X86
-M*FK7/*,]Z4S\.%/H54P4]6+3X9:+27(S_?6#>KY!0=)F2TB>8CS6)3P0)SP!
-M&X[RC^\2@1W4'FMFK'59W;"F976KR#PDL_$28Z.SD$X`]CIH9@)PUD'K"F"&
-MJ$8`+J):`7BXTI(0O&KTAW6.7()17DIP)];4C-MMS2S6V,RI&UOMC4=_<=(W
-M,HYZ8W%#@_\M$^X=(2>@MEBZ`AI9`FLS$`*(?T&7+B.QF92R$6:@TAMI18O?
-MCK1F(VT0[ZZT92,M\'I1<VOY9G"N"8\*T!SOCR]Q5&%)O/#@H9X)\^O67I/Y
-M<UM1V,%#X[!ZSNQVIE'@O3';/1W2&++@A;,7Y;LYQC^[&V7"7$TX+J#=FBRB
-M=W5?HS?U/WYT\!&BU1$?4EE$I=..3K@&5!V"E/!4P#(M7KJ^,G"Z13VO?T6$
-MK@@0R9L+7<H*[[T&GE_'\J*,M^I?/0_6&N"]:$ATQ<W@;8YC"!D4W\%A>%E^
-MCO.X"#'N1CDF02_VVX*.V:)8^']FR:Y@Z2K9QGNZ38S)%>K)=L/`NVQ@PJ^4
-M`,:7CV/,'>M,COC51?RN<B@WVP2+XI*(;JB^^F,,GV/7^)[@C:6@:R%?8/E+
-MMK_4$M;O?I<VL`UJ9]+XD]:>U(UJG`N;^FOP=QCM'HVM:KX+AQKBO5JDEEUF
-M`?4M=J^QN3V;46;C:0<FX_?WLE`8EHHE`;L'G!Z8]8#;`UX/^`+H=_`ZXS5#
-3_:7F6`.+\K>[T;_65,G'!1,`````
+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
+DP*P'W![P>L`70+^#UQFO&>HO-<<:6+"_W8W^!7]C/Z`A$P``
 `
 end

Tst/Short/liftstd_s.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1610980125:4201, 64 bit:4.2.0:x86_64-Linux:terra:85960
-1 >> tst_memory_1 :: 1610980125:4201, 64 bit:4.2.0:x86_64-Linux:terra:2183168
-1 >> tst_memory_2 :: 1610980125:4201, 64 bit:4.2.0:x86_64-Linux:terra:2308016
-1 >> tst_timer_1 :: 1610980125:4201, 64 bit:4.2.0:x86_64-Linux:terra:3
+1 >> tst_memory_0 :: 1612547864:4201, 64 bit:4.2.0:x86_64-Linux:terra:85960
+1 >> tst_memory_1 :: 1612547864:4201, 64 bit:4.2.0:x86_64-Linux:terra:2183168
+1 >> tst_memory_2 :: 1612547864:4201, 64 bit:4.2.0:x86_64-Linux:terra:2308016
+1 >> tst_timer_1 :: 1612547864:4201, 64 bit:4.2.0:x86_64-Linux:terra:3

kernel/GBEngine/kutil.cc

@@ -2000 +2000 @@
   if (strat->sugarCrit && ALLOW_PROD_CRIT(strat))
   {
+    if (strat->fromT && (strat->ecartS[i]>ecart))
+    {
+      pLmFree(Lp.lcm);
+      return;
+      /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
+    }
     if((!((strat->ecartS[i]>0)&&(ecart>0)))
     && pHasNotCF(p,strat->S[i]))
@@ -2021 +2027 @@
       return;
     }
-    else
-      Lp.ecart = si_max(ecart,strat->ecartS[i]);
-    if (strat->fromT && (strat->ecartS[i]>ecart))
-    {
-      pLmFree(Lp.lcm);
-      return;
-      /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
-    }
+    Lp.ecart = si_max(ecart,strat->ecartS[i]);
     /*
     *the set B collects the pairs of type (S[j],p)
@@ -2067 +2066 @@
     if (ALLOW_PROD_CRIT(strat))
     {
+      if (strat->fromT && (strat->ecartS[i]>ecart))
+      {
+        pLmFree(Lp.lcm);
+        return;
+        /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
+      }
       // if currRing->nc_type!=quasi (or skew)
       // TODO: enable productCrit for super commutative algebras...
@@ -2088 +2093 @@
           return;
       }
-      if (strat->fromT && (strat->ecartS[i]>ecart))
-      {
-        pLmFree(Lp.lcm);
-        return;
-        /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
-      }
       /*
       *the set B collects the pairs of type (S[j],p)
@@ -2236 +2235 @@
 }
 
-/// p_HasNotCF for the IDLIFT case: ignore component
-static BOOLEAN p_HasNotCF_Lift(poly p1, poly p2, const ring r)
+/// p_HasNotCF for the IDLIFT case and syzComp==1: ignore component
+static inline BOOLEAN p_HasNotCF_Lift(poly p1, poly p2, const ring r)
 {
   int i = rVar(r);
@@ -2252 +2251 @@
 /*2
 * put the pair (s[i],p)  into the set B, ecart=ecart(p) for idLift(I,T)
+*  (in the special case: idLift for ideals, i.e. strat->syzComp==1)
+*  (prod.crit applies)
 */
 
@@ -2259 +2260 @@
   assume(!rIsPluralRing(currRing));
   assume(i<=strat->sl);
+  assume(strat->syzComp==1);
 
   if ((strat->S[i]==NULL) || (p==NULL))
@@ -10013 +10015 @@
 #endif
   if (TEST_OPT_IDLIFT
+  && (strat->syzComp==1)
   && (!rIsPluralRing(currRing)))
     strat->enterOnePair=enterOnePairLift;