Changeset eb17bd3 in git for Singular/polys-impl.h

Timestamp:

Jan 16, 1998, 9:24:06 AM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

0d17129ea525ee2de2129263e6772861595d5a12

Parents:

51bfdb771330882f5a7a80691361ef0ec98f7cbe

Message:

* hannes: changes for TEST_MAC_ORDER
    (binom.cc binom.h polys-impl.cc polys-impl.h polys.cc
    spSpolyLoop.cc spolys0.h)


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

File:

• Singular/polys-impl.h (modified) (32 diffs)

Singular/polys-impl.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-impl.h,v 1.11 1998-01-15 16:16:23 obachman Exp $ */
+/* $Id: polys-impl.h,v 1.12 1998-01-16 08:24:03 Singular Exp $ */
 
 /***************************************************************
@@ -26 +26 @@
  ***************************************************************/
 
-// EXPONENT_TYPE is determined by configure und defined in mod2.h 
+// EXPONENT_TYPE is determined by configure und defined in mod2.h
 typedef EXPONENT_TYPE Exponent_t;
 
@@ -41 +41 @@
   number    coef;
   Order_t   Order;
+  #ifdef TEST_MAC_DEBUG
+  Order_t   MOrder;
+  #endif
   monomial  exp;
 };
@@ -47 +50 @@
  * MACROS CONTROLING MONOMIAL COMPARIONS:
 
- * COMP_TRADITIONAL 
+ * COMP_TRADITIONAL
      Keeps the traditional comparison routines
      defined -- needed as long as their might be comparisons with
      negativ components.
      All the traditional routines are prefixed by t_
-     
- * COMP_FAST 
+
+ * COMP_FAST
      Implements monomial operations using the fast vector
      techniques and several other extensions which go along with that.
-     Undefine in case there are problems. 
-     
- * COMP_STATISTIC  
+     Undefine in case there are problems.
+
+ * COMP_STATISTIC
      Provides several routines for accumulating statistics on monomial
      comparisons and divisibility tests
-     
- * COMP_DEBUG 
+
+ * COMP_DEBUG
      Turns on debugging of COMP_FAST by comparing the results of fast
      comparison with traditional comparison
@@ -68 +71 @@
  * COMP_NO_EXP_VECTOR_OPS
     Like COMP_FAST, except that it turns off "vector techniques" of
-    monomial operations, i.e. does everything exponent-wise. 
+    monomial operations, i.e. does everything exponent-wise.
  ***************************************************************/
 // #define COMP_FAST
@@ -107 +110 @@
 
 // size of poly without exponents
+#ifdef TEST_MAC_DEBUG
+#define POLYSIZE (sizeof(poly) + sizeof(number) + 2*sizeof(Order_t))
+#else
 #define POLYSIZE (sizeof(poly) + sizeof(number) + sizeof(Order_t))
+#endif
 #define POLYSIZEW (POLYSIZE / sizeof(long))
 // number of Variables
@@ -171 +178 @@
   (pVarOffset == -1 ? (i) - 1 : pVarOffset - (i))
 #define _pRingExpIndex(r, i)                           \
-  ((r)->VarOffset == -1 ? (i) - 1 : (r)->VarOffset - (i))   
+  ((r)->VarOffset == -1 ? (i) - 1 : (r)->VarOffset - (i))
 
 #else // ! WORDS_BIGENDIAN
@@ -184 +191 @@
 
 #endif // WORDS_BIGENDIAN
-    
+
 inline void pGetVarIndicies_Lex(int nvars,
                                 int &VarOffset, int &VarCompIndex,
@@ -235 +242 @@
 
 // The default settings:
-inline void pGetVarIndicies(int nvars, 
+inline void pGetVarIndicies(int nvars,
                             int &VarOffset, int &VarCompIndex,
                             int &VarLowIndex, int &VarHighIndex)
-{   
+{
   pGetVarIndicies_Lex(nvars,VarOffset,VarCompIndex,VarLowIndex,VarHighIndex);
 }
@@ -250 +257 @@
   pGetVarIndicies(nvars, pVarOffset, pCompIndex, pVarLowIndex, pVarHighIndex)
 
-    
+
 #else  // ! COMP_FAST
 #define _pExpIndex(i)       (i)
-#define _pRingExpIndex(r,i) (i)    
+#define _pRingExpIndex(r,i) (i)
 #endif // COMP_FAST
 
 /***************************************************************
  *
- * Primitives for accessing and seeting fields of a poly 
+ * Primitives for accessing and seeting fields of a poly
  *
  ***************************************************************/
@@ -376 +383 @@
 #define _pHead(A)       pDBHead(A,__FILE__,__LINE__)
 #define _pHead0(A)      pDBHead0(A, __FILE__,__LINE__)
-#ifdef COMP_FAST  
+#ifdef COMP_FAST
 #define _pFetchCopy(r,A)    pDBFetchCopy(r, A,__FILE__,__LINE__)
 #else
 #define _pFetchCopy(r,p)    pOrdPolyInsertSetm(pCopy(p))
 #endif
-  
+
 #else // ! MDEBUG
 
@@ -388 +395 @@
 
 #include <string.h>
-  
+
 inline poly    _pInit(void)
 {
@@ -419 +426 @@
 #ifdef DO_PROFILE
 
-#ifndef POLYS_IMPL_CC  
+#ifndef POLYS_IMPL_CC
 #define DECLARE(type, arglist) type arglist; \
    static type dummy_##arglist
 #else
-#define DECLARE(type, arglist) type arglist 
+#define DECLARE(type, arglist) type arglist
 #endif // POLYS_IMPL_CC
 
 #else //! DO_PROFILE
 
-#define DECLARE(type, arglist ) inline type arglist 
-
-#endif // DO_PROFILE 
+#define DECLARE(type, arglist ) inline type arglist
+
+#endif // DO_PROFILE
 
 
@@ -440 +447 @@
 
 #ifdef COMP_FAST
-  
-// nice declaration isn't it ??  
+
+// nice declaration isn't it ??
 #if defined(PDEBUG) && PDEBUG == 1
 #define pMonAddFast(p1, p2)  pDBMonAddFast(p1, p2, __FILE__, __LINE__)
@@ -454 +461 @@
   // positive and the sum of two exponents does not exceed
   // EXPONENT_MAX
-#ifndef COMP_NO_EXP_VECTOR_OPS  
+#ifndef COMP_NO_EXP_VECTOR_OPS
   Exponent_t c2 = _pGetComp(p2);
   int i = pVariables1W;
@@ -466 +473 @@
   Exponent_pt s2 = &(p2->exp[pVarLowIndex]);
 #endif
-  
+
   for (;;)
   {
@@ -478 +485 @@
   // reset comp of p2
   _pSetComp(p2, c2);
-#endif  
+#endif
+#ifdef TEST_MAC_ORDER
+  if (bNoAdd) bSetm(p1);else
+#endif
   _pGetOrder(p1) += _pGetOrder(p2);
 }
@@ -504 +514 @@
   const Exponent_t* s3 = (Exponent_t*) &(p3->exp[pVarLowIndex]);
   const Exponent_t* const ub = s3 + pVariables;
-// need to zero the "fill in" slots (i.e., empty exponents)  
+// need to zero the "fill in" slots (i.e., empty exponents)
 #ifdef  WORDS_BIG_ENDIAN
   *((unsigned long*) p1 + pMonomSize -1) = 0;
 #else
   *((unsigned long *) p1->exp) = 0;
-#endif  
-#endif  
-  
+#endif
+#endif
+
   for (;;)
   {
@@ -523 +533 @@
   // component of p1 is set to comp of p2
   _pSetComp(p1, _pGetComp(p2));
+  #ifdef TEST_MAC_ORDER
+  if (bNoAdd) bSetm(p1);else
+  #endif
   _pGetOrder(p1) = _pGetOrder(p2) + _pGetOrder(p3);
 }
 
 // Similar to pCopyAddFast, except that we assume that the component
-// of p2 and p3 is zero component 
+// of p2 and p3 is zero component
 #if defined(PDEBUG) && PDEBUG == 1
 #define _pCopyAddFast1(p1, p2, p3)  pDBCopyAddFast(p1, p2, p3, __FILE__, __LINE__)
@@ -553 +566 @@
 #else
   *((unsigned long *) p1->exp) = 0;
-#endif  
-#endif  
+#endif
+#endif
 
   for (;;)
@@ -564 +577 @@
     s2++;
   }
+  #ifdef TEST_MAC_ORDER
+  if (bNoAdd) bSetm(p1);else
+  #endif
   _pGetOrder(p1) = _pGetOrder(p2) + _pGetOrder(p3);
 }
@@ -595 +611 @@
   const unsigned long* s2;
   const unsigned long* lb;
-  
+
 #ifdef WORDS_BIGENDIAN
   lb = (unsigned long*) &(a->exp[0]);
@@ -612 +628 @@
     s2 = ((unsigned long*) b) + pMonomSizeW -2;
   }
-#else // !WORDS_BIGENDIAN 
+#else // !WORDS_BIGENDIAN
   lb = ((unsigned long*) a) + pMonomSizeW;
   if (pVariables & ((SIZEOF_LONG / SIZEOF_EXPONENT) - 1))
@@ -624 +640 @@
     s2 = (unsigned long*) &(b->exp[0]) + 1;
   }
-#endif  
+#endif
   for (;;)
   {
@@ -640 +656 @@
     if (s1 == lb) return TRUE;
     s2++;
-#endif    
+#endif
   }
 }
@@ -660 +676 @@
     s2--;
   }
-  
+
 #else // !WORDS_BIGENDIAN
   const Exponent_t* s1 = &(a->exp[pVarLowIndex]);
@@ -713 +729 @@
 #endif // defined(PDEBUG) && PDEBUG == 1
 
-  
+
 DECLARE(BOOLEAN, _pEqual(poly p1, poly p2))
 {
-#ifndef COMP_NO_EXP_VECTOR_OPS  
+#ifndef COMP_NO_EXP_VECTOR_OPS
   const long *s1 = (long*) &(p1->exp[0]);
   const long *s2 = (long*) &(p2->exp[0]);
@@ -725 +741 @@
   const Exponent_t* const lb = s1 + pVariables;
   if (_pGetComp(p1) != _pGetComp(p2)) return FALSE;
-#endif  
+#endif
 
   for(;;)
@@ -787 +803 @@
 
 #ifdef TEST_MAC_ORDER
-extern pSetmProc pSetm;
 DECLARE(void, pMonAddFast(poly a, poly m))
 {
   for(int ii =pVariables; ii; ii--) (a)->exp[ii] += (m)->exp[ii];\
-  if (bNoAdd) pSetm(a);
-  else _pGetOrder(a) += _pGetOrder(m);
+  if (bNoAdd) bSetm(a); else
+  _pGetOrder(a) += _pGetOrder(m);
 }
 #else
@@ -830 +845 @@
   int j = p->exp[from];
   int i = from + 1;
-  
+
   for(;;)
   {
@@ -846 +861 @@
     __pExpQuerSum2(p, _pExpIndex(to), _pExpIndex(1)) : \
     __pExpQuerSum2(p, _pExpIndex(1), _pExpIndex(to)))
- 
+
 #define _pExpQuerSum2(p,from,to) \
  (_pHasReverseExp ? \
@@ -858 +873 @@
 
 #endif
-           
+
 #endif // POLYS_IMPL_H