Changeset 780e11 in git


Ignore:
Timestamp:
Oct 19, 2011, 4:47:55 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
b304ba2d40702a4f469ed9a2270027d1188c0c75
Parents:
1327a0002c1e1e8edbf06eba651a4e39a3a26c9d
Message:
fix tr. 255


git-svn-id: file:///usr/local/Singular/svn/trunk@14420 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
4 edited

Legend:

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

    r1327a0 r780e11  
    11begin 640 bug_qring.res.gz
    2 M'XL("-%?8$H``V)U9U]Q<FEN9RYR97,`A53;;IPP$'WG*T91'R#+$FZY[0H>
    3 MTBI2I&A?MF]5A+AX4ZM@6-M0P==W,"RP33=%`H_&9XYGSHS9?__VL@,`)X37
    4 MER>XDD):.4VNMMI^W'%#0&=$&96ZL=7Z%<(0DOH].G+*WBU&?EM"QG**\$*8
    5 M;-^"FQM@)2_B'`ZX0,PR2,NBRHDDL'L&RD#QB,T4=&O-!'<6]+M0!;:IMV9G
    6 MUF9CF%DU)W@?0EE)6C*=DVS_9,P[#^%`#<=`R$RG&8ESO5W5[JIN/+/KO\8"
    7 M_HCPK8;I`J0_8QZGDG`J)$UA`_;@9W61$`[E`9J8"_3[@U\]25ZFOWHMT5_R
    8 MC*BCLVJ!F)\-L+@@HC=;Z*"&YA]$[I+H:P\XUJ6DA,E!DP,O"U!5:=$/YRW`
    9 MPMIUA[:+=N.M>M-["]K&6W?]6Y]*=>QPB`,:H*:3!`Z.@5(*55&,ZW8U\B'O
    10 M"803L7O6!YQI&TJRZVN(@`KL-!)@BV.>01(+*C[AP3FA##7&MHULIV-';+L`
    11 M^Y@9D<,HS/G>GM5AGO=VAMU=&A'G?BKX8X\`SK,9U*Q=7'TE\,3RH!2)S,M3
    12 M]G=E`]<HBW\FR^-_9;F8B&LO8N<>?9+6!^H3DS-?8M>UU"^@O^2UT!UC^T7[
    13 )`];A*9`X!```
     2M'XL("*+AGDX``V)U9U]Q<FEN9RYR97,`K51-;Z,P$+WG5XRJ/4!P*)BDS8?@
     3MT%U5JK3*)7M;-9$=2-?:!!(PK,BO[X#YBAJJ5EVDQ)8]\^;-FQFO?OUX6@*`
     4M[<'/IP>XD8DT]X+?+`:KZH9Z@(<;$0JIZ8M!L8+G`4]?-J=8A"]F&/PS$\ED
     5MX^%XT.S')MS>0AC%![:''2[`0A^VT>&X#V0`RT<0(90XR;QQFI@MP)T)Q2T<
     6M78MH.3F3E&0Z\8\MP7L/HJ,44:C%@;]ZT-N;J:>@X>0FTM>$'["]EALI-=+,
     7M(>?B7^^8S]!\,4"Z`-L_+&9;&<0BD6(+<[#4>9@>>!!#M(.,Q0F>C]5Y^?%]
     8MM/U;:(GG4>P'96C_V+%HOSF$[!`DQ3:',Z2070&B7:#OA<$IC:0(0JDTV<71
     9M`<JL!IO?]K.+B>6C,^XI[C/'*+;.LYMGSNA<_-(Z5=ORE!\(%S5M)+"Q#4JE
     10M4)42<90;%1[BUD;8$<M'3=D12R\E&PYA`R+!2B,`EIC%/G"6B.0='.P3$:+&
     11M6+8*K0Y;V>:*?^4\OG`>(]-`JM9H^4\N\B*7M6[-[OI:QKYO!'A;,X!K[%*J
     12MN&&`!F5:*K0A_5WWB4QG'Y3I"A%J=7S;FKU#ZPUTC62W0TUI-9,QN$")Q@CP
     13MBY&D3I^^=-PAI"BP-25LR`U<F^B,J_",-HZ39I9/&+7-@*^I4;D3MN[.,\4J
     14MGWH'FO8,-/WZ0#/@_V&8&>;%#4Z5$KRM:>][1Z<?$K>&1)%KQUE;7,<RR_>^
     152>-'31+/UQ;?!*X`@S@HE!@``
    1416`
    1517end
  • Tst/Short/bug_qring.stat

    r1327a0 r780e11  
    1 1 >> tst_memory_0 :: 1247829969:3104-2009071618:3-1-0:ix86-Linux:nepomuck:160292 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:173376
    2 1 >> tst_memory_1 :: 1247829969:3104-2009071618:3-1-0:ix86-Linux:nepomuck:707896 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:666308
    3 1 >> tst_memory_2 :: 1247829969:3104-2009071618:3-1-0:ix86-Linux:nepomuck:707896 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:699092
    4 1 >> tst_timer_1 :: 1247829969:3104-2009071618:3-1-0:ix86-Linux:nepomuck:2 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:6
     11 >> tst_memory_0 :: 1319035298:3133- 14004 :3-1-3:ix86-Linux:mamawutz:174416
     21 >> tst_memory_1 :: 1319035298:3133- 14004 :3-1-3:ix86-Linux:mamawutz:666332
     31 >> tst_memory_2 :: 1319035298:3133- 14004 :3-1-3:ix86-Linux:mamawutz:699116
     41 >> tst_timer_1 :: 1319035298:3133- 14004 :3-1-3:ix86-Linux:mamawutz:8
  • Tst/Short/bug_qring.tst

    r1327a0 r780e11  
    2020interred(NF(std(i),std(ideal(y+u2+uv3,z+uv3))));
    2121
     22ring r = 2,(a, b),dp;
     23option(redSB);
     24interred(ideal(a^2,a*b+a^2));
     25qring qq = std(ideal(b^2+a*b+a^2,a^3));
     26qq;
     27option(redSB);
     28interred(ideal(a^2,a*b+a^2));
     29
    2230tst_status(1);$
  • kernel/kstd1.cc

    r1327a0 r780e11  
    23152315  strat->posInL=posInL0; /* ord according pComp */
    23162316
    2317   /*Shdl=*/initBuchMora(F, Q,strat);
     2317  /*Shdl=*/initBuchMora(F, Q, strat);
    23182318  srmax = strat->sl;
    23192319  reduc = olddeg = lrmax = 0;
     
    24692469
    24702470#ifdef KDEBUG
    2471     messageSets(strat);
     2471    if (TEST_OPT_DEBUG)
     2472    {
     2473      messageSets(strat);
     2474    }
    24722475    memset(&(strat->P), 0, sizeof(strat->P));
    24732476#endif
     
    25372540  int need_retry;
    25382541  int counter=3;
    2539   int elems=idElem(F);
    2540   ideal res=kInterRedBba(F,Q,need_retry);
     2542  ideal res, res1;
     2543  int elems;
     2544  ideal null=NULL;
     2545  if ((Q==NULL) || (!TEST_OPT_REDSB))
     2546  {
     2547    elems=idElem(F);
     2548    res=kInterRedBba(F,Q,need_retry);
     2549  }
     2550  else
     2551  {
     2552    ideal FF=idSimpleAdd(F,Q);
     2553    res=kInterRedBba(FF,NULL,need_retry);
     2554    idDelete(&FF);
     2555    null=idInit(1,1);
     2556    res1=kNF(null,Q,res);
     2557    idDelete(&res);
     2558    res=res1;
     2559  }
    25412560  while (need_retry && (counter>0))
    25422561  {
     
    25442563    if (TEST_OPT_DEBUG) { Print("retry counter %d\n",counter); }
    25452564    #endif
    2546     ideal res1=kInterRedBba(res,Q,need_retry);
     2565    res1=kInterRedBba(res,Q,need_retry);
    25472566    int new_elems=idElem(res1);
    25482567    counter -= (new_elems >= elems);
    25492568    elems = new_elems;
    25502569    idDelete(&res);
    2551     res = res1;
    2552   }
     2570    if ((Q!=NULL) && (TEST_OPT_REDSB))
     2571    {
     2572      res=kNF(null,Q,res1);
     2573      idDelete(&res1);
     2574    }
     2575    else
     2576      res = res1;
     2577  }
     2578  if (null!=NULL) idDelete(&null);
    25532579  test=save;
    25542580  idSkipZeroes(res);
    25552581  return res;
    25562582}
    2557 
    25582583
    25592584// returns TRUE if mora should use buckets, false otherwise
Note: See TracChangeset for help on using the changeset viewer.