Changeset 4e63600 in git for kernel/ideals.cc

Timestamp:

May 18, 2009, 2:36:23 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

a7f20731ae0418bf29c11a9649481bd93b9bb6fa

Parents:

8660795525dd05cd4a19c0ba04f85758df5542fa

Message:

*hannes: long/int)


git-svn-id: file:///usr/local/Singular/svn/trunk@11813 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/ideals.cc (modified) (12 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.72 2009-05-18 12:03:28 Singular Exp $ */
+/* $Id: ideals.cc,v 1.73 2009-05-18 12:36:23 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -1287 +1287 @@
 *works always in a ring with ringorder_s
 */
-static ideal idPrepare (ideal  h1, tHomog h, int syzcomp, intvec **w)
+static ideal idPrepare (ideal  h1, tHomog hom, int syzcomp, intvec **w)
 {
   ideal   h2, h3;
@@ -1310 +1310 @@
   }
   h2->rank = syzcomp+i+1;
+  
+  //if (hom==testHomog)
+  //{
+  //  if(idHomIdeal(h1,currQuotient))
+  //  {
+  //    hom=TRUE;
+  //  }
+  //}
 
 #if MYTEST
@@ -1349 +1357 @@
 
 
-  h3 = kStd(h2,currQuotient,h,w,NULL,syzcomp);
+  h3 = kStd(h2,currQuotient,hom,w,NULL,syzcomp);
   idDelete(&h2);
   return h3;
@@ -3035 +3043 @@
   }
 
-  int i,j,cmax=2,order=0,ord,* diff,* iscom,diffmin=32000;
+  long cmax=1,order=0,ord,* diff,diffmin=32000;
+  int *iscom;
+  int i,j;
   poly p=NULL;
   pFDegProc d;
@@ -3048 +3058 @@
   {
     p=F[i]=P[i];
-    cmax=si_max(cmax,(int)pMaxComp(p)+1);
-  }
-  diff = (int *)omAlloc0(cmax*sizeof(int));
+    cmax=si_max(cmax,(long)pMaxComp(p));
+  }
+  cmax++;
+  diff = (long *)omAlloc0(cmax*sizeof(long));
   if (w!=NULL) *w=new intvec(cmax-1);
   iscom = (int *)omAlloc0(cmax*sizeof(int));
@@ -3059 +3070 @@
     {
       p=F[i];
-      while ((p!=NULL) && (!iscom[pGetComp(p)])) pIter(p);
+      while ((p!=NULL) && (iscom[pGetComp(p)]==0)) pIter(p);
     }
     if ((p==NULL) && (i<length))
@@ -3067 +3078 @@
     else
     {
-      if (p==NULL)
+      if (p==NULL) /* && (i==length) */
       {
         i=0;
@@ -3088 +3099 @@
     while (p!=NULL)
     {
-      //if (pLexOrder)
-      //  ord=pTotaldegree(p);
-      //else
+      if (pLexOrder && (currRing->order[0]==ringorder_lp))
+        ord=pTotaldegree(p);
+      else
       //  ord = p->order;
-      ord = pFDeg(p,currRing);
-      if (!iscom[pGetComp(p)])
+        ord = pFDeg(p,currRing);
+      if (iscom[pGetComp(p)]==0)
       {
         diff[pGetComp(p)] = order-ord;
@@ -3115 +3126 @@
 *Print("order %d, ord %d, diff %d\n",order,ord,diff[pGetComp(p)]);
 */
-        if (order != ord+diff[pGetComp(p)])
+        if (order != (ord+diff[pGetComp(p)]))
         {
           omFreeSize((ADDRESS) iscom,cmax*sizeof(int));
-          omFreeSize((ADDRESS) diff,cmax*sizeof(int));
+          omFreeSize((ADDRESS) diff,cmax*sizeof(long));
           omFreeSize((ADDRESS) F,length*sizeof(poly));
           delete *w;*w=NULL;
@@ -3129 +3140 @@
   omFreeSize((ADDRESS) iscom,cmax*sizeof(int));
   omFreeSize((ADDRESS) F,length*sizeof(poly));
-  for (i=1;i<cmax;i++) (**w)[i-1]=diff[i];
+  for (i=1;i<cmax;i++) (**w)[i-1]=(int)(diff[i]);
   for (i=1;i<cmax;i++)
   {
@@ -3138 +3149 @@
     for (i=1;i<cmax;i++)
     {
-      (**w)[i-1]=diff[i]-diffmin;
-    }
-  }
-  omFreeSize((ADDRESS) diff,cmax*sizeof(int));
+      (**w)[i-1]=(int)(diff[i]-diffmin);
+    }
+  }
+  omFreeSize((ADDRESS) diff,cmax*sizeof(long));
   return TRUE;
 }