Changeset 7415540 in git

Timestamp:

Feb 21, 2013, 12:26:31 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

920c7843408442a9b01c7736f0c717a03afefb10

Parents:

507427e9e0bf212d166ab8f3bb970f562784a172

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-21 12:26:31+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-21 12:29:30+01:00

Message:

Cosmetic p_DegW/iv2array-related changes

Files:

• Singular/iparith.cc (modified) (5 diffs)
• kernel/ideals.cc (modified) (3 diffs)
• kernel/polys.h (modified) (1 diff)

Singular/iparith.cc

@@ -1894 +1894 @@
   int d=-1;
   int i;
-  for(i=IDELEMS(I);i>=0;i--) d=si_max(d,(int)pDegW(I->m[i],iv));
-  omFreeSize((ADDRESS)iv,(currRing->N+1)*sizeof(short));
+  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) );
   res->data = (char *)((long)d);
   return FALSE;
@@ -1905 +1905 @@
   {
     short *iv=iv2array((intvec *)v->Data(),currRing);
-    int d=(int)pDegW(p,iv);
-    omFreeSize((ADDRESS)iv,(currRing->N+1)*sizeof(short));
-    res->data = (char *)(long(d));
+    const long d = p_DegW(p,iv,currRing);
+    omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(short) );
+    res->data = (char *)(d);
   }
   else
@@ -5991 +5991 @@
   short *iw=iv2array((intvec *)w->Data(),currRing);
   res->data = (char *)ppJetW((poly)u->Data(),(int)(long)v->Data(),iw);
-  omFreeSize((ADDRESS)iw,(currRing->N+1)*sizeof(short));
+  omFreeSize( (ADDRESS)iw, (rVar(currRing)+1)*sizeof(short) );
   return FALSE;
 }
@@ -6743 +6743 @@
   if(v4!=NULL)
   {
-    w=iv2array((intvec *)v4->Data(),currRing);
-    short *w0=w+1;
-    int i=currRing->N;
-    while(i>0&&*w0>0)
+    w = iv2array((intvec *)v4->Data(),currRing);
+    short * w0 = w + 1;
+    int i = currRing->N;
+    while( (i > 0) && ((*w0) > 0) )
     {
       w0++;
@@ -6762 +6762 @@
   w2.CleanUp();
   if(w!=NULL)
-    omFree(w);
+    omFreeSize( (ADDRESS)w, (rVar(currRing)+1)*sizeof(short) );
 
   lists L=(lists) omAllocBin(slists_bin);

kernel/ideals.cc

@@ -1142 +1142 @@
       N=si_max(N,p_Deg(Q->m[i],currRing));
     else
-      N=si_max(N,pDegW(Q->m[i],w));
+      N=si_max(N,p_DegW(Q->m[i],w,currRing));
   N+=n;
 
@@ -1167 +1167 @@
           p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
         pNormalize(p);
-        if(((w==NULL)&&(p_Deg(p0,currRing)>n))||((w!=NULL)&&(pDegW(p0,w)>n)))
+        if(((w==NULL)&&(p_Deg(p0,currRing)>n))||((w!=NULL)&&(p_DegW(p0,w,currRing)>n)))
           p_Delete(&p0,currRing);
         else
@@ -1181 +1181 @@
           pNext(p0)=NULL;
           if(((w==NULL)&&(p_Deg(p0,currRing)>n))
-          ||((w!=NULL)&&(pDegW(p0,w)>n)))
+          ||((w!=NULL)&&(p_DegW(p0,w,currRing)>n)))
             p_Delete(&p0,currRing);
           else

kernel/polys.h

@@ -342 +342 @@
 // maximum weigthed degree of all monomials of p, w is indexed from
 // 1..pVariables
+
+/// Deprecated: only for compatibility with older code!
 #define    pDegW(p,w) p_DegW(p,w,currRing)