Changeset efcd6fc in git

Timestamp:

Jul 24, 2008, 11:45:53 AM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9a23ea12b6c62eb9f558b89d9b30faf7fd7880ef

Parents:

9049476e9a76ab4688fdc64ff41ea3059d12c45e

Message:

*motsak: testing different multiplication implemenations


git-svn-id: file:///usr/local/Singular/svn/trunk@10901 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.65 2008-07-23 07:09:45 motsak Exp $
+ *  Version: $Id: gring.cc,v 1.66 2008-07-24 09:45:53 motsak Exp $
  *******************************************************************/
 
@@ -45 +45 @@
 #include <ncSAMult.h> // for CMultiplier etc classes
 #include <ncSAFormula.h> // for CFormulaPowerMultiplier and enum Enum_ncSAType
+
+
+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!
 
 
@@ -978 +985 @@
 
 
-
-inline poly gnc_uu_Mult_ww_formula (int i, int a, int j, int b, const ring r)
-{
-
+static inline poly gnc_uu_Mult_ww_formula (int i, int a, int j, int b, const ring r)
+{
+  if(bNoFormula)
+    return gnc_uu_Mult_ww_vert(i, a, j, b, r);
+  
   CFormulaPowerMultiplier* FormulaMultiplier = GetFormulaPowerMultiplier(r);
   Enum_ncSAType PairType = _ncSA_notImplemented;
@@ -1047 +1055 @@
   p_Delete(&out,r);
 
-//   CFormulaPowerMultiplier* FormulaMultiplier = GetFormulaPowerMultiplier(r);
-// 
-//   if( FormulaMultiplier != NULL )
-//   {
-//     Enum_ncSAType PairType = FormulaMultiplier->GetPair(j, i);
-// 
-//     if( PairType != _ncSA_notImplemented )
-// //    return FormulaMultiplier->Multiply(j, i, b, a);
-//       return CFormulaPowerMultiplier::Multiply( PairType, j, i, b, a, r);
-//   }
-
+
+  if(bNoCache && !bNoFormula)
+  { // without cache!?
+    CFormulaPowerMultiplier* FormulaMultiplier = GetFormulaPowerMultiplier(r);
+    Enum_ncSAType PairType = _ncSA_notImplemented;
+
+     if( FormulaMultiplier != NULL )
+       PairType = FormulaMultiplier->GetPair(j, i);
+
+     if( PairType != _ncSA_notImplemented )
+  // //    return FormulaMultiplier->Multiply(j, i, b, a);
+       return CFormulaPowerMultiplier::Multiply( PairType, j, i, b, a, r);
+  }
+
+  
   /* we are here if  i>j and variables do not commute or quasicommute */
   /* in fact, now a>=1 and b>=1; and j<i */
@@ -3247 +3259 @@
   }
 
-//  ncInitSpecialPowersMultiplication(r);
-
+
+  bool newmult = false;
+  if( bNoPluralMultiplication )
+    newmult = ncInitSpecialPairMultiplication(r);
+
+
+  if( !newmult )
+    if(!rIsSCA(r) && !bNoFormula)
+        newmult = ncInitSpecialPowersMultiplication(r);
+  
+  
   if (save != currRing)
     rChangeCurrRing(save);