Changeset 3a17e5 in git


Ignore:
Timestamp:
Mar 4, 2021, 2:30:54 PM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
09d948a3819d87aa01e76fd1843f521e61242874
Parents:
39bce01458231034d994a18e2d7a71cc31a48159
Message:
fix: idModulo with T
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Tst/Short/liftstd_m.res.gz.uu

    r39bce01 r3a17e5  
    1 begin 644 liftstd_m.res.gz
    2 M'XL("!*C/V`"`VQI9G1S=&1?;2YR97,`G51-3X-`$+WS*R:-!XC#EEWL5YJ2
    3 M8+R8&`_2FS&&VJJ;4&C*-@5^O;/8LANCK7J!X<V;>6]F$I+YS>T]`/`([FZO
    4 MH:=*Q3*YZ$V=Y)`1$1#X+'.I7&_JZ#=$$63RE>#E\YKEJSTK5:JZBC""+KYB
    5 MT.\?R;"7ZAW2+(.78KV0>:IDD9=0O$*QT6&:0;I]VZU7N2J[#@-FN@T9;&7^
    6 M!@\P@P#="FML/,PVQNTH@G6JMK*"^%$\/89/Q*Q0$XF*C2&.B5@L=]D*8C[[
    7 MC-S8,_F)R8M9S*E3E^-!I(L(Y(P)"^>=^-R`HFN4&-!:$:<5;6@JY1ZVY'9N
    8 M<(Z)1YYJ#!!H#/T$I\':IU&P:ORZZ;H,HD.7.14$R)$61'P*?4Y??HT.UT"`
    9 M%1CMX;$JH2J_:B[K!AW=6%!I51-BD4>6Z?$ITST">K\U/OF/<1$8+X)_]1)S
    10 M,A$+KVVH]9U6V%0(6[-5=+28(5CW$:?O\Z=AQ;^N)/YR)6%=28R_W4QR<C>3
    11 M,[L)`]L-90.3XD8[%-]JM]LZI1^&Y_2O+)'!#P.>EQF>DQG]/.;8<C!A[>]1
    12 2_P!WI<N]Z87S`7`4#]%4!0``
     1begin 640 liftstd_m.res.gz
     2M'XL("#C<0&`"`VQI9G1S=&1?;2YR97,`G51-;YM`$+WS*T96#Z`N&W;`7[&,
     3M1%6IBE3G4'R+HH@T3HJ$P3)K!?CUG<7.[JJ*39,+'L_7>_,&)EU_O[D%`!'#
     4MSYMO,)*UY$7^.%HXZ2F",9#S(2]SZ7H+1_U"'$.1/Y/[Z6'+R\TKKV4F=448
     5M@[8C#E=7;\GPFLL_D!4%_*ZVCWF9R;PJ:ZB>H=HI,RL@V[\<MIM2UKK#F)MN
     6M$P[[O'R!7["$@+D-:UGGL6)GV$YCV&9RGS>0W.']77A/F0U3B93*.I,XH\3J
     7MZ5!L(!'+H^4FGHG/31R7B:!..B:"6!614W".EE]H\+5QHFZ4&J<ED2")=C25
     8M=$\JN9H-6[/4(TXM"QC0&.H)3L=:GT9A3>>WG>XRCD]=UE00,,%((,HGTQ?T
     9MSV^9(Y0C8`T8[,E;54I5?M-];3OFJ,9(I4U+'BMY:I&>72(](L?H?XG//T,<
     10M`\,%Q;]<$D$D$O3ZA@K?Z8%-!=J8/:*CP$R"M1^\O)\/#8N?VA)^9$MH;0EG
     11M[RJ37M1F/J!-&-AL*!J8D##8(;Z+W:MU"3\,A_`C"V1\9L!AF,D0S/3\F'0[
     12MTN/-J!1@@OJ=UU]X."1C=%[&R)(QPOZ`]H?S-.,U_%@J,Z5Q5\=Q887>M>%$
     13<WA5Q\G23D/<W7%WI0^T*;_'%^0NK5O.>^04`````
    1314`
    1415end
  • Tst/Short/liftstd_m.stat

    r39bce01 r3a17e5  
    1 1 >> tst_memory_0 :: 1614783250:4201, 64 bit:4.2.0:x86_64-Linux:terra:85272
    2 1 >> tst_memory_1 :: 1614783250:4201, 64 bit:4.2.0:x86_64-Linux:terra:2150192
    3 1 >> tst_memory_2 :: 1614783250:4201, 64 bit:4.2.0:x86_64-Linux:terra:2191296
    4 1 >> tst_timer_1 :: 1614783250:4201, 64 bit:4.2.0:x86_64-Linux:terra:3
     11 >> tst_memory_0 :: 1614863416:4201, 64 bit:4.2.0:x86_64-Linux:nepomuck:85544
     21 >> tst_memory_1 :: 1614863416:4201, 64 bit:4.2.0:x86_64-Linux:nepomuck:2150192
     31 >> tst_memory_2 :: 1614863416:4201, 64 bit:4.2.0:x86_64-Linux:nepomuck:2191296
     41 >> tst_timer_1 :: 1614863416:4201, 64 bit:4.2.0:x86_64-Linux:nepomuck:3
  • kernel/ideals.cc

    r39bce01 r3a17e5  
    195195}
    196196
    197 static ideal idGroebner(ideal temp,int syzComp,GbVariant alg, intvec* hilb=NULL, intvec* w=NULL)
     197static ideal idGroebner(ideal temp,int syzComp,GbVariant alg, intvec* hilb=NULL, intvec* w=NULL, tHomog hom=testHomog)
    198198{
    199199  //Print("syz=%d\n",syzComp);
     
    201201  //PrintLn();
    202202  ideal temp1;
    203   tHomog hom;
    204203  if (w==NULL)
    205     hom=(tHomog)idHomModule(temp,currRing->qideal,&w); //sets w to weight vector or NULL
     204  {
     205    //if (hom==testHomog)
     206      hom=(tHomog)idHomModule(temp,currRing->qideal,&w); //sets w to weight vector or NULL
     207  }
    206208  else
    207209  {
     
    471473  poly p;
    472474  int isIdeal=0;
    473   intvec * w=NULL;
    474475
    475476  /* find 0-ideals and max rank -----------------------------------*/
     
    690691
    691692  ideal h3;
    692   if (w!=NULL) h3=idGroebner(h2,syzcomp,alg,NULL,*w);
    693   else         h3=idGroebner(h2,syzcomp,alg);
     693  if (w!=NULL) h3=idGroebner(h2,syzcomp,alg,NULL,*w,hom);
     694  else         h3=idGroebner(h2,syzcomp,alg,NULL,NULL,hom);
    694695  return h3;
    695696}
     
    21802181
    21812182#ifdef HAVE_SHIFTBBA
    2182 ideal idModuloLP (ideal h2,ideal h1, tHomog hom, intvec ** w, matrix *T, GbVariant alg)
     2183ideal idModuloLP (ideal h2,ideal h1, tHomog, intvec ** w, matrix *T, GbVariant alg)
    21832184{
    21842185  intvec *wtmp=NULL;
     
    23822383  if (T!=NULL) idDelete((ideal*)T);
    23832384
    2384   int i,k,rk,flength=0,slength,length;
     2385  int i,rk,flength=0,slength,length;
    23852386  poly p,q;
    23862387
     
    25222523  else
    25232524  {
    2524     *T=mpNew(IDELEMS(s_temp1),IDELEMS(h2));
     2525    *T=mpNew(IDELEMS(h2),IDELEMS(h2));
    25252526    for (i=0;i<IDELEMS(s_temp1);i++)
    25262527    {
     
    25412542            {
    25422543              poly p = q;
    2543               long t=pGetComp(p);
     2544              long t=p_GetComp(p,orig_ring);
    25442545              pIter(q);
    25452546              pNext(p) = NULL;
    2546               pSetComp(p,0);
    2547               pSetmComp(p);
    2548               pTest(p);
    2549               MATELEM(*T,(int)t-length,i) = p_Add_q(MATELEM(*T,(int)t-length,i),p,orig_ring);
     2547              p_SetComp(p,0,orig_ring);
     2548              p_SetmComp(p,orig_ring);
     2549              p_Test(p,orig_ring);
     2550              poly a=MATELEM(*T,(int)t-length,i+1);
     2551              p_Test(a,orig_ring);
     2552              a=p_Add_q(a,p,orig_ring);
     2553              p_Test(a,orig_ring);
     2554              //MATELEM(*T,(int)t-length,i+1) = p_Add_q(MATELEM(*T,(int)t-length,i+1),p,orig_ring);
     2555              MATELEM(*T,(int)t-length,i+1)=a;
    25502556            } while (q != NULL);
    25512557          }
     
    25532559        else
    25542560        {
    2555           p_Shift(&(s_temp1->m[i]),-length,currRing);
     2561          p_Shift(&(s_temp1->m[i]),-length,syz_ring);
    25562562        }
    25572563      }
     
    25802586*computes module-weights for liftings of homogeneous modules
    25812587*/
     2588#if 0
    25822589static intvec * idMWLift(ideal mod,intvec * weights)
    25832590{
     
    25922599  return result;
    25932600}
     2601#endif
    25942602
    25952603/*2
     
    32193227{
    32203228  GbVariant alg=GbDefault;
    3221   if (strcmp(n,"slimgb")==0) alg=GbSlimgb;
     3229  if (strcmp(n,"default")==0) alg=GbDefault;
     3230  else if (strcmp(n,"slimgb")==0) alg=GbSlimgb;
    32223231  else if (strcmp(n,"std")==0) alg=GbStd;
    32233232  else if (strcmp(n,"sba")==0) alg=GbSba;
Note: See TracChangeset for help on using the changeset viewer.