Changeset a4081e5 in git

Timestamp:

Mar 23, 2011, 1:49:38 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

e0d8d1b3734f485420a004dfc86eb0b5c5cc62e9

Parents:

58ea04393add5871d2f9f54b118b57b5395f173f

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-03-23 13:49:38+01:00

git-committer:

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

Message:

polys1.cc removed, p_Invers, p_Series ->monomials/p_polys.cc

Location:

libpolys/polys

Files:

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

libpolys/polys/Makefile.am

@@ -14 +14 @@
         operations/pShallowCopyDelete.cc operations/p_Mult_q.cc \
         templates/p_Procs_Lib.cc \
-        polys0.cc polys1.cc prCopy.cc prCopyTemplate.cc \
+        polys0.cc prCopy.cc prCopyTemplate.cc \
         kbuckets.cc sbuckets.cc templates/p_Procs.cc weight.cc
 

libpolys/polys/monomials/p_polys.cc

@@ -3462 +3462 @@
 }
 
+/***************************************************************/
+
+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)
+{
+  if(n<0)
+    return NULL;
+  number u0=n_Invers(pGetCoeff(u),R->cf);
+  poly v=p_NSet(u0,R);
+  if(n==0)
+    return v;
+  short *ww=iv2array(w,R);
+  poly u1=p_JetW(p_Sub(p_One(R),p_Mult_nn(u,u0,R),R),n,ww,R);
+  if(u1==NULL)
+  {
+    omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
+    return v;
+  }
+  poly v1=p_Mult_nn(p_Copy(u1,R),u0,R);
+  v=p_Add_q(v,p_Copy(v1,R),R);
+  for(int i=n/p_MinDeg(u1,w,R);i>1;i--)
+  {
+    v1=p_JetW(p_Mult_q(v1,p_Copy(u1,R),R),n,ww,R);
+    v=p_Add_q(v,p_Copy(v1,R),R);
+  }
+  p_Delete(&u1,R);
+  p_Delete(&v1,R);
+  omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
+  return v;
+}
+
 /***************************************************************
  *

libpolys/polys/monomials/p_polys.h

@@ -1870 +1870 @@
                      nMapFunc nMap, int *par_perm=NULL, int OldPar=0);
 
+/*----------------------------------------------------*/
+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);
+
+
 #endif // P_POLYS_H
 

libpolys/polys/polys.h

@@ -322 +322 @@
 #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);
+#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/polys1.cc

@@ -1 @@
-</****************************************
-*  Computer Algebra System SINGULAR     *
-****************************************/
-/* $Id$ */
-
-/*
-* ABSTRACT - all basic methods to manipulate polynomials:
-* independent of representation
-*/
-
-/* includes */
-#include <string.h>
-#include "polys/config.h"
-// #include <polys/options.h>
-#include <coeffs/numbers.h>
-#include <coeffs/ffields.h>
-#include <omalloc/omalloc.h>
-// #include <???/febase.h>
-// #include <???/weight.h>
-// #include <???/intvec.h>
-#include <polys/ext_fields/longalg.h>
-#include <polys/monomials/ring.h>
-// #include <???/ideals.h>
-// #include <polys/polys.h>
-// #include "ipid.h"
-#ifdef HAVE_FACTORY
-// #include <???/clapsing.h>
-#endif
-
-#ifdef HAVE_RATGRING
-// #include <polys/ratgring.h>
-#endif
-
-
-poly pSeries(int n,poly p,poly u, intvec *w)
-{
-  short *ww=iv2array(w);
-  if(p!=NULL)
-  {
-    if(u==NULL)
-      p=pJetW(p,n,ww);
-    else
-      p=pJetW(pMult(p,pInvers(n-pMinDeg(p,w),u,w)),n,ww);
-  }
-  omFreeSize((ADDRESS)ww,(pVariables+1)*sizeof(short));
-  return p;
-}
-
-poly pInvers(int n,poly u,intvec *w)
-{
-  short *ww=iv2array(w);
-  if(n<0)
-    return NULL;
-  number u0=nInvers(pGetCoeff(u));
-  poly v=pNSet(u0);
-  if(n==0)
-    return v;
-  poly u1=pJetW(pSub(pOne(),pMult_nn(u,u0)),n,ww);
-  if(u1==NULL)
-    return v;
-  poly v1=pMult_nn(pCopy(u1),u0);
-  v=pAdd(v,pCopy(v1));
-  for(int i=n/pMinDeg(u1,w);i>1;i--)
-  {
-    v1=pJetW(pMult(v1,pCopy(u1)),n,ww);
-    v=pAdd(v,pCopy(v1));
-  }
-  pDelete(&u1);
-  pDelete(&v1);
-  omFreeSize((ADDRESS)ww,(pVariables+1)*sizeof(short));
-  return v;
-}
-
-/*-----------type conversions ----------------------------*/
-#if 0
-/*2
-* convert a vector to a set of polys,
-* allocates the polyset, (entries 0..(*len)-1)
-* the vector will not be changed
-*/
-void  pVec2Polys(poly v, polyset *p, int *len)
-{
-  poly h;
-  int k;
-
-  *len=pMaxComp(v);
-  if (*len==0) *len=1;
-  *p=(polyset)omAlloc0((*len)*sizeof(poly));
-  while (v!=NULL)
-  {
-    h=pHead(v);
-    k=pGetComp(h);
-    pSetComp(h,0);
-    (*p)[k-1]=pAdd((*p)[k-1],h);
-    pIter(v);
-  }
-}
-
-int p_Var(poly m,const ring r)
-{
-  if (m==NULL) return 0;
-  if (pNext(m)!=NULL) return 0;
-  int i,e=0;
-  for (i=r->N; i>0; i--)
-  {
-    int exp=p_GetExp(m,i,r);
-    if (exp==1)
-    {
-      if (e==0) e=i;
-      else return 0;
-    }
-    else if (exp!=0)
-    {
-      return 0;
-    }
-  }
-  return e;
-}
-
-/*2
-* returns TRUE if p1 = p2
-*/
-BOOLEAN p_EqualPolys(poly p1,poly p2, const ring r)
-{
-  while ((p1 != NULL) && (p2 != NULL))
-  {
-    if (! p_LmEqual(p1, p2,r))
-      return FALSE;
-    if (! n_Equal(p_GetCoeff(p1,r), p_GetCoeff(p2,r),r ))
-      return FALSE;
-    pIter(p1);
-    pIter(p2);
-  }
-  return (p1==p2);
-}
-
 /*2
 *returns TRUE if p1 is a skalar multiple of p2