Changeset 07625cb in git for kernel/kutil.cc

Timestamp:

Nov 6, 2007, 1:58:35 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

546f3b19e4b731ab0bb81dfd94920b298729c4ac

Parents:

22ea2e7a74e0da549b0158ff019220c1d6bcd651

Message:

*hannes: shift stuff depend on PLURAL


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

File:

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

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.66 2007-11-05 12:40:19 Singular Exp $ */
+/* $Id: kutil.cc,v 1.67 2007-11-06 12:58:34 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -6052 +6052 @@
 #endif
 
+#ifdef HAVE_PLURAL
 /* including the self pairs? */
 
@@ -6109 +6110 @@
 
 
-#ifdef HAVE_PLURAL
   const BOOLEAN bIsPluralRing = rIsPluralRing(currRing);
   const BOOLEAN bIsSCA        = rIsSCA(currRing) && strat->homog; // for prod-crit
   const BOOLEAN bNCProdCrit   = ( !bIsPluralRing || bIsSCA ); // commutative or homogeneous SCA
-#else
-  const BOOLEAN bIsPluralRing = FALSE;
-  const BOOLEAN bIsSCA        = FALSE;
-  const BOOLEAN bNCProdCrit   = TRUE;
-#endif
 
   if (strat->sugarCrit && bNCProdCrit)
@@ -6259 +6254 @@
   else
   {
-    #ifdef HAVE_PLURAL
     if ( bIsPluralRing )
     {
@@ -6283 +6277 @@
     }
     else
-    #endif
     {
       Lp.p = ksCreateShortSpoly(strat->S[i],p, strat->tailRing);
@@ -6397 +6390 @@
   }
 }
-
-
-
+#endif
+
+
+
+#ifdef HAVE_PLURAL
 /*2
 *reduces h with elements from T choosing  the first possible
@@ -6406 +6401 @@
 int redFirstShift (LObject* h,kStrategy strat)
 {
+  assume(rIsPluralRing(currRing));
   int at,reddeg,d,i;
   int pass = 0;
@@ -6435 +6431 @@
         wrp(strat->S[j]);
       }
-      #ifdef HAVE_PLURAL
-      if (rIsPluralRing(currRing))
-        (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p, currRing);
-      else
-      #else
-        spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether);
-      #endif
+      (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p, currRing);
+      //  spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether);
 
       if (TEST_OPT_DEBUG)
@@ -6511 +6502 @@
   }
 }
+#endif