Changeset 9d0c2b in git

Timestamp:

Jul 8, 2008, 10:18:27 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

77987005e6c432b32a83558af620b8a21ecaa8cc

Parents:

9d249b2bd6e53779def56a0139a8157d70ec75c1

Message:

*hannes: syntax


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

Location:

kernel

Files:

• Makefile.in (modified) (2 diffs)
• summator.cc (modified) (13 diffs)
• summator.h (modified) (6 diffs)

kernel/Makefile.in

@@ -113 +113 @@
     prCopy.cc p_Mult_q.cc \
     pDebug.cc pInline2.cc pInline1.cc pInline0.cc \
-    pShallowCopyDelete.cc fast_mult.cc digitech.cc\
+    pShallowCopyDelete.cc fast_mult.cc digitech.cc summator.cc\
     tgb.cc tgbgauss.cc ringgb.cc f5gb.cc ratgring.cc shiftgb.cc 
 
@@ -167 +167 @@
         eigenval.h units.h mod_raw.h kbuckets.h sbuckets.h\
         mpr_global.h mpr_inout.h mpr_base.h mpr_numeric.h \
-        fegetopt.h distrib.h \
+        fegetopt.h distrib.h summator.h\
         ratgring.h shiftgb.h prCopy.h prCopyMacros.h \
         p_MemAdd.h p_MemCopy.h p_MemCmp.h p_Numbers.h \

kernel/summator.cc

@@ -6 +6 @@
  *  Purpose: simple Summator usecase implementation
  *  Author:  motsak
- *  Created: 
- *  Version: $Id: summator.cc,v 1.1 2008-07-04 14:19:38 motsak Exp $
+ *  Created:
+ *  Version: $Id: summator.cc,v 1.2 2008-07-08 08:18:27 Singular Exp $
  *******************************************************************/
 
@@ -20 +20 @@
 
 #include "mod2.h"
-
+#ifdef HAVE_PLURAL
 #include <summator.h> // for CPolynomialSummator class
 #include <ring.h>
@@ -41 +41 @@
     m_temp.m_bucket = sBucketCreate(rBaseRing);
   }
-};
+}
 
 /*
@@ -50 +50 @@
 #ifdef PDEBUG
   p_Test(pInitialSum, rBaseRing);
-#endif    
+#endif
 
   if(bUsePolynomial)
@@ -76 +76 @@
 #ifdef PDEBUG
       p_Test(m_temp.m_poly, m_basering);
-#endif    
-      
+#endif
       p_Delete(&m_temp.m_poly, m_basering);
 //      m_temp.m_poly = NULL;
@@ -87 +86 @@
 #ifdef PDEBUG
   p_Test(pSummand, m_basering);
-#endif    
-  
+#endif
+
   if(m_bUsePolynomial)
     m_temp.m_poly = p_Add_q(m_temp.m_poly, pSummand, m_basering);
@@ -99 +98 @@
 #ifdef PDEBUG
   p_Test(pSummand, m_basering);
-#endif    
+#endif
 
   if(m_bUsePolynomial)
@@ -110 +109 @@
 {
   poly out = NULL;
-  
+
   if(m_bUsePolynomial)
   {
     out = m_temp.m_poly;
     m_temp.m_poly = NULL;
-  } else
+  }
+  else
   {
     int pLength;
@@ -123 +123 @@
 #ifdef PDEBUG
   p_Test(out, m_basering);
-#endif    
-  
+#endif
+
   return out;
 }
@@ -132 +132 @@
 {
   poly out = NULL;
-  
+
   if(m_bUsePolynomial)
   {
@@ -138 +138 @@
     m_temp.m_poly = NULL;
     *piLength = pLength(out);
-  } else
+  }
+  else
   {
     *piLength = 0;
@@ -147 +148 @@
   p_Test(out, m_basering);
   assume(pLength(out) == *piLength);
-#endif    
-  
+#endif
+
   return out;
 }
@@ -157 +158 @@
 {
   AddAndDelete(p_Copy(pSummand, m_basering), iLength);
-};
+}
 
 void CPolynomialSummator::Add(poly pSummand)
 {
   AddAndDelete(p_Copy(pSummand, m_basering));
-};
+}
 
-
+#endif

kernel/summator.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: summator.h,v 1.1 2008-07-04 14:19:38 motsak Exp $ */
+/* $Id: summator.h,v 1.2 2008-07-08 08:18:27 Singular Exp $ */
 
 // #include <summator.h> // for CPolynomialSummator class
@@ -15 +15 @@
 // CPolynomialSummator: unifies bucket and polynomial summation as the
 // later is brocken in buckets :(
-
+#ifdef HAVE_PLURAL
 class CPolynomialSummator
 {
@@ -21 +21 @@
     ring m_basering;
     bool m_bUsePolynomial;
-    union {
+    union
+    {
       sBucket_pt m_bucket;
       poly       m_poly;
-    } m_temp;    
+    } m_temp;
   public:
     CPolynomialSummator(ring rBaseRing, bool bUsePolynomial = false);
@@ -33 +34 @@
     void AddAndDelete(poly pSummand, int iLength);
     void AddAndDelete(poly pSummand);
-    
+
     inline void operator +=(poly pSummand){ AddAndDelete(pSummand); }
 
@@ -40 +41 @@
     void Add(poly pSummand, int iLength);
     void Add(poly pSummand);
-    
+
     // get the final result and clear (set to zero) the summator
     poly AddUpAndClear();
@@ -46 +47 @@
 
     inline operator poly() { return AddUpAndClear(); }
-    
+
   private: // no copies of this object at the moment!!!
     CPolynomialSummator(const CPolynomialSummator& m);               // Copy constructor
-    CPolynomialSummator& operator= (const CPolynomialSummator& m);   // Assignment operator    
+    CPolynomialSummator& operator= (const CPolynomialSummator& m);   // Assignment operator
 };
 
+#endif
 #endif // ifndef  SUMMATOR_H
 
-
-
-
-
-