Changeset b902246 in git for kernel/sca.cc

Timestamp:

Jul 26, 2008, 4:28:03 PM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

1c33e0d283423761177537ad5b17ac6eeba9901d

Parents:

050191fa505b5f43867ff2f00f542f9dbbb6735a

Message:

*motsak: p_ISet -> p_One, sca: xor instead of +, NCMultiplier reuse etc


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

File:

• kernel/sca.cc (modified) (17 diffs)

kernel/sca.cc

@@ -7 +7 @@
  *  Author:  motsak (Oleksandr Motsak)
  *  Created: 2006/12/18
- *  Version: $Id: sca.cc,v 1.26 2008-07-04 16:17:16 motsak Exp $
+ *  Version: $Id: sca.cc,v 1.27 2008-07-26 14:28:03 motsak Exp $
  *******************************************************************/
 
@@ -120 +120 @@
       const unsigned int iExpMM = p_GetExp(pMonomMM, j, rRing);
 
+#ifdef PDEBUG
+      assume( iExpM <= 1);
+      assume( iExpMM <= 1);
+#endif
+
       if( iExpMM != 0 )
       {
@@ -126 +131 @@
           return 0; // lm(pMonomM) * lm(pMonomMM) == 0
         }
-        tpower += cpower; // compute degree of (-1).
+        tpower ^= cpower; // compute degree of (-1).
       }
-
-      cpower += iExpM;
-    }
-
-    if( (tpower&1) != 0 ) // degree is odd => negate coeff.
-      return -1;
-
-    return(1);
+      cpower ^= iExpM;
+    }
+
+#ifdef PDEBUG
+    assume(tpower <= 1);
+#endif
+
+    // 1 => -1  // degree is odd => negate coeff.
+    // 0 =>  1
+
+    return(1 - (tpower << 1) );
 }
 
@@ -162 +170 @@
       const unsigned int iExpM  = p_GetExp(pMonomM,  j, rRing);
       const unsigned int iExpMM = p_GetExp(pMonomMM, j, rRing);
+
+#ifdef PDEBUG
+      assume( iExpM <= 1);
+      assume( iExpMM <= 1);
+#endif
 
       if( iExpMM != 0 )
@@ -170 +183 @@
         }
 
-        tpower += cpower; // compute degree of (-1).
+        tpower ^= cpower; // compute degree of (-1).
       }
 
-      cpower += iExpM;
-    }
-
+      cpower ^= iExpM;
+    }
+
+#ifdef PDEBUG
+    assume(tpower <= 1);
+#endif
+    
     p_ExpVectorAdd(pMonomM, pMonomMM, rRing); // "exponents" are additive!!!
 
     number nCoeffM = p_GetCoeff(pMonomM, rRing); // no new copy! should be deleted!
 
-    if( (tpower&1) != 0 ) // degree is odd => negate coeff.
+    if( (tpower) != 0 ) // degree is odd => negate coeff.
       nCoeffM = n_Neg(nCoeffM, rRing); // negate nCoeff (will destroy the original number)
 
@@ -217 +234 @@
       const unsigned int iExpMM = p_GetExp(pMonomMM, j, rRing);
       const unsigned int iExpM  = p_GetExp(pMonomM,  j, rRing);
+
+#ifdef PDEBUG
+      assume( iExpM <= 1);
+      assume( iExpMM <= 1);
+#endif
 
       if( iExpM != 0 )
@@ -225 +247 @@
         }
 
-        tpower += cpower; // compute degree of (-1).
+        tpower ^= cpower; // compute degree of (-1).
       }
 
-      cpower += iExpMM;
-    }
+      cpower ^= iExpMM;
+    }
+
+#ifdef PDEBUG
+    assume(tpower <= 1);
+#endif
 
     p_ExpVectorAdd(pMonomM, pMonomMM, rRing); // "exponents" are additive!!!
@@ -235 +261 @@
     number nCoeffM = p_GetCoeff(pMonomM, rRing); // no new copy! should be deleted!
 
-    if( (tpower&1) != 0 ) // degree is odd => negate coeff.
+    if( (tpower) != 0 ) // degree is odd => negate coeff.
       nCoeffM = n_Neg(nCoeffM, rRing); // negate nCoeff (will destroy the original number), creates new number!
 
@@ -274 +300 @@
       const unsigned int iExp2 = p_GetExp(pMonom2, j, rRing);
 
+#ifdef PDEBUG
+      assume( iExp1 <= 1);
+      assume( iExp2 <= 1);
+#endif
+      
       if( iExp2 != 0 )
       {
@@ -281 +312 @@
         }
 
-        tpower += cpower; // compute degree of (-1).
+        tpower ^= cpower; // compute degree of (-1).
       }
 
-      cpower += iExp1;
-    }
-
+      cpower ^= iExp1;
+    }
+
+#ifdef PDEBUG
+    assume(cpower <= 1);
+#endif
+    
     poly pResult;
     omTypeAllocBin(poly, pResult, rRing->PolyBin);
@@ -300 +335 @@
     number nCoeff = n_Mult(nCoeff1, nCoeff2, rRing); // new number!
 
-    if( (tpower&1) != 0 ) // degree is odd => negate coeff.
+    if( (tpower) != 0 ) // degree is odd => negate coeff.
       nCoeff = n_Neg(nCoeff, rRing); // negate nCoeff (will destroy the original number)
 
@@ -332 +367 @@
 
     for( unsigned int j = iFirstAltVar; j < i ; j++ )
-      cpower += p_GetExp(pMonom, j, rRing);
+      cpower ^= p_GetExp(pMonom, j, rRing);
+
+#ifdef PDEBUG
+    assume(cpower <= 1);
+#endif
 
     poly pResult = p_LmInit(pMonom, rRing);
@@ -341 +380 @@
     number nCoeff = n_Copy(p_GetCoeff(pMonom, rRing), rRing); // new number!
 
-    if( (cpower&1) != 0 ) // degree is odd => negate coeff.
+    if( cpower != 0 ) // degree is odd => negate coeff.
       nCoeff = n_Neg(nCoeff, rRing); // negate nCoeff (will destroy the original number)
 
@@ -747 +786 @@
   poly pL = p_Lcm(p1, p2, si_max(lCompP1, lCompP2), r);       // pL = lcm( lm(p1), lm(p2) )
 
-  poly m1 = p_ISet(1, r);
+  poly m1 = p_One( r);
   p_ExpVectorDiff(m1, pL, p1, r);                  // m1 = pL / lm(p1)
 
@@ -757 +796 @@
 
 
-  poly m2 = p_ISet(1, r);
+  poly m2 = p_One( r);
   p_ExpVectorDiff (m2, pL, p2, r);                  // m2 = pL / lm(p2)
 
@@ -1453 +1492 @@
     if( (i < b) || (i > e) ) // otherwise it's ok since rG is an SCA!
   {
-    poly square = p_ISet(1, rG);
+    poly square = p_One( rG);
     p_SetExp(square, i, 2, rG); // square = var(i)^2.
     p_Setm(square, rG);
@@ -1579 +1618 @@
 
 
-  poly xi =  p_ISet(1, rRing);
+  poly xi =  p_One( rRing);
   p_SetExp(xi, i, 1, rRing);
   p_Setm(xi, rRing);