Changeset d312f6 in git for kernel

Timestamp:

Jan 11, 2007, 11:27:04 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

d606265146ccd278e654a9d22bbcaa1132fcea2e

Parents:

35c62a92d36241464b88cbd648cd39499fc70ad8

Message:

*hannes: PLURAL TEST


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

Location:

kernel

Files:

• gring.h (modified) (3 diffs)
• kutil.cc (modified) (9 diffs)
• ring.h (modified) (2 diffs)
• sca.h (modified) (2 diffs)

kernel/gring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gring.h,v 1.15 2007-01-03 00:17:10 motsak Exp $ */
+/* $Id: gring.h,v 1.16 2007-01-11 10:27:03 Singular Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
 */
 
-// #ifdef HAVE_PLURAL
+#ifdef HAVE_PLURAL
 #include "structs.h"
 
@@ -128 +128 @@
 
 
-
-inline BOOLEAN rIsPluralRing(ring r)
-{
-#ifdef HAVE_PLURAL
-  return ((r != NULL) && (r->nc != NULL) && (r->nc->type != nc_error));
-#else
-  return 0;
-#endif
-}
 
 inline void ncRingType(ring r, nc_type t)
@@ -269 +260 @@
 
 #endif
+#endif

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.42 2007-01-05 17:59:32 Singular Exp $ */
+/* $Id: kutil.cc,v 1.43 2007-01-11 10:27:03 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1220 +1220 @@
   pSetm(Lp.lcm);
 
-  const bool bIsPluralRing = rIsPluralRing(currRing);
-  const bool bIsSCA        = rIsSCA(currRing) && strat->homog; // for prod-crit
-  const bool bNCProdCrit   = ( !bIsPluralRing || bIsSCA ); // commutative or homogeneous SCA
+#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)
@@ -1364 +1370 @@
   else
   {
+    #ifdef HAVE_PLURAL
     if ( bIsPluralRing )
     {
@@ -1388 +1395 @@
     }
     else
+    #endif
     {
       Lp.p = ksCreateShortSpoly(strat->S[i],p, strat->tailRing);
@@ -1452 +1460 @@
   {
     //PrintS("prod-crit\n");
+    #ifdef HAVE_PLURAL
     if(!rIsPluralRing(currRing) || (rIsSCA(currRing) && strat->homog))
+    #endif
     {
       //PrintS("prod-crit\n");
@@ -1486 +1496 @@
   /*-  compute the short s-polynomial -*/
 
-//   #ifdef HAVE_PLURAL
+  #ifdef HAVE_PLURAL
   if (rIsPluralRing(currRing))
   {
@@ -1492 +1502 @@
   }
   else
-//   #endif
+  #endif
     Lp.p = ksCreateShortSpoly(strat->S[i],p,strat->tailRing);
 
@@ -5136 +5146 @@
   strat->noTailReduction = !TEST_OPT_REDTAIL;
 
+#ifdef HAVE_PLURAL
   // and r is plural_ring
   if( rIsPluralRing(currRing) || (rIsSCA(currRing) && !strat->homog) )
@@ -5143 +5154 @@
     strat->honey = FALSE;
   }
+#endif
 
 #ifdef HAVE_RING2TOM

kernel/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.15 2007-01-03 00:17:12 motsak Exp $ */
+/* $Id: ring.h,v 1.16 2007-01-11 10:27:04 Singular Exp $ */
 
 /* includes */
@@ -32 +32 @@
 ring   rOpposite(ring r);
 ring   rEnvelope(ring r);
+
+#ifdef HAVE_PLURAL
+inline BOOLEAN rIsPluralRing(ring r)
+{
+  return ((r != NULL) && (r->nc != NULL) && (r->nc->type != nc_error));
+}
+#else
+#define rIsPluralRing(R) 0
+#endif
 
 

kernel/sca.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sca.h,v 1.3 2007-01-09 14:29:32 Singular Exp $ */
+/* $Id: sca.h,v 1.4 2007-01-11 10:27:04 Singular Exp $ */
 
+#ifdef HAVE_PLURAL
 #include <structs.h>
 // #include <polys-impl.h>
@@ -135 +136 @@
 
 #endif // #ifndef GRING_SUPER_COMMUTATIVE_ALGEBRA_H
-
+#endif