Changeset 281f9f in git for libpolys

Timestamp:

Mar 25, 2021, 2:23:27 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

2daaaec2c36328eb8638fe3a6b61d9971c661dc4a20705c8fb93aca8b6012f0ce5d37cabe617a1df

Parents:

1af8ade1094b290d5ad768f26152741bea96d16671ef94c332207ebe0806ef545254939c51de3f38

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-03-25 14:23:27+01:00

git-committer:

GitHub <noreply@github.com>2021-03-25 14:23:27+01:00

Message:

Merge pull request #1066 from mkoeppe/configure_fix_DEFAULT_CHECKING_PATH_loops

configure: Options --with-XXX=DIR should override, not prepend to DEFAULT_CHECKING_PATH

Location:

libpolys

Files:

• configure.ac (modified) (1 diff)
• polys/monomials/p_polys.cc (modified) (7 diffs)
• polys/monomials/p_polys.h (modified) (2 diffs)
• polys/simpleideals.cc (modified) (2 diffs)
• polys/weight.cc (modified) (2 diffs)
• polys/weight.h (modified) (1 diff)

libpolys/configure.ac

@@ -54 +54 @@
         GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    elif test "$with_gmp" != no ; then
-        GMP_HOME_PATH="$with_gmp ${DEFAULT_CHECKING_PATH}"
+        GMP_HOME_PATH="$with_gmp"
     fi
 else

libpolys/polys/monomials/p_polys.cc

@@ -683 +683 @@
 }
 
-long p_DegW(poly p, const short *w, const ring R)
+long p_DegW(poly p, const int *w, const ring R)
 {
   p_Test(p, R);
@@ -4427 +4427 @@
 }
 
-poly pp_JetW(poly p, int m, short *w, const ring R)
+poly pp_JetW(poly p, int m, int *w, const ring R)
 {
   poly r=NULL;
@@ -4454 +4454 @@
 }
 
-poly p_JetW(poly p, int m, short *w, const ring R)
+poly p_JetW(poly p, int m, int *w, const ring R)
 {
   while((p!=NULL) && (totaldegreeWecart_IV(p,R,w)>m)) p_LmDelete(&p,R);
@@ -4501 +4501 @@
   if(n==0)
     return v;
-  short *ww=iv2array(w,R);
+  int *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));
+    omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(int));
     return v;
   }
@@ -4517 +4517 @@
   p_Delete(&u1,R);
   p_Delete(&v1,R);
-  omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
+  omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(int));
   return v;
 }
@@ -4524 +4524 @@
 poly p_Series(int n,poly p,poly u, intvec *w, const ring R)
 {
-  short *ww=iv2array(w,R);
+  int *ww=iv2array(w,R);
   if(p!=NULL)
   {
@@ -4532 +4532 @@
       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));
+  omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(int));
   return p;
 }

libpolys/polys/monomials/p_polys.h

@@ -73 +73 @@
 int p_MinDeg(poly p,intvec *w, const ring R);
 
-long p_DegW(poly p, const short *w, const ring R);
+long p_DegW(poly p, const int *w, const ring R);
 
 /// return TRUE if all monoms have the same component
@@ -2098 +2098 @@
 poly pp_Jet(poly p, int m, const ring R);
 poly p_Jet(poly p, int m,const ring R);
-poly pp_JetW(poly p, int m, short *w, const ring R);
-poly p_JetW(poly p, int m, short *w, const ring R);
+poly pp_JetW(poly p, int m, int *w, const ring R);
+poly p_JetW(poly p, int m, int *w, const ring R);
 
 poly n_PermNumber(const number z, const int *par_perm, const int OldPar, const ring src, const ring dst);

libpolys/polys/simpleideals.cc

@@ -1556 +1556 @@
   else
   {
-    short *w=iv2array(iv,R);
+    int *w=iv2array(iv,R);
     int k;
     for(k=0; k<IDELEMS(i); k++)
@@ -1562 +1562 @@
       r->m[k]=pp_JetW(i->m[k],d,w,R);
     }
-    omFreeSize((ADDRESS)w,(rVar(R)+1)*sizeof(short));
+    omFreeSize((ADDRESS)w,(rVar(R)+1)*sizeof(int));
   }
   return r;

libpolys/polys/weight.cc

@@ -198 +198 @@
 }
 
-short * iv2array(intvec * iv, const ring R)
-{
-  short *s=(short *)omAlloc0((rVar(R)+1)*sizeof(short));
+int * iv2array(intvec * iv, const ring R)
+{
+  int *s=(int *)omAlloc0((rVar(R)+1)*sizeof(int));
   int len=0;
   if(iv!=NULL)
@@ -229 +229 @@
 *with respect to given weights
 */
-long totaldegreeWecart_IV(poly p, ring r, const short *w)
+long totaldegreeWecart_IV(poly p, ring r, const int *w)
 {
   int i;

libpolys/polys/weight.h

@@ -19 +19 @@
 long maxdegreeWecart(poly p,int *l, ring r);
 long totaldegreeWecart(poly p, ring r);
-long totaldegreeWecart_IV(poly p, ring r, const short *w);
+long totaldegreeWecart_IV(poly p, ring r, const int *w);
 
-short * iv2array(intvec * iv, const ring R);
+int * iv2array(intvec * iv, const ring R);
 
 // internal: