Changeset 5bc2461 in git for polys


Ignore:
Timestamp:
Nov 22, 2010, 4:49:34 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
a6633e9e6157506ee434baf1e2be9bb27e111c71
Parents:
949e57ce98be32aa204cfe96c543f2bde13278a6
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-11-22 16:49:34+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:41+01:00
Message:
p_SetModDeg, pModDeg
Location:
polys
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • polys/monomials/p_polys.cc

    r949e57 r5bc2461  
    29372937}
    29382938
     2939/*-------- several access procedures to monomials -------------------- */
     2940/*
     2941* the module weights for std
     2942*/
     2943static pFDegProc pOldFDeg;
     2944static pLDegProc pOldLDeg;
     2945static intvec * pModW;
     2946static BOOLEAN pOldLexOrder;
     2947
     2948static long pModDeg(poly p, ring r = currRing)
     2949{
     2950  long d=pOldFDeg(p, r);
     2951  int c=p_GetComp(p, r);
     2952  if ((c>0) && ((r->pModW)->range(c-1))) d+= (*(r->pModW))[c-1];
     2953  return d;
     2954  //return pOldFDeg(p, r)+(*pModW)[p_GetComp(p, r)-1];
     2955}
     2956
     2957void p_SetModDeg(intvec *w, ring r)
     2958{
     2959  if (w!=NULL)
     2960  {
     2961    r->pModW = w;
     2962    pOldFDeg = r->pFDeg;
     2963    pOldLDeg = r->pLDeg;
     2964    pOldLexOrder = r->pLexOrder;
     2965    pSetDegProcs(r,pModDeg);
     2966    r->pLexOrder = TRUE;
     2967  }
     2968  else
     2969  {
     2970    r->pModW = NULL;
     2971    pRestoreDegProcs(pOldFDeg, pOldLDeg);
     2972    r->pLexOrder = pOldLexOrder;
     2973  }
     2974}
     2975
    29392976
    29402977/***************************************************************
  • polys/monomials/p_polys.h

    r949e57 r5bc2461  
    18151815void pRestoreDegProcs(ring r. pFDegProc old_FDeg, pLDegProc old_lDeg);
    18161816
     1817/*-------------pComp for syzygies:-------------------*/
     1818void p_SetModDeg(intvec *w, ring r);
    18171819
    18181820#endif // P_POLYS_H
  • polys/polys.h

    r949e57 r5bc2461  
    248248#define pWDegree(poly p) p_WDegree(p,currRing)
    249249
    250 /*-------------pComp for syzygies:-------------------*/
    251 
    252 void pSetModDeg(intvec *w);
    253 
    254 
    255 
    256 
    257250/*-------------operations on polynomials:------------*/
    258251#define   pSub(a,b) p_Sub(a,b,currRing)
  • polys/polys1.cc

    r949e57 r5bc2461  
    3232#include <kernel/ratgring.h>
    3333#endif
    34 
    35 /*-------- several access procedures to monomials -------------------- */
    36 /*
    37 * the module weights for std
    38 */
    39 static pFDegProc pOldFDeg;
    40 static pLDegProc pOldLDeg;
    41 static intvec * pModW;
    42 static BOOLEAN pOldLexOrder;
    43 
    44 static long pModDeg(poly p, ring r = currRing)
    45 {
    46   long d=pOldFDeg(p, r);
    47   int c=p_GetComp(p, r);
    48   if ((c>0) && (pModW->range(c-1))) d+= (*pModW)[c-1];
    49   return d;
    50   //return pOldFDeg(p, r)+(*pModW)[p_GetComp(p, r)-1];
    51 }
    52 
    53 void pSetModDeg(intvec *w)
    54 {
    55   if (w!=NULL)
    56   {
    57     pModW = w;
    58     pOldFDeg = pFDeg;
    59     pOldLDeg = pLDeg;
    60     pOldLexOrder = pLexOrder;
    61     pSetDegProcs(pModDeg);
    62     pLexOrder = TRUE;
    63   }
    64   else
    65   {
    66     pModW = NULL;
    67     pRestoreDegProcs(pOldFDeg, pOldLDeg);
    68     pLexOrder = pOldLexOrder;
    69   }
    70 }
    7134
    7235
Note: See TracChangeset for help on using the changeset viewer.