Changeset 895f38 in git

Timestamp:

Dec 9, 2006, 3:23:11 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

6a1cda546dc1b384b024ff7eeb708681672c654d

Parents:

e929b20c0a94aac14a96c4ce986dd6b9d7a2553d

Message:

*hannes: PLURUL: SB_1


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

File:

• kernel/kutil.cc (modified) (5 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.38 2006-12-08 17:50:55 Singular Exp $ */
+/* $Id: kutil.cc,v 1.39 2006-12-09 14:23:11 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1459 +1459 @@
   if(pHasNotCF(p,strat->S[i]))
   {
-    //PrintS("prod-crit\n");
     if (!rIsPluralRing(currRing))
     {
+      //PrintS("prod-crit\n");
       strat->cp++;
       return;
@@ -1493 +1493 @@
   /*-  compute the short s-polynomial -*/
 
-  Lp.p = ksCreateShortSpoly(strat->S[i],p,strat->tailRing);
+  #ifdef HAVE_PLURAL
+  if (rIsPluralRing(currRing))
+  {
+    Lp.p = nc_CreateShortSpoly(strat->S[i],p);
+  }
+  else
+  #endif
+    Lp.p = ksCreateShortSpoly(strat->S[i],p,strat->tailRing);
   if (Lp.p == NULL)
   {
+     //PrintS("short spoly==NULL\n");
      pLmFree(Lp.lcm);
   }
@@ -2562 +2570 @@
     }
   }
-  j=pos;
-  loop
-  {
-    unsigned long h_sev = pGetShortExpVector(h);
-    if (j > k) break;
-    clearS(h,h_sev,&j,&k,strat);
-    j++;
+  #ifdef HAVE_PLURAL
+  if (!rIsPluralRing(currRing))
+  #endif
+  {
+    j=pos;
+    loop
+    {
+      unsigned long h_sev = pGetShortExpVector(h);
+      if (j > k) break;
+      clearS(h,h_sev,&j,&k,strat);
+      j++;
+    }
   }
 }
@@ -4437 +4450 @@
   if (Q!=NULL) i=((IDELEMS(Q)+(setmaxTinc-1))/setmaxTinc)*setmaxTinc;
   else i=setmaxT;
-  i=((i+IDELEMS(F)+15)/16)*16;
+  i=((i+IDELEMS(F)+IDELEMS(P)+15)/16)*16;
   strat->ecartS=initec(i);
   strat->sevS=initsevS(i);