Changeset cce4a2f in git

Timestamp:

Feb 22, 2009, 11:39:42 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

454cb04f5efb2088dc5f4cb1acc184a60aa3bbbd

Parents:

4732f82312538109bdce424060412c45a2b85dc6

Message:

*hannes: ALLOW_PROD_CRIT


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

Location:

kernel

Files:

• kutil.cc (modified) (8 diffs)
• kutil.h (modified) (2 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.119 2009-02-21 17:50:11 Singular Exp $ */
+/* $Id: kutil.cc,v 1.120 2009-02-22 10:39:42 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1387 +1387 @@
 #define MYTEST 0
 
-  if (strat->sugarCrit && PROD_CRIT(strat))
+  if (strat->sugarCrit && ALLOW_PROD_CRIT(strat))
   {
     if((!((strat->ecartS[i]>0)&&(ecart>0)))
@@ -1456 +1456 @@
   else /*sugarcrit*/
   {
-    if (PROD_CRIT(strat))
+    if (ALLOW_PROD_CRIT(strat))
     {
       // if currRing->nc_type!=quasi (or skew)
@@ -1541 +1541 @@
 //         }
 //         else
-        if( PROD_CRIT(strat) )
+        if( ALLOW_PROD_CRIT(strat) )
         {
             // product criterion for homogeneous case in SCA
@@ -1643 +1643 @@
   {
     //PrintS("prod-crit\n");
-    if(PROD_CRIT(strat))
+    if(ALLOW_PROD_CRIT(strat))
     {
       //PrintS("prod-crit\n");
@@ -6914 +6914 @@
   }
 
-  if (strat->sugarCrit && PROD_CRIT(strat))
+  if (strat->sugarCrit && ALLOW_PROD_CRIT(strat))
   {
     if((!((ecartq>0)&&(ecart>0)))
@@ -6983 +6983 @@
   else /*sugarcrit*/
   {
-    if (PROD_CRIT(strat))
+    if (ALLOW_PROD_CRIT(strat))
     {
       // if currRing->nc_type!=quasi (or skew)
@@ -7065 +7065 @@
 //         }
 //         else
-//         if( PROD_CRIT(strat) )
+//         if( ALLOW_PROD_CRIT(strat) )
 //         {
 //             // product criterion for homogeneous case in SCA

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.39 2009-02-21 17:50:11 Singular Exp $ */
+/* $Id: kutil.h,v 1.40 2009-02-22 10:39:42 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -331 +331 @@
   /*FALSE, if posInL == posInL10*/
 #ifdef HAVE_PLURAL
+  // set this flag to 1 to stop the product criteria
+  // use ALLOW_PROD_CRIT(strat) to test
   BOOLEAN no_prod_crit;
-#define PROD_CRIT(A) (!(A)->no_prod_crit)
+#define ALLOW_PROD_CRIT(A) (!(A)->no_prod_crit)
 #else
-#define PROD_CRIT(A) (1)
+#define ALLOW_PROD_CRIT(A) (1)
 #endif
   char    redTailChange;