Changeset 359d86d in git

Timestamp:

Jul 20, 2011, 6:22:55 PM (12 years ago)

Author:

mlee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

eaae7da539e9a22d6276d70ef09c436adadfeaba

Parents:

f69c6c699905fd079f239622d07125dfb15c8b09

git-author:

mlee <martinlee84@web.de>2011-07-20 18:22:55+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:52:44+01:00

Message:

moved p_Last from kpolys.cc to kInline.h
moved pLast(poly,int), pLast (poly) declaration from polys/monomials/p_polys.h
to kInline.h
added missing ->cf in kInline.h

Files:

• kernel/kInline.h (modified) (3 diffs)
• kernel/kpolys.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

kernel/kInline.h

@@ -33 +33 @@
 // #define HAVE_LM_BIN
 
+/*2
+* returns the length of a (numbers of monomials)
+* respect syzComp
+*/
+poly p_Last(poly a, int &l, const ring r)
+{
+  if (a == NULL)
+  {
+    l = 0;
+    return NULL;
+  }
+  l = 1;
+  if (! rIsSyzIndexRing(r))
+  {
+    while (pNext(a)!=NULL)
+    {
+      pIter(a);
+      l++;
+    }
+  }
+  else
+  {
+    int curr_limit = rGetCurrSyzLimit(r);
+    poly pp = a;
+    while ((a=pNext(a))!=NULL)
+    {
+      if (p_GetComp(a,r)<=curr_limit/*syzComp*/)
+        l++;
+      else break;
+      pp = a;
+    }
+    a=pp;
+  }
+  return a;
+}
+
+/***************************************************************
+ *
+ * poly things which are independent of ring
+ *
+ ***************************************************************/
+
+// returns the length of a polynomial (numbers of monomials)
+// respect syzComp
+static inline poly pLast(poly a, int &length) { return p_Last (a, length, currRing); }
+static inline poly pLast(poly a) { int l; return pLast(a, l); }
+
 
 KINLINE TObject* skStrategy::S_2_T(int i)
@@ -396 +443 @@
 KINLINE long sTObject::pFDeg() const
 {
-  if (p != NULL) return ::pFDeg(p, currRing);
+  if (p != NULL) return p_FDeg(p, currRing);
   return tailRing->pFDeg(t_p, tailRing);
 }
@@ -1082 +1129 @@
   if (!ret)
   {
-    if (! n_IsOne(coef, currRing))
+    if (! n_IsOne(coef, currRing->cf))
     {
       PR->Mult_nn(coef);
       // HANNES: mark for Normalize
     }
-    n_Delete(&coef, currRing);
+    n_Delete(&coef, currRing->cf);
   }
   return ret;

kernel/kpolys.cc

@@ -115 +115 @@
 }
 #endif
-/*2
-* returns the length of a (numbers of monomials)
-* respect syzComp
-*/
-poly p_Last(poly a, int &l, const ring r)
-{
-  if (a == NULL)
-  {
-    l = 0;
-    return NULL;
-  }
-  l = 1;
-  if (! rIsSyzIndexRing(r))
-  {
-    while (pNext(a)!=NULL)
-    {
-      pIter(a);
-      l++;
-    }
-  }
-  else
-  {
-    int curr_limit = rGetCurrSyzLimit(r);
-    poly pp = a;
-    while ((a=pNext(a))!=NULL)
-    {
-      if (p_GetComp(a,r)<=curr_limit/*syzComp*/)
-        l++;
-      else break;
-      pp = a;
-    }
-    a=pp;
-  }
-  return a;
-}
+

libpolys/polys/monomials/p_polys.h

@@ -349 +349 @@
 
 static inline long p_MinComp(poly p,ring lmRing) {return p_MinComp(p,lmRing,lmRing);}
-
-/***************************************************************
- *
- * poly things which are independent of ring
- *
- ***************************************************************/
-
-// returns the length of a polynomial (numbers of monomials)
-// respect syzComp
-// static inline poly pLast(poly a, int &length);
-// static inline poly pLast(poly a) { int l; return pLast(a, l); }