Changeset a794e7 in git

Timestamp:

Feb 21, 2009, 6:50:29 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

28f16452ba2351e155e944280a5d83ffdfd1ffc8

Parents:

d2fb9b798dfbc73c80fa4e362821dec99824da4f

Message:

*hannes: PROD_CRIT(strat)


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

Location:

kernel

Files:

• kstd1.cc (modified) (2 diffs)
• kutil.cc (modified) (14 diffs)
• kutil.h (modified) (2 diffs)
• ring.h (modified) (2 diffs)
• sca.cc (modified) (3 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.42 2008-12-08 10:00:44 wienand Exp $ */
+/* $Id: kstd1.cc,v 1.43 2009-02-21 17:50:11 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1705 +1705 @@
   if (rIsPluralRing(currRing))
   {
+    const BOOLEAN bIsSCA  = rIsSCA(currRing) && strat->z2homog; // for Z_2 prod-crit
+    strat->no_prod_crit   = ! bIsSCA;
     if (w!=NULL)
       r = nc_GB(F, Q, *w, hilb, strat);

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.118 2009-02-21 11:04:19 Singular Exp $ */
+/* $Id: kutil.cc,v 1.119 2009-02-21 17:50:11 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1387 +1387 @@
 #define MYTEST 0
 
-#ifdef HAVE_PLURAL
-  const BOOLEAN bIsPluralRing = rIsPluralRing(currRing);
-  const BOOLEAN bIsSCA        = rIsSCA(currRing) && strat->z2homog; // for Z_2 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)
+  if (strat->sugarCrit && PROD_CRIT(strat))
   {
     if((!((strat->ecartS[i]>0)&&(ecart>0)))
@@ -1468 +1456 @@
   else /*sugarcrit*/
   {
-    if (bNCProdCrit)
+    if (PROD_CRIT(strat))
     {
       // if currRing->nc_type!=quasi (or skew)
@@ -1542 +1530 @@
   {
     #ifdef HAVE_PLURAL
-    if ( bIsPluralRing )
+    if ( rIsPluralRing(currRing) )
     {
       if(pHasNotCF(p, strat->S[i]))
@@ -1553 +1541 @@
 //         }
 //         else
-        if( bIsSCA )
+        if( PROD_CRIT(strat) )
         {
             // product criterion for homogeneous case in SCA
@@ -1618 +1606 @@
     Lp.p2 = p;
 
-//    if ( !bIsPluralRing ) // !!!!
+//    if ( !rIsPluralRing(currRing) ) // !!!!
     assume(pNext(Lp.p)==NULL);
     pNext(Lp.p) = strat->tail; // !!!
@@ -1636 +1624 @@
     if (TEST_OPT_INTSTRATEGY)
     {
-      if (!bIsPluralRing)
+      if (!rIsPluralRing(currRing))
         nDelete(&(Lp.p->coef));
     }
@@ -1655 +1643 @@
   {
     //PrintS("prod-crit\n");
-    #ifdef HAVE_PLURAL
-    if((!rIsPluralRing(currRing)) || (rIsSCA(currRing) && strat->z2homog))
-    #endif
+    if(PROD_CRIT(strat))
     {
       //PrintS("prod-crit\n");
@@ -6928 +6914 @@
   }
 
-  const BOOLEAN bIsPluralRing = rIsPluralRing(currRing);
-  const BOOLEAN bIsSCA        = rIsSCA(currRing) && strat->z2homog; // for prod-crit
-  const BOOLEAN bNCProdCrit   = ( !bIsPluralRing || bIsSCA ); // commutative or homogeneous SCA
-
-  if (strat->sugarCrit && bNCProdCrit)
+  if (strat->sugarCrit && PROD_CRIT(strat))
   {
     if((!((ecartq>0)&&(ecart>0)))
@@ -7001 +6983 @@
   else /*sugarcrit*/
   {
-    if (bNCProdCrit)
+    if (PROD_CRIT(strat))
     {
       // if currRing->nc_type!=quasi (or skew)
@@ -7072 +7054 @@
   else
   {
-//     if ( bIsPluralRing )
+//     if ( rIsPluralRing(currRing) )
 //     {
 //       if(pHasNotCF(p, q))
@@ -7083 +7065 @@
 //         }
 //         else
-//         if( bIsSCA )
+//         if( PROD_CRIT(strat) )
 //         {
 //             // product criterion for homogeneous case in SCA
@@ -7130 +7112 @@
     Lp.p2 = p; // already in the needed form 
 
-    if ( !bIsPluralRing )
+    if ( !rIsPluralRing(currRing) )
       pNext(Lp.p) = strat->tail;
 
@@ -7150 +7132 @@
     if (TEST_OPT_INTSTRATEGY)
     {
-      if (!bIsPluralRing)
+      if (!rIsPluralRing(currRing))
         nDelete(&(Lp.p->coef));
     }

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.38 2008-09-16 12:33:18 Singular Exp $ */
+/* $Id: kutil.h,v 1.39 2009-02-21 17:50:11 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -330 +330 @@
   BOOLEAN posInLDependsOnLength;
   /*FALSE, if posInL == posInL10*/
+#ifdef HAVE_PLURAL
+  BOOLEAN no_prod_crit;
+#define PROD_CRIT(A) (!(A)->no_prod_crit)
+#else
+#define PROD_CRIT(A) (1)
+#endif
   char    redTailChange;
   char    news;

kernel/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.37 2009-01-06 16:56:05 Singular Exp $ */
+/* $Id: ring.h,v 1.38 2009-02-21 17:50:29 Singular Exp $ */
 
 /* includes */
@@ -38 +38 @@
 #ifdef HAVE_PLURAL
   nc_struct *n;
-  return (r != NULL) && ((n=r->GetNC()) != NULL) && (n->type != nc_error); 
+  return (r != NULL) && ((n=r->GetNC()) != NULL) /*&& (n->type != nc_error)*/; 
 #else
   return false;

kernel/sca.cc

@@ -7 +7 @@
  *  Author:  motsak (Oleksandr Motsak)
  *  Created: 2006/12/18
- *  Version: $Id: sca.cc,v 1.30 2009-01-06 15:49:14 Singular Exp $
+ *  Version: $Id: sca.cc,v 1.31 2009-02-21 17:50:11 Singular Exp $
  *******************************************************************/
 
@@ -1041 +1041 @@
 
   strat->z2homog = id_IsSCAHomogeneous(tempF, NULL, NULL, currRing); // wCx == wCy == NULL!
+  // redo: no_prod_crit
+  const BOOLEAN bIsSCA  = rIsSCA(currRing) && strat->z2homog; // for Z_2 prod-crit
+  strat->no_prod_crit   = ! bIsSCA;
 
 //  strat->homog = strat->homog && strat->z2homog; // ?
@@ -1687 +1690 @@
   
   strat->z2homog = id_IsSCAHomogeneous(tempF, NULL, NULL, currRing); // wCx == wCy == NULL!
+   // redo no_prod_crit:
+  const BOOLEAN bIsSCA  = rIsSCA(currRing) && strat->z2homog; // for Z_2 prod-crit
+  strat->no_prod_crit   = ! bIsSCA;
 
 //  strat->homog = strat->homog && strat->z2homog; // ?