Changeset 1af8ad in git

Timestamp:

Mar 25, 2021, 2:21:44 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

281f9f2840a2fc658c50cae0b1a737435786544d

Parents:

c16bdef35175b236a3d32ddd0a323bd2a93183dd280aeceb2daee09b3e9e0ac398edcd7ec3ad779a

git-author:

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

git-committer:

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

Message:

Merge pull request #1067 from mkoeppe/doc_set_PERL5LIB

doc/Makefile-docbuild.in: When setting PERLLIB, also set PERL5LIB

Files:

• Singular/extra.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (5 diffs)
• doc/Makefile-docbuild.in (modified) (2 diffs)
• kernel/ideals.cc (modified) (1 diff)
• kernel/ideals.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (7 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (2 diffs)
• libpolys/polys/simpleideals.cc (modified) (2 diffs)
• libpolys/polys/weight.cc (modified) (2 diffs)
• libpolys/polys/weight.h (modified) (1 diff)

Singular/extra.cc

@@ -2332 +2332 @@
           /* == now the work starts == */
 
-          short * iv=iv2array(v, currRing);
+          int * iv=iv2array(v, currRing);
           poly r=0;
           poly hp=ppJetW(f,n,iv);

Singular/iparith.cc

@@ -1829 +1829 @@
 static BOOLEAN jjDEG_M_IV(leftv res, leftv u, leftv v)
 {
-  short *iv=iv2array((intvec *)v->Data(),currRing);
+  int *iv=iv2array((intvec *)v->Data(),currRing);
   ideal I=(ideal)u->Data();
   int d=-1;
   int i;
   for(i=IDELEMS(I);i>=0;i--) d=si_max(d,(int)p_DegW(I->m[i],iv,currRing));
-  omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(short) );
+  omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(int) );
   res->data = (char *)((long)d);
   return FALSE;
@@ -1843 +1843 @@
   if (p!=NULL)
   {
-    short *iv=iv2array((intvec *)v->Data(),currRing);
+    int *iv=iv2array((intvec *)v->Data(),currRing);
     const long d = p_DegW(p,iv,currRing);
-    omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(short) );
+    omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(int) );
     res->data = (char *)(d);
   }
@@ -6149 +6149 @@
 static BOOLEAN jjJET_P_IV(leftv res, leftv u, leftv v, leftv w)
 {
-  short *iw=iv2array((intvec *)w->Data(),currRing);
+  int *iw=iv2array((intvec *)w->Data(),currRing);
   res->data = (char *)ppJetW((poly)u->Data(),(int)(long)v->Data(),iw);
-  omFreeSize( (ADDRESS)iw, (rVar(currRing)+1)*sizeof(short) );
+  omFreeSize( (ADDRESS)iw, (rVar(currRing)+1)*sizeof(int) );
   return FALSE;
 }
@@ -7123 +7123 @@
 
   int n=(int)(long)v3->Data();
-  short *w=NULL;
+  int *w=NULL;
   if(v4!=NULL)
   {
     w = iv2array((intvec *)v4->Data(),currRing);
-    short * w0 = w + 1;
+    int * w0 = w + 1;
     int i = currRing->N;
     while( (i > 0) && ((*w0) > 0) )
@@ -7145 +7145 @@
   w2.CleanUp();
   if(w!=NULL)
-    omFreeSize( (ADDRESS)w, (rVar(currRing)+1)*sizeof(short) );
+    omFreeSize( (ADDRESS)w, (rVar(currRing)+1)*sizeof(int) );
 
   lists L=(lists) omAllocBin(slists_bin);

doc/Makefile-docbuild.in

@@ -186 +186 @@
 
 %_noFun.doc : %.pl pl2doc.pl
-        export PERLLIB=.;${PL2DOC_M}  -no_fun -o $@  $<
+        export PERLLIB=. PERL5LIB=.; ${PL2DOC_M}  -no_fun -o $@  $<
 
 %.doc : %.pl pl2doc.pl
-        export PERLLIB=.;${PL2DOC} -o $@ $<
+        export PERLLIB=. PERL5LIB=.; ${PL2DOC} -o $@ $<
 
 # do not delete intermediate .pl and .doc files
@@ -225 +225 @@
 html: ${TMP_DIR} ${HTML_SUBDIR}/${HTML_MANUAL_TOP} ${IMAGES_HTML} $(STANDALONE_TEXI_FILES)
 ${HTML_SUBDIR}/${HTML_MANUAL_TOP}: ${TEXI2HTML_INIT} ${TEXI2HTML} singular.tex s-plural.tex s-letterplace.tex
-        export PERLLIB=.;${PERL} ${TEXI2HTML} ${TEXI2HTML_OPTS} -prefix ${HTML_MANUAL_PREFIX} \
+        export PERLLIB=. PERL5LIB=.;${PERL} ${TEXI2HTML} ${TEXI2HTML_OPTS} -prefix ${HTML_MANUAL_PREFIX} \
         -top_file ${HTML_MANUAL_TOP} singular.tex
 

kernel/ideals.cc

@@ -1316 +1316 @@
 *P, Q, and w are not changed
 */
-void idLiftW(ideal P,ideal Q,int n,matrix &T, ideal &R,short *w)
+void idLiftW(ideal P,ideal Q,int n,matrix &T, ideal &R,int *w)
 {
   long N=0;

kernel/ideals.h

@@ -144 +144 @@
              matrix *unit=NULL, GbVariant a=GbDefault);
 
-void idLiftW(ideal P,ideal Q,int n,matrix &T, ideal &R, short *w= NULL );
+void idLiftW(ideal P,ideal Q,int n,matrix &T, ideal &R, int *w= NULL );
 
 ideal   idQuot (ideal h1,ideal h2,

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: