Changeset 57bfa2 in git for kernel/gring.cc

Timestamp:

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

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

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

File:

• kernel/gring.cc (modified) (5 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);