Changeset fb8b1cf in git for kernel/ncSAMult.h

Timestamp:

Jul 10, 2008, 5:07:46 PM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1367162082700b6bd218bdf7c3bacb10d1f624ca

Parents:

e675a91b1fd1b28f733dcb506498d7adfd7c1d1b

Message:

*motsak: more to an implementation


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

File:

• kernel/ncSAMult.h (modified) (3 diffs)

kernel/ncSAMult.h

@@ -4 +4 @@
  *  Computer Algebra System SINGULAR     *
  *****************************************/
-/* $Id: ncSAMult.h,v 1.1 2008-07-04 16:18:42 motsak Exp $ */
+/* $Id: ncSAMult.h,v 1.2 2008-07-10 15:07:46 motsak Exp $ */
 #ifdef HAVE_PLURAL
 
@@ -11 +11 @@
 #include <structs.h>
 #include <ring.h>
+#include <summator.h> // for CPolynomialSummator class
 
 // //////////////////////////////////////////////////////////////////////// //
 //
+template <typename CExponent>
+class CMultiplier
+{
+  protected:
+    ring m_basering;
+
+    enum EHistoryType {
+      MULT_START 
+    }
+
+  public:
+    CMultiplier(ring rBaseRing): m_basering(rBaseRing) {};
+    
+  protected:
+    virtual CExponent GetExponent(const poly pMonom); // ugly!
+
+    virtual poly Multiply(const CExponent a, const CExponent b) = 0;
+    
+    inline poly MultiplyMonoms(const poly pPoly, const CExponent b)
+    { return( p_Mult_nn(Multiply(GetExponent(pPoly), b), p_GetCoeff(pPoly,m_basering), m_basering); }
+    
+    inline poly MultiplyMonoms(const CExponent a, const poly pPoly)
+    { return( p_Mult_nn(Multiply(a, GetExponent(pPoly)), p_GetCoeff(pPoly,m_basering), m_basering); }
+    
+    
+    poly Multiply(const poly pPoly, const CExponent b)
+    {
+      bool bUsePolynomial = TEST_OPT_NOT_BUCKETS || (pLength(pPoly) < MIN_LENGTH_BUCKET);
+      CPolynomialSummator sum(m_basering, bUsePolynomial);
+
+      for( poly q = pPoly; q !=NULL; q = pNext(q) )
+        sum += MultiplyMonoms(q, b); 
+      
+      return sum;
+    };
+    
+    poly Multiply(CExponent a, const poly pPoly)
+    {
+      bool bUsePolynomial = TEST_OPT_NOT_BUCKETS || (pLength(pPoly) < MIN_LENGTH_BUCKET);
+      CPolynomialSummator sum(m_basering, bUsePolynomial);
+
+      for( poly q = pPoly; q !=NULL; q = pNext(q) )
+        sum += MultiplyMonoms(a, q);
+      
+      return sum;
+    };
+
+    poly MultiplyAndDestroyPoly(poly pPoly, const CExponent b)
+    {
+      bool bUsePolynomial = TEST_OPT_NOT_BUCKETS || (pLength(pPoly) < MIN_LENGTH_BUCKET);
+      CPolynomialSummator sum(m_basering, bUsePolynomial);
+
+
+      for( ; pPoly!=NULL; pPoly  = p_LmDeleteAndNext(pPoly, m_basering) )
+        sum += MultiplyMonoms(pPoly, b);
+
+      return sum;
+    };
+
+    poly MultiplyAndDestroyPoly(CExponent a, poly pPoly)
+    {
+      bool bUsePolynomial = TEST_OPT_NOT_BUCKETS || (pLength(pPoly) < MIN_LENGTH_BUCKET);
+      CPolynomialSummator sum(m_basering, bUsePolynomial);
+
+      for( ; pPoly!=NULL; pPoly  = p_LmDeleteAndNext(pPoly, m_basering) )
+        sum += MultiplyMonoms(a, pPoly);
+
+      return sum;
+    };
+    
+        
+    void History(CExponent a, CExponent b, EHistoryType t)
+    {
+      Print("Mult!\n");
+    }
+  private: // no copy constuctors!
+    CMultiplier();
+    operator =(CMultiplier&);
+};
+
+typedef CMultiplier<int> CSpecialPairMultiplier;
+typedef CMultiplier<int*> CGlobalMultiplier;
+
+
+
 /*
 
@@ -42 +128 @@
 
 
-template <typename CExponent>
-class CMultiplier
-{
-  public:
-    virtual poly Multiply(CExponent a, CExponent b);
-  protected:
-    poly Multiply(poly p, CExponent b);
-    poly Multiply(CExponent a, poly p);
-    void History(CExponent a, CExponent b);
-  private: // no copy constuctors!
-    CMultiplier();
-    operator =(CMultiplier&);
-}
-
-typedef CMultiplier<int> CSpecialPairMultiplier;
-typedef CMultiplier<int*> CGlobalMultiplier;
-
-
 class CCommutativeSpecialPairMultiplier: public CSpecialPairMultiplier
 {