Changeset 949e57 in git

Timestamp:

Nov 22, 2010, 4:41:43 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

5bc2461738edac589c7bb7fe19322b1ed8897029

Parents:

5c39a93f6a52a5a83fcc9028a16d640959005ca5

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-11-22 16:41:43+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:41+01:00

Message:

pSetDegProcs

Location:

polys

Files:

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

polys/monomials/p_polys.cc

@@ -2914 +2914 @@
   }
 }
+//
+// resets the pFDeg and pLDeg: if pLDeg is not given, it is
+// set to currRing->pLDegOrig, i.e. to the respective LDegProc which
+// only uses pFDeg (and not pDeg, or pTotalDegree, etc)
+void pSetDegProcs(ring r, pFDegProc new_FDeg, pLDegProc new_lDeg)
+{
+  assume(new_FDeg != NULL);
+  r->pFDeg = new_FDeg;
+
+  if (new_lDeg == NULL)
+    new_lDeg = r->pLDegOrig;
+
+  r->pLDeg = new_lDeg;
+}
+
+// restores pFDeg and pLDeg:
+void pRestoreDegProcs(ring r, pFDegProc old_FDeg, pLDegProc old_lDeg)
+{
+  assume(old_FDeg != NULL && old_lDeg != NULL);
+  r->pFDeg = old_FDeg;
+  r->pLDeg = old_lDeg;
+}
+
 
 /***************************************************************

polys/monomials/p_polys.h

@@ -1805 +1805 @@
 void p_SetGlobals(const ring r, BOOLEAN complete = TRUE);
 
+// resets the pFDeg and pLDeg: if pLDeg is not given, it is
+// set to currRing->pLDegOrig, i.e. to the respective LDegProc which
+// only uses pFDeg (and not pDeg, or pTotalDegree, etc).
+// If you use this, make sure your procs does not make any assumptions
+// on ordering and/or OrdIndex -- otherwise they might return wrong results
+// on strat->tailRing
+void pSetDegProcs(ring r. pFDegProc new_FDeg, pLDegProc new_lDeg = NULL);
+// restores pFDeg and pLDeg:
+void pRestoreDegProcs(ring r. pFDegProc old_FDeg, pLDegProc old_lDeg);
+
+
 #endif // P_POLYS_H
 

polys/polys.cc

@@ -25 +25 @@
 #endif
 
-/* ----------- global variables, set by pSetGlobals --------------------- */
-/* computes length and maximal degree of a POLYnomial */
-pLDegProc pLDeg;
-/* computes the degree of the initial term, used for std */
-pFDegProc pFDeg;
-/* the monomial ordering of the head monomials a and b */
-/* returns -1 if a comes before b, 0 if a=b, 1 otherwise */
-
 /* 1 for polynomial ring, -1 otherwise */
 int     pOrdSgn;
@@ -42 +34 @@
 /* the highest monomial below pHEdge */
 poly      ppNoether = NULL;
-
-// resets the pFDeg and pLDeg: if pLDeg is not given, it is
-// set to currRing->pLDegOrig, i.e. to the respective LDegProc which
-// only uses pFDeg (and not pDeg, or pTotalDegree, etc)
-void pSetDegProcs(pFDegProc new_FDeg, pLDegProc new_lDeg)
-{
-  assume(new_FDeg != NULL);
-  pFDeg = new_FDeg;
-  currRing->pFDeg = new_FDeg;
-
-  if (new_lDeg == NULL)
-    new_lDeg = currRing->pLDegOrig;
-
-  pLDeg = new_lDeg;
-  currRing->pLDeg = new_lDeg;
-}
-
-
-// restores pFDeg and pLDeg:
-extern void pRestoreDegProcs(pFDegProc old_FDeg, pLDegProc old_lDeg)
-{
-  assume(old_FDeg != NULL && old_lDeg != NULL);
-  pFDeg = old_FDeg;
-  currRing->pFDeg = old_FDeg;
-  pLDeg = old_lDeg;
-  currRing->pLDeg = old_lDeg;
-}
 
 #ifdef HAVE_RINGS   //TODO Oliver

polys/polys.h

@@ -230 +230 @@
 
 
-/*-------------ring management:----------------------*/
-
-// resets the pFDeg and pLDeg: if pLDeg is not given, it is
-// set to currRing->pLDegOrig, i.e. to the respective LDegProc which
-// only uses pFDeg (and not pDeg, or pTotalDegree, etc).
-// If you use this, make sure your procs does not make any assumptions
-// on ordering and/or OrdIndex -- otherwise they might return wrong results
-// on strat->tailRing
-extern void pSetDegProcs(pFDegProc new_FDeg, pLDegProc new_lDeg = NULL);
-// restores pFDeg and pLDeg:
-extern void pRestoreDegProcs(pFDegProc old_FDeg, pLDegProc old_lDeg);
-
 /*-----------the ordering of monomials:-------------*/
 #define pSetm(p)    p_Setm(p, currRing)
@@ -252 +240 @@
  *
  ***************************************************************/
-extern pLDegProc pLDeg;
-extern pFDegProc pFDeg;
+static inline long  pFDeg(const poly p, const ring r)  { return r->pFDeg(p,r); }
+static inline long  pLDeg(const poly p,  int *l, const ring r)  { return r->pLDeg(p,l,r); }
 #define pWeight(c) p_Weight(c,currRing)
 #define pDeg(p)    p_Deg(p,currRing)