Changeset 7a4a43 in git


Ignore:
Timestamp:
Dec 3, 2009, 3:57:26 PM (15 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
01d4d39094f7bf55ce654ac27f6e5147abd7ef80
Parents:
8d679fdeafced3beb421a86604256b3d93d27a06
Message:
format, redRing

git-svn-id: file:///usr/local/Singular/svn/trunk@12361 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/kutil.cc

    r8d679fd r7a4a43  
    13121312
    13131313  k_GetStrongLeadTerms(p, strat->S[i], currRing, m1, m2, gcd, strat->tailRing);
     1314  //p_Test(m1,strat->tailRing);
     1315  //p_Test(m2,strat->tailRing);
    13141316  while (! kCheckStrongCreation(atR, m1, i, m2, strat) )
    13151317  {
     
    13251327  pSetCoeff0(m2, t);
    13261328  pSetCoeff0(gcd, d);
     1329  p_Test(m1,strat->tailRing);
     1330  p_Test(m2,strat->tailRing);
    13271331
    13281332#ifdef KDEBUG
     
    29612965      nDelete(&tmp);
    29622966    }
     2967    p_Test(p,strat->tailRing);
    29632968    p = pp_Mult_nn(p, gcd, strat->tailRing);
    29642969    nDelete(&gcd);
     
    29742979      {
    29752980        PrintS("--- create zero spoly: ");
    2976         wrp(h);
     2981        p_wrp(h,currRing,strat->tailRing);
    29772982        PrintS(" ---> ");
    29782983      }
     
    29802985      poly tmp = pInit();
    29812986      pSetCoeff0(tmp, pGetCoeff(p));
    2982       for (int i = 1; i <= currRing->N; i++)
     2987      for (int i = 1; i <= rVar(currRing); i++)
    29832988      {
    29842989        pSetExp(tmp, i, p_GetExp(p, i, strat->tailRing));
    29852990      }
    2986       if (rRing_has_Comp(currRing))
     2991      if (rRing_has_Comp(currRing) && rRing_has_Comp(strat->tailRing))
     2992      {
    29872993        p_SetComp(tmp, p_GetComp(p, strat->tailRing), currRing);
     2994      }
    29882995      p_Setm(tmp, currRing);
    29892996      p = p_LmFreeAndNext(p, strat->tailRing);
    29902997      pNext(tmp) = p;
    29912998      LObject h;
     2999      h.Init();
    29923000      h.p = tmp;
    29933001      h.tailRing = strat->tailRing;
     
    30113019        h.sev = pGetShortExpVector(h.p);
    30123020        if (strat->tailRing != currRing)
     3021        {
    30133022          h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing);
    3014         if (pNext(p) != NULL)
    3015         {
    3016           // What does this? (Oliver)
    3017           // pShallowCopyDeleteProc p_shallow_copy_delete
    3018           //      = pGetShallowCopyDeleteProc(strat->tailRing, new_tailRing);
    3019           // pNext(p) = p_shallow_copy_delete(pNext(p),
    3020           //              currRing, strat->tailRing, strat->tailRing->PolyBin);
    30213023        }
    30223024#ifdef KDEBUG
    30233025        if (TEST_OPT_DEBUG)
    30243026        {
    3025           wrp(tmp);
     3027          p_wrp(tmp,currRing,strat->tailRing);
    30263028          PrintLn();
    30273029        }
     
    46644666        if (Ln.bucket!=NULL)
    46654667        {
    4666           int dummy=1;
     4668          int dummy=1;
    46674669          kBucket_Add_q(Ln.bucket,mm,&dummy);
    46684670        }
Note: See TracChangeset for help on using the changeset viewer.