Changeset 232bbd5 in git

Timestamp:

Feb 22, 2012, 9:51:21 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

f23ccea9a38ee5dfa1e6454e84dd4bd11cd5ce90

Parents:

64f0ca8d7049bea31d0e107cf5c613e0b6ffa5d3

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-22 21:51:21+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-23 20:35:08+01:00

Message:

switchable NC-extensions

add/chg: two more non-commutative (special multiplication) extensions and general Plural caching can be switched on&off now

Location:

libpolys/polys/nc

Files:

• nc.h (modified) (1 diff)
• old.gring.cc (modified) (5 diffs)

libpolys/polys/nc/nc.h

@@ -352 +352 @@
 
 
-// const int GRMASK = 1 << 1;
-const int SCAMASK = 1; // For backward compatibility
-const int TESTSYZSCAMASK = 0x0100 | SCAMASK; //
+const int GENERICMASK = 0x000; // gnc... must do its dirty job first!
+const int SCAMASK     = 0x001; 
+
+#if 0
+static const bool bNoPluralMultiplication = false;  // use only formula shortcuts in my OOP Multiplier
+// the following make sense only if bNoPluralMultiplication is false:
+static const bool bNoFormula = true;  // don't use any formula shortcuts
+static const bool bNoCache   = false; // only formula whenever possible, only make sanse if bNoFormula is false!
+#endif
+
+// false, true, false == old "good" Plural
+// false, false ==>> Plural + Cache + Direct Formula - not much
+// false, false, true ==>> Plural Mult + Direct Formula (no ~cache)
+// true, *, *  == new OOP multiplication!
+
+const int NOPLURALMASK= 0x002; // bNoPluralMultiplication
+const int NOFORMULAMASK=0x004; // bNoFormula
+const int NOCACHEMASK = 0x008; // bNoCache
+
+const int TESTSYZSCAMASK = 0x0100 | SCAMASK;
+
+
 
 // NCExtensions Mask Property 

libpolys/polys/nc/old.gring.cc

@@ -72 +72 @@
 poly nc_p_Bracket_qq(poly p, const poly q, const ring r);
 
-int  iNCExtensions = 0; // SCAMASK; // only SCA can be used by default
-
+// only SCA can be used by default, formulas are off by default
+int  iNCExtensions = SCAMASK | NOFORMULAMASK; 
 
 int& getNCExtensions()
@@ -87 +87 @@
 }
 
-
 bool ncExtensions(int iMask) //  = 0x0FFFF
 {
   return ((getNCExtensions() & iMask) == iMask);
 }
-
-
-
-
-static const bool bNoPluralMultiplication = false;  // use only formula shortcuts in my OOP Multiplier
-
-// the following make sense only if bNoPluralMultiplication is false:
-static const bool bNoFormula = true;  // don't use any formula shortcuts
-static const bool bNoCache   = false; // only formula whenever possible, only make sanse if bNoFormula is false!
-
-
-// false, true, false == old "good" Plural
-// false, false ==>> Plural + Cache + Direct Formula - not much
-// false, false, true ==>> Plural Mult + Direct Formula (no ~cache)
-// true, *, *  == new OOP multiplication!
-
 
 /* global nc_macros : */
@@ -1071 +1054 @@
 static inline poly gnc_uu_Mult_ww_formula (int i, int a, int j, int b, const ring r)
 {
-  if(bNoFormula)
+  if(ncExtensions(NOFORMULAMASK))
     return gnc_uu_Mult_ww_vert(i, a, j, b, r);
 
@@ -1140 +1123 @@
 
 
-  if(bNoCache && !bNoFormula) // don't use cache whenever possible!
+  if(ncExtensions(NOCACHEMASK) && !ncExtensions(NOFORMULAMASK)) // don't use cache whenever possible!
   { // without cache!?
     CFormulaPowerMultiplier* FormulaMultiplier = GetFormulaPowerMultiplier(r);
@@ -3271 +3254 @@
   }
 
-  if( bNoPluralMultiplication )
+  if( ncExtensions(NOPLURALMASK) )
     ncInitSpecialPairMultiplication(rGR);
 
-  if(!rIsSCA(rGR) && !bNoFormula)
+  if(!rIsSCA(rGR) && !ncExtensions(NOFORMULAMASK))
     ncInitSpecialPowersMultiplication(rGR);