Changeset 57bfa2 in git

Timestamp:

Apr 14, 2009, 2:40:46 PM (14 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

29a96670493a61dce0e68a57c46668b689508d12

Parents:

797d4f19229a77bdf9613bc5ed8a5f46eaebabe4

Message:

*motsak: better extension-testing switches


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

Location:

kernel

Files:

• gring.cc (modified) (5 diffs)
• gring.h (modified) (2 diffs)
• syz.cc (modified) (4 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.72 2009-04-03 18:28:53 motsak Exp $
+ *  Version: $Id: gring.cc,v 1.73 2009-04-14 12:40:46 motsak Exp $
  *******************************************************************/
 
@@ -51 +51 @@
 
 
+
+int  iNCExtensions = 0x00001; // only SCA can be used...
+
+
+int& getNCExtensions()
+{
+  return (iNCExtensions);
+}
+
+int setNCExtensions(int iMask)
+{
+  const int iOld = getNCExtensions();
+  getNCExtensions() = iMask;
+  return (iOld);
+}
+
+
+bool ncExtensions(int iMask) //  = 0x0FFFF
+{
+  return ((getNCExtensions() & iMask) == iMask);
+}
+
+
+
+
 static const bool bNoPluralMultiplication = false;  // use only formula shortcuts in my OOP Multiplier
 
@@ -63 +88 @@
 // true, *, *  == new OOP multiplication!
 
-bool bUseExtensions = true;
 
 /* global nc_macros : */
@@ -3390 +3414 @@
   gnc_p_ProcsSet(rGR, p_Procs);
 
-  if(rIsSCA(rGR) && bUseExtensions)
+  if(rIsSCA(rGR) && ncExtensions(SCAMASK) )
   {
     sca_p_ProcsSet(rGR, p_Procs);
@@ -3811 +3835 @@
   // currently only super-commutative extension deals with factors.
 
-  if( bUseExtensions )
+  if( ncExtensions(SCAMASK)  )
   {
     bool sca_ret = sca_SetupQuotient(rGR, rG, bCopy);

kernel/gring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gring.h,v 1.27 2009-04-03 18:28:53 motsak Exp $ */
+/* $Id: gring.h,v 1.28 2009-04-14 12:40:46 motsak Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
@@ -104 +104 @@
 
 
+// const int GRMASK = 1 << 1;
+const int SCAMASK = 1; // For backward compatibility
+const int TESTSYZSCAMASK = 0x0100 | SCAMASK; //
+
+// NCExtensions Mask Property 
+int& getNCExtensions();
+int  setNCExtensions(int iMask);
+
+// Test
+bool ncExtensions(int iMask); //  = 0x0FFFF
 
 

kernel/syz.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.cc,v 1.20 2009-04-10 19:03:44 motsak Exp $ */
+/* $Id: syz.cc,v 1.21 2009-04-14 12:40:46 motsak Exp $ */
 
 /*
@@ -616 +616 @@
 syStrategy syResolution(ideal arg, int maxlength,intvec * w, BOOLEAN minim)
 {
-#define QSyzTest 0
 
 #ifdef HAVE_PLURAL
 
-#if QSyzTest
-  ideal idSaveCurrQuotient = currQuotient;
-  ideal idSaveCurrRingQuotient = currRing->qideal;
-#endif
+  const ideal idSaveCurrQuotient = currQuotient;
+  const ideal idSaveCurrRingQuotient = currRing->qideal;
 
   if( rIsSCA(currRing) )
@@ -633 +630 @@
 #endif
 
-#if QSyzTest
-    currQuotient = SCAQuotient(currRing);
-    currRing->qideal = currQuotient;
-#endif
+    if( ncExtensions(TESTSYZSCAMASK) )
+    {
+      currQuotient = SCAQuotient(currRing);
+      currRing->qideal = currQuotient;
+    }
 
     const unsigned int m_iFirstAltVar = scaFirstAltVar(currRing);
@@ -685 +683 @@
   {
 
-#if QSyzTest
-    currQuotient     = idSaveCurrQuotient; 
-    currRing->qideal = idSaveCurrRingQuotient;
-#endif
+    if( ncExtensions(TESTSYZSCAMASK) )
+    {
+      currQuotient     = idSaveCurrQuotient; 
+      currRing->qideal = idSaveCurrRingQuotient;
+    }
 
     id_Delete(&arg, currRing);