Changeset cbc7e3 in git for kernel/ideals.cc

Timestamp:

Jun 13, 2007, 5:01:50 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

927b7e63e6ff76d9dea1e55fced8f1c8fd41d02d

Parents:

769528558a023e8c13ce1cf5f179965d3699fadf

Message:

*hannes: idChin.. fixed


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

File:

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

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.43 2007-05-15 09:28:08 Singular Exp $ */
+/* $Id: ideals.cc,v 1.44 2007-06-13 15:01:50 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2410 +2410 @@
   for (k=0;k<IDELEMS(h1);k++) h->m[k] = prCopyR( h1->m[k], origR);
   // compute kStd
+#if 1
   hh = kStd(h,NULL,hom,&w,hilb);
   idDelete(&h);
-
+#else
+  extern ideal kGroebner(ideal F, ideal Q);
+  hh=kGroebner(h,NULL);
+#endif
   // go back to the original ring
   rChangeCurrRing(origR);
@@ -2984 +2988 @@
     }
   }
-  
+
   if(w!=NULL)
     pSetModDeg(NULL);
-  
+
   return TRUE;
 }
@@ -3707 +3711 @@
   ideal result=idInit(IDELEMS(xx[0]),1);
   int i,j;
-  poly r,h,res_p;
+  poly r,h,hh,res_p;
   number *x=(number *)omAlloc(rl*sizeof(number));
   for(i=IDELEMS(result)-1;i>=0;i--)
@@ -3721 +3725 @@
       }
       if (r==NULL) break;
+      h=pHead(r);
       for(j=rl-1;j>=0;j--)
       {
-        h=xx[j]->m[i];
-        if (pLmCmp(r,h)==0)
-        { 
-          x[j]=pGetCoeff(h);
-          h=pLmFreeAndNext(h);
-          xx[j]->m[i]=h;
+        hh=xx[j]->m[i];
+        if ((hh!=NULL) && (pLmCmp(r,hh)==0))
+        {
+          x[j]=pGetCoeff(hh);
+          hh=pLmFreeAndNext(hh);
+          xx[j]->m[i]=hh;
         }
         else
@@ -3738 +3743 @@
         nlDelete(&(x[j]),currRing);
       }
-      h=pHead(r);
       pSetCoeff(h,n);
+      //Print("new mon:");pWrite(h);
       res_p=pAdd(res_p,h);
     }
@@ -3759 +3764 @@
   }
   return idChineseRemainder(xx,q,rl);
-}  
+}