Changeset 7245240 in git


Ignore:
Timestamp:
Jul 9, 2008, 10:26:30 AM (15 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
Children:
7739c953f47596b385dcf31bc6786a1e3ac94590
Parents:
c9c60f894de6f136a5e83377562698e0806b77c5
Message:
stratChangeTailRing für gcd/strong polys


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

Legend:

Unmodified
Added
Removed

  • kernel/kInline.cc

    rc9c60f r7245240  
    77 *  Author:  obachman (Olaf Bachmann)
    88 *  Created: 8/00
    9  *  Version: $Id: kInline.cc,v 1.9 2007-08-07 11:36:46 Singular Exp $
     9 *  Version: $Id: kInline.cc,v 1.10 2008-07-09 08:26:29 wienand Exp $
    1010 *******************************************************************/
    1111#ifndef KINLINE_CC
    … …  
    10001000  p_Setm(m2, tailRing);
    10011001  p_Setm(lcm, leadRing);
    1002   return TRUE;
    1003 
    1004   false_return:
    1005   p_LmFree(m1, tailRing);
    1006   p_LmFree(m2, tailRing);
    1007   m1 = m2 = NULL;
    1008   return FALSE;
    10091002}
    10101003#endif

  • kernel/kstd2.cc

    rc9c60f r7245240  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd2.cc,v 1.68 2008-07-08 13:02:21 Singular Exp $ */
     4/* $Id: kstd2.cc,v 1.69 2008-07-09 08:26:29 wienand Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: alg. of Buchberger
    … …  
    297297  loop
    298298  {
    299 #ifdef HAVE_VANGB
    300 #ifdef HAVE_RING2TOM
    301     zeroPoly = kFindDivisibleByZeroPoly(h);
    302     if (zeroPoly != NULL)
    303     {
    304       if (TEST_OPT_PROT)
    305       {
    306         PrintS("z");
    307       }
    308 #ifdef KDEBUG
    309       if (TEST_OPT_DEBUG)
    310       {
    311         PrintS("zero red: ");
    312       }
    313 #endif
    314       LObject tmp_h(zeroPoly, currRing, strat->tailRing);
    315       tmp_h.SetShortExpVector();
    316       strat->initEcart(&tmp_h);
    317       tmp_h.sev = pGetShortExpVector(tmp_h.p);
    318       tmp_h.SetpFDeg();
    319 
    320       enterT(tmp_h, strat, strat->tl + 1);
    321       j = strat->tl;
    322     }
    323     else
    324 #endif
    325 #endif
    326     {
    327299      j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, h);
    328300      if (j < 0) return 1;
    … …  
    333305      }
    334306#endif
    335     }
    336307#ifdef KDEBUG
    337308    if (TEST_OPT_DEBUG)
    … …  
    344315
    345316    ksReducePoly(h, &(strat->T[j]), NULL, NULL, strat);
    346 #ifdef HAVE_VANGB
    347 #ifdef HAVE_RING2TOM
    348     if (zeroPoly != NULL)
    349     {
    350       // TODO Free memory of zeropoly and last element of L
    351       strat->tl--;
    352     }
    353 #endif
    354 #endif
    355317
    356318#ifdef KDEBUG
    … …  
    12101172        enterT(strat->P, strat);
    12111173#ifdef HAVE_RINGS
    1212 #ifdef HAVE_VANGB
    1213       int at_R = strat->tl;
    1214 #endif
    12151174      if (rField_is_Ring(currRing))
    12161175        superenterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
    … …  
    12211180      if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
    12221181      {
    1223 #ifdef HAVE_VANGB
    1224       strat->enterS(strat->P, pos, strat, at_R);
    1225 #else
    12261182      strat->enterS(strat->P, pos, strat, strat->tl);
    1227 #endif
    12281183      }
    12291184      else

  • kernel/kutil.cc

    rc9c60f r7245240  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.99 2008-07-08 13:29:46 Singular Exp $ */
     4/* $Id: kutil.cc,v 1.100 2008-07-09 08:26:30 wienand Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
    … …  
    12661266  number d, s, t;
    12671267  assume(i<=strat->sl);
    1268   LObject  Lp;
    1269   poly m1, m2, erg, gcd;
     1268  assume(atR >= 0);
     1269  poly m1, m2, gcd;
    12701270
    12711271  d = nExtGcd(pGetCoeff(p), pGetCoeff(strat->S[i]), &s, &t);
    … …  
    12801280
    12811281  k_GetStrongLeadTerms(p, strat->S[i], currRing, m1, m2, gcd, strat->tailRing);
    1282 
     1282  while (! kCheckStrongCreation(atR, m1, i, m2, strat) )
     1283  {
     1284    memset(&(strat->P), 0, sizeof(strat->P));
     1285    kStratChangeTailRing(strat);
     1286    strat->P = *(strat->R[atR]);
     1287    p_LmFree(m1, strat->tailRing);
     1288    p_LmFree(m2, strat->tailRing);
     1289    p_LmFree(gcd, currRing);
     1290    k_GetStrongLeadTerms(p, strat->S[i], currRing, m1, m2, gcd, strat->tailRing);
     1291  }
    12831292  pSetCoeff0(m1, s);
    12841293  pSetCoeff0(m2, t);
    12851294  pSetCoeff0(gcd, d);
    1286 
    12871295
    12881296#ifdef KDEBUG
    … …  
    13051313#endif
    13061314
    1307   erg = p_Add_q(pp_Mult_mm(pNext(p), m1, strat->tailRing), pp_Mult_mm(pNext(strat->S[i]), m2, strat->tailRing), strat->tailRing);
    1308   pNext(gcd) = erg;
    1309   pLmDelete(m1);
    1310   pLmDelete(m2);
     1315  pNext(gcd) = p_Add_q(pp_Mult_mm(pNext(p), m1, strat->tailRing), pp_Mult_mm(pNext(strat->S[i]), m2, strat->tailRing), strat->tailRing);
     1316  p_LmDelete(m1, strat->tailRing);
     1317  p_LmDelete(m2, strat->tailRing);
    13111318
    13121319#ifdef KDEBUG
    … …  
    13221329  h.tailRing = strat->tailRing;
    13231330  int posx;
    1324   if (h.p!=NULL)
    1325   {
    1326     if (TEST_OPT_INTSTRATEGY)
    1327     {
    1328       h.pCleardenom(); // also does a pContent
    1329     }
    1330     else
    1331     {
    1332       h.pNorm();
    1333     }
     1331  h.pCleardenom();
    13341332    strat->initEcart(&h);
    13351333    if (strat->Ll==-1)
    … …  
    13391337    h.sev = pGetShortExpVector(h.p);
    13401338    h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing);
    1341     if (pNext(p) != NULL)
    1342     {
    1343       // What does this? (Oliver)
    1344       // pShallowCopyDeleteProc p_shallow_copy_delete
    1345       //      = pGetShallowCopyDeleteProc(strat->tailRing, new_tailRing);
    1346       // pNext(p) = p_shallow_copy_delete(pNext(p),
    1347       //              currRing, strat->tailRing, strat->tailRing->PolyBin);
    1348     }
    13491339    enterL(&strat->L,&strat->Ll,&strat->Lmax,h,posx);
    1350   }
    13511340  return TRUE;
    13521341}
    … …  
    26332622      }
    26342623    }
    2635 
    2636 #ifdef HAVE_VANGB
    2637     // initenterzeropairsRing(h, ecart, strat, atR);
    2638 #endif
    26392624
    26402625    if (new_pair) chainCritRing(h,ecart,strat);
    … …  
    57725757}
    57735758
     5759#ifdef HAVE_RINGS
     5760/***************************************************************
     5761 *
     5762 * Checks, if we can compute the gcd poly / strong pair
     5763 * gcd-poly = m1 * R[atR] + m2 * S[atS]
     5764 *
     5765 ***************************************************************/
     5766BOOLEAN kCheckStrongCreation(int atR, poly m1, int atS, poly m2, kStrategy strat)
     5767{
     5768  assume(strat->S_2_R[atS] >= -1 && strat->S_2_R[atS] <= strat->tl);
     5769  assume(strat->tailRing != currRing);
     5770
     5771  poly p1_max = (strat->R[atR])->max;
     5772  poly p2_max = (strat->R[strat->S_2_R[atS]])->max;
     5773
     5774  if ((p1_max != NULL && !p_LmExpVectorAddIsOk(m1, p1_max, strat->tailRing)) ||
     5775      (p2_max != NULL && !p_LmExpVectorAddIsOk(m2, p2_max, strat->tailRing)))
     5776  {
     5777    return FALSE;
     5778  }
     5779  return TRUE;
     5780}
     5781#endif
     5782
    57745783BOOLEAN kStratChangeTailRing(kStrategy strat, LObject *L, TObject* T, unsigned long expbound)
    57755784{
    … …  
    58905899  if (rField_is_Ring(currRing))
    58915900  {
    5892     l += 20; // TEMP, TODO OLI
    58935901    l *= 2;
    58945902  }

  • kernel/kutil.h

    rc9c60f r7245240  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kutil.h,v 1.36 2008-07-04 16:17:15 motsak Exp $ */
     6/* $Id: kutil.h,v 1.37 2008-07-09 08:26:30 wienand Exp $ */
    77/*
    88* ABSTRACT: kernel: utils for kStd
    … …  
    604604//      FALSE, otherwise
    605605BOOLEAN kCheckSpolyCreation(LObject* L, kStrategy strat, poly &m1, poly &m2);
     606#ifdef HAVE_RINGS
     607// return TRUE if gcdpoly creation of R[atR] and S[atS] does not violate
     608//             exponent bound of strat->tailRing
     609//      FALSE, otherwise
     610BOOLEAN kCheckStrongCreation(int atR, poly m1, int atS, poly m2, kStrategy strat);
     611#endif
    606612// change strat->tailRing and adjust all data in strat, L, and T:
    607613// new tailRing has larger exponent bound
Note: See TracChangeset for help on using the changeset viewer.