Changeset aef1b86 in git

Timestamp:

Jul 4, 2008, 6:17:16 PM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d81b79a04dd97fbb40df1b3a823019d92d8987a7

Parents:

6bde67d3ebe4f6e2535783ef325b4c27f75c7b33

Message:

*motsak: correction of Z_2 - homogeneity


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

Location:

kernel

Files:

• kutil.cc (modified) (5 diffs)
• kutil.h (modified) (2 diffs)
• sca.cc (modified) (6 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.94 2008-06-25 12:03:56 Singular Exp $ */
+/* $Id: kutil.cc,v 1.95 2008-07-04 16:17:15 motsak Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1383 +1383 @@
 #ifdef HAVE_PLURAL
   const BOOLEAN bIsPluralRing = rIsPluralRing(currRing);
-  const BOOLEAN bIsSCA        = rIsSCA(currRing) && strat->homog; // for prod-crit
+  const BOOLEAN bIsSCA        = rIsSCA(currRing) && strat->z2homog; // for Z_2 prod-crit
   const BOOLEAN bNCProdCrit   = ( !bIsPluralRing || bIsSCA ); // commutative or homogeneous SCA
 
@@ -1650 +1650 @@
     //PrintS("prod-crit\n");
     #ifdef HAVE_PLURAL
-    if((!rIsPluralRing(currRing)) || (rIsSCA(currRing) && strat->homog))
+    if((!rIsPluralRing(currRing)) || (rIsSCA(currRing) && strat->z2homog))
     #endif
     {
@@ -5316 +5316 @@
 #ifdef HAVE_PLURAL
   // and r is plural_ring
-  if( rIsPluralRing(currRing) || (rIsSCA(currRing) && !strat->homog) )
+  if( rIsPluralRing(currRing) || (rIsSCA(currRing) && !strat->z2homog) )
   {    //or it has non-quasi-comm type... later
     strat->sugarCrit = FALSE;
@@ -6507 +6507 @@
 
   const BOOLEAN bIsPluralRing = rIsPluralRing(currRing);
-  const BOOLEAN bIsSCA        = rIsSCA(currRing) && strat->homog; // for prod-crit
+  const BOOLEAN bIsSCA        = rIsSCA(currRing) && strat->z2homog; // for prod-crit
   const BOOLEAN bNCProdCrit   = ( !bIsPluralRing || bIsSCA ); // commutative or homogeneous SCA
 

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.35 2008-02-26 23:35:31 levandov Exp $ */
+/* $Id: kutil.h,v 1.36 2008-07-04 16:17:15 motsak Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -311 +311 @@
   BOOLEAN interpt;
   BOOLEAN homog;
+#ifdef HAVE_PLURAL
+  BOOLEAN z2homog; // Z_2 - homogeneous input allows product criterion in commutative and SCA cases!
+#endif
   BOOLEAN kHEdgeFound;
   BOOLEAN honey,sugarCrit;

kernel/sca.cc

@@ -7 +7 @@
  *  Author:  motsak (Oleksandr Motsak)
  *  Created: 2006/12/18
- *  Version: $Id: sca.cc,v 1.25 2008-07-02 18:07:11 motsak Exp $
+ *  Version: $Id: sca.cc,v 1.26 2008-07-04 16:17:16 motsak Exp $
  *******************************************************************/
 
@@ -1001 +1001 @@
     tempQ = SCAQuotient(currRing);
 
-  bool bIdHomog = id_IsSCAHomogeneous(tempF, NULL, NULL, currRing); // wCx == wCy == NULL!
-
-  assume( !bIdHomog || strat->homog ); //  bIdHomog =====[implies]>>>>> strat->homog
-
-  strat->homog = strat->homog && bIdHomog;
-
-  assume( strat->homog == bIdHomog );
+  strat->z2homog = id_IsSCAHomogeneous(tempF, NULL, NULL, currRing); // wCx == wCy == NULL!
+
+//  strat->homog = strat->homog && strat->z2homog; // ?
 
 #if MYTEST
@@ -1651 +1647 @@
 #endif
   
-  bool bIdHomog = id_IsSCAHomogeneous(tempF, NULL, NULL, currRing); // wCx == wCy == NULL!
-
-  assume( !bIdHomog || strat->homog ); //  bIdHomog =====[implies]>>>>> strat->homog
-
-  strat->homog = strat->homog && bIdHomog;
-
-#ifdef PDEBUG
-  assume( strat->homog == bIdHomog );
-#endif /*PDEBUG*/
+  strat->z2homog = id_IsSCAHomogeneous(tempF, NULL, NULL, currRing); // wCx == wCy == NULL!
+
+//  strat->homog = strat->homog && strat->z2homog; // ?
 
 
@@ -2531 +2521 @@
   const unsigned int N  = r->N;
 
-  const int CommutativeVariable = 1;
+  const int CommutativeVariable = 0; // bug correction!
   const int AntiCommutativeVariable = 0;
 
   intvec* w = new intvec(N, 1, CommutativeVariable);
 
+  if(AntiCommutativeVariable != CommutativeVariable)
   if( rIsSCA(r) )
   {
@@ -2546 +2537 @@
     }
   }
+
   return w;
 }
@@ -2562 +2554 @@
   intvec* w = new intvec(N, 1, CommutativeVariable);
 
+  if(AntiCommutativeVariable != CommutativeVariable)
   if( rIsSCA(r) )
   {