Changeset ba0fc3 in git

Timestamp:

Mar 22, 2011, 10:36:05 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

c462b558d2bcc56ce39d2181b2f9d9cd1b82345b

Parents:

f550e863b5113c076c1fa29a44f2bde2146f14cf

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-03-22 10:36:05+01:00

git-committer:

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

Message:

p_MinDeg, p_DegW -> p_polys.cc

Location:

libpolys/polys

Files:

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

libpolys/polys/monomials/p_polys.cc

@@ -518 +518 @@
   }
   return  j;
+}
+
+long p_DegW(poly p, const short *w, const ring R)
+{
+  long r=~0L;
+
+  while (p!=NULL)
+  {
+    long t=totaldegreeWecart_IV(p,R,w);
+    if (t>r) r=t;
+    pIter(p);
+  }
+  return r;
 }
 
@@ -3428 +3441 @@
 }
 
+/*************************************************************/
+int p_MinDeg(poly p,intvec *w, const ring R)
+{
+  if(p==NULL)
+    return -1;
+  int d=-1;
+  while(p!=NULL)
+  {
+    int d0=0;
+    for(int j=0;j<rVar(R);j++)
+      if(w==NULL||j>=w->length())
+        d0+=p_GetExp(p,j+1,R);
+      else
+        d0+=(*w)[j]*p_GetExp(p,j+1,R);
+    if(d0<d||d==-1)
+      d=d0;
+    pIter(p);
+  }
+  return d;
+}
+
 /***************************************************************
  *

libpolys/polys/monomials/p_polys.h

@@ -180 +180 @@
 static inline unsigned long p_GetTotalDegree(const unsigned long l, const ring r, const int number_of_exps);
 
+int p_MinDeg(poly p,intvec *w, const ring R);
+
+long p_DegW(poly p, const short *w, const ring R);
+
 
 // like the respective p_LmIs* routines, except that p might be empty

libpolys/polys/polys.h

@@ -317 +317 @@
 #define   pNorm(p) p_Norm(p,currRing)
 #define   pSubst(p,n,e) p_Subst(p,n.e,currRing)
-poly      ppJet(poly p, int m);
-poly      pJet(poly p, int m);
-poly      ppJetW(poly p, int m, short * iv);
-poly      pJetW(poly p, int m, short * iv);
-int pMinDeg(poly p,intvec *w=NULL);
+#define   ppJet(p,m) pp_Jet(p,m,currRing)
+#define   pJet(p,m)  p_Jet(p,m,currRing)
+#define   ppJetW(p,m,iv) pp_JetW(p,m,iv,currRing)
+#define   pJetW(p,m,iv) p_JetW(p,m,iv,currRing)
+#define   pMinDeg(p,w) p_MinDeg(p,w,currRing)
 poly      pSeries(int n,poly p,poly u=NULL,intvec *w=NULL);
 poly      pInvers(int n, poly p,intvec *w=NULL);
 // maximum weigthed degree of all monomials of p, w is indexed from
 // 1..pVariables
-long      pDegW(poly p, const short *w);
+#define    pDegW(p,w) p_DegW(p,w,currRing)
 
 /*-----------type conversions ----------------------------*/

libpolys/polys/polys1.cc

@@ -32 +32 @@
 #endif
 
-
-int pMinDeg(poly p,intvec *w)
-{
-  if(p==NULL)
-    return -1;
-  int d=-1;
-  while(p!=NULL)
-  {
-    int d0=0;
-    for(int j=0;j<pVariables;j++)
-      if(w==NULL||j>=w->length())
-        d0+=pGetExp(p,j+1);
-      else
-        d0+=(*w)[j]*pGetExp(p,j+1);
-    if(d0<d||d==-1)
-      d=d0;
-    pIter(p);
-  }
-  return d;
-}
 
 poly pSeries(int n,poly p,poly u, intvec *w)
@@ -90 +70 @@
   omFreeSize((ADDRESS)ww,(pVariables+1)*sizeof(short));
   return v;
-}
-
-long pDegW(poly p, const short *w)
-{
-  long r=-LONG_MAX;
-
-  while (p!=NULL)
-  {
-    long t=totaldegreeWecart_IV(p,currRing,w);
-    if (t>r) r=t;
-    pIter(p);
-  }
-  return r;
 }