Changeset 5bc2461 in git

Timestamp:

Nov 22, 2010, 4:49:34 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

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:

• monomials/p_polys.cc (modified) (1 diff)
• monomials/p_polys.h (modified) (1 diff)
• polys.h (modified) (1 diff)
• polys1.cc (modified) (1 diff)

polys/monomials/p_polys.cc

@@ -2937 +2937 @@
 }
 
+/*-------- several access procedures to monomials -------------------- */
+/*
+* the module weights for std
+*/
+static pFDegProc pOldFDeg;
+static pLDegProc pOldLDeg;
+static intvec * pModW;
+static BOOLEAN pOldLexOrder;
+
+static long pModDeg(poly p, ring r = currRing)
+{
+  long d=pOldFDeg(p, r);
+  int c=p_GetComp(p, r);
+  if ((c>0) && ((r->pModW)->range(c-1))) d+= (*(r->pModW))[c-1];
+  return d;
+  //return pOldFDeg(p, r)+(*pModW)[p_GetComp(p, r)-1];
+}
+
+void p_SetModDeg(intvec *w, ring r)
+{
+  if (w!=NULL)
+  {
+    r->pModW = w;
+    pOldFDeg = r->pFDeg;
+    pOldLDeg = r->pLDeg;
+    pOldLexOrder = r->pLexOrder;
+    pSetDegProcs(r,pModDeg);
+    r->pLexOrder = TRUE;
+  }
+  else
+  {
+    r->pModW = NULL;
+    pRestoreDegProcs(pOldFDeg, pOldLDeg);
+    r->pLexOrder = pOldLexOrder;
+  }
+}
+
 
 /***************************************************************

polys/monomials/p_polys.h

@@ -1815 +1815 @@
 void pRestoreDegProcs(ring r. pFDegProc old_FDeg, pLDegProc old_lDeg);
 
+/*-------------pComp for syzygies:-------------------*/
+void p_SetModDeg(intvec *w, ring r);
 
 #endif // P_POLYS_H

polys/polys.h

@@ -248 +248 @@
 #define pWDegree(poly p) p_WDegree(p,currRing)
 
-/*-------------pComp for syzygies:-------------------*/
-
-void pSetModDeg(intvec *w);
-
-
-
-
 /*-------------operations on polynomials:------------*/
 #define   pSub(a,b) p_Sub(a,b,currRing)

polys/polys1.cc

@@ -32 +32 @@
 #include <kernel/ratgring.h>
 #endif
-
-/*-------- several access procedures to monomials -------------------- */
-/*
-* the module weights for std
-*/
-static pFDegProc pOldFDeg;
-static pLDegProc pOldLDeg;
-static intvec * pModW;
-static BOOLEAN pOldLexOrder;
-
-static long pModDeg(poly p, ring r = currRing)
-{
-  long d=pOldFDeg(p, r);
-  int c=p_GetComp(p, r);
-  if ((c>0) && (pModW->range(c-1))) d+= (*pModW)[c-1];
-  return d;
-  //return pOldFDeg(p, r)+(*pModW)[p_GetComp(p, r)-1];
-}
-
-void pSetModDeg(intvec *w)
-{
-  if (w!=NULL)
-  {
-    pModW = w;
-    pOldFDeg = pFDeg;
-    pOldLDeg = pLDeg;
-    pOldLexOrder = pLexOrder;
-    pSetDegProcs(pModDeg);
-    pLexOrder = TRUE;
-  }
-  else
-  {
-    pModW = NULL;
-    pRestoreDegProcs(pOldFDeg, pOldLDeg);
-    pLexOrder = pOldLexOrder;
-  }
-}