Changeset e6c82d in git

Timestamp:

Mar 9, 2017, 11:58:01 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

6d6c8d7133c387ddb4790a04d3358688ffbc6b3a

Parents:

82cbe28ea8b883e7fdd4255cc13e0978b1c442d8

Message:

p_Invers is ONLY a helper for p_Series (see jet): now static

Files:

• doc/NEWS.texi (modified) (1 diff)
• kernel/polys.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

doc/NEWS.texi

@@ -38 +38 @@
 @itemize
 @item port to polymake 3.x.x
+@item p_Invers is only a helper for p_Series: now static
 @end itemize
 

kernel/polys.h

@@ -353 +353 @@
 #define   pMinDeg(p,w) p_MinDeg(p,w,currRing)
 #define   pSeries(n,p,u,w) p_Series(n,p,u,w,currRing)
-#define   pInvers(n,p,w) p_Invers(n,p,w,currRing)
 // maximum weigthed degree of all monomials of p, w is indexed from
 // 1..pVariables

libpolys/polys/monomials/p_polys.cc

@@ -4314 +4314 @@
 
 /***************************************************************/
-
-poly p_Series(int n,poly p,poly u, intvec *w, const ring R)
-{
-  short *ww=iv2array(w,R);
-  if(p!=NULL)
-  {
-    if(u==NULL)
-      p=p_JetW(p,n,ww,R);
-    else
-      p=p_JetW(p_Mult_q(p,p_Invers(n-p_MinDeg(p,w,R),u,w,R),R),n,ww,R);
-  }
-  omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
-  return p;
-}
-
-poly p_Invers(int n,poly u,intvec *w, const ring R)
+static poly p_Invers(int n,poly u,intvec *w, const ring R)
 {
   if(n<0)
@@ -4355 +4340 @@
   omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
   return v;
+}
+
+
+poly p_Series(int n,poly p,poly u, intvec *w, const ring R)
+{
+  short *ww=iv2array(w,R);
+  if(p!=NULL)
+  {
+    if(u==NULL)
+      p=p_JetW(p,n,ww,R);
+    else
+      p=p_JetW(p_Mult_q(p,p_Invers(n-p_MinDeg(p,w,R),u,w,R),R),n,ww,R);
+  }
+  omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
+  return p;
 }
 

libpolys/polys/monomials/p_polys.h

@@ -2009 +2009 @@
 /*----------------------------------------------------*/
 poly p_Series(int n,poly p,poly u, intvec *w, const ring R);
-poly p_Invers(int n,poly u,intvec *w, const ring R);
-
-
 
 /*----------------------------------------------------*/