Changeset 6fcddc9 in git

Timestamp:

Nov 22, 2012, 10:20:13 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

96d505212a6d61ec4e31fe4f7c2e2044f89eb69eb3cd39575ad9cf110a22729b4ce72d7fef6726fdcadaf23fbd63bd8fb7aadb287ac4a983f63fb33c

Parents:

30664c5b3e3d2f68b6afbb78f3f1798066c4f5b2

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-22 22:20:13+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-26 17:18:46+01:00

Message:

Made SCA's iFirstAltVar & iLastAltVar to be short

Location:

libpolys/polys/nc

Files:

• nc.h (modified) (2 diffs)
• sca.cc (modified) (10 diffs)
• sca.h (modified) (7 diffs)

libpolys/polys/nc/nc.h

@@ -112 +112 @@
         // iAltVarsStart, iAltVarsEnd are only used together with nc_type=nc_exterior
         // 1 <= iAltVarsStart <= iAltVarsEnd <= r->N
-        unsigned int iFirstAltVar, iLastAltVar; // = 0 by default
+        short iFirstAltVar, iLastAltVar; // = 0 by default
 
         // for factors of super-commutative algebras we need 
@@ -125 +125 @@
     inline nc_type ncRingType() const { return (type); };
 
-    inline unsigned int& FirstAltVar() 
+    inline short& FirstAltVar() 
         { assume(ncRingType() == nc_exterior); return (data.sca.iFirstAltVar); };
-    inline unsigned int& LastAltVar () 
+    inline short& LastAltVar () 
         { assume(ncRingType() == nc_exterior); return (data.sca.iLastAltVar ); };
 
-    inline unsigned int FirstAltVar() const 
+    inline short FirstAltVar() const 
         { assume(ncRingType() == nc_exterior); return (data.sca.iFirstAltVar); };
-    inline unsigned int LastAltVar () const 
+    inline short LastAltVar () const 
         { assume(ncRingType() == nc_exterior); return (data.sca.iLastAltVar ); };
 

libpolys/polys/nc/sca.cc

@@ -95 +95 @@
 #endif
 
-    const unsigned int iFirstAltVar = scaFirstAltVar(rRing);
-    const unsigned int iLastAltVar  = scaLastAltVar(rRing);
+    const short iFirstAltVar = scaFirstAltVar(rRing);
+    const short iLastAltVar  = scaLastAltVar(rRing);
 
     register unsigned int tpower = 0;
     register unsigned int cpower = 0;
 
-    for( register unsigned int j = iLastAltVar; j >= iFirstAltVar; j-- )
+    for( register short j = iLastAltVar; j >= iFirstAltVar; j-- )
     {
       const unsigned int iExpM  = p_GetExp(pMonomM,  j, rRing);
@@ -333 +333 @@
 // preserves pMonom. may return NULL!
 // if result != NULL => next(result) = NULL, lt(result) = x_i * lt(pMonom)
-static inline poly sca_xi_Mult_mm(unsigned int i, const poly pMonom, const ring rRing)
+static inline poly sca_xi_Mult_mm(short i, const poly pMonom, const ring rRing)
 {
 #ifdef PDEBUG
@@ -345 +345 @@
       return NULL;
 
-    const unsigned int iFirstAltVar = scaFirstAltVar(rRing);
+    const short iFirstAltVar = scaFirstAltVar(rRing);
 
     register unsigned int cpower = 0;
 
-    for( register unsigned int j = iFirstAltVar; j < i ; j++ )
+    for( register short j = iFirstAltVar; j < i ; j++ )
       cpower ^= p_GetExp(pMonom, j, rRing);
 
@@ -530 +530 @@
 
 // return x_i * pPoly; preserve pPoly.
-static inline poly sca_xi_Mult_pp(unsigned int i, const poly pPoly, const ring rRing)
+static inline poly sca_xi_Mult_pp(short i, const poly pPoly, const ring rRing)
 {
   assume( rIsSCA(rRing) );
@@ -1213 +1213 @@
 
 // return x_i * pPoly; preserve pPoly.
-poly sca_pp_Mult_xi_pp(unsigned int i, const poly pPoly, const ring rRing)
+poly sca_pp_Mult_xi_pp(short i, const poly pPoly, const ring rRing)
 {
   assume(1 <= i);
-  assume(i <= (unsigned int)rRing->N);
+  assume(i <= rVar(rRing));
 
   if(rIsSCA(rRing))
@@ -1450 +1450 @@
 // either create a copy of m or return NULL
 static inline poly m_KillSquares(const poly m,
-  const unsigned int iFirstAltVar, const unsigned int iLastAltVar,
+  const short iFirstAltVar, const short iLastAltVar,
   const ring r)
 {
 #ifdef PDEBUG
   p_Test(m, r);
-  assume( (iFirstAltVar >= 1) && (iLastAltVar <= r->N) && (iFirstAltVar <= iLastAltVar) );
+  assume( (iFirstAltVar >= 1) && (iLastAltVar <= rVar(r)) && (iFirstAltVar <= iLastAltVar) );
 
 #if 0
@@ -1465 +1465 @@
   assume( m != NULL );
 
-  for(unsigned int k = iFirstAltVar; k <= iLastAltVar; k++)
+  for(short k = iFirstAltVar; k <= iLastAltVar; k++)
     if( p_GetExp(m, k, r) > 1 )
       return NULL;
@@ -1476 +1476 @@
 // returns a new poly!
 poly p_KillSquares(const poly p,
-  const unsigned int iFirstAltVar, const unsigned int iLastAltVar,
+  const short iFirstAltVar, const short iLastAltVar,
   const ring r)
 {
@@ -1531 +1531 @@
 // returns the reduced ideal or zero ideal.
 ideal id_KillSquares(const ideal id,
-  const unsigned int iFirstAltVar, const unsigned int iLastAltVar,
+  const short iFirstAltVar, const short iLastAltVar,
   const ring r, const bool bSkipZeroes)
 {
   if (id == NULL) return id; // zero ideal
 
-  assume( (iFirstAltVar >= 1) && (iLastAltVar <= r->N) && (iFirstAltVar <= iLastAltVar) );
+  assume( (iFirstAltVar >= 1) && (iLastAltVar <= rVar(r)) && (iFirstAltVar <= iLastAltVar) );
 
   const int iSize = IDELEMS(id);
@@ -1548 +1548 @@
   {
     PrintS("ideal id: \n");
-    for (int i = 0; i < IDELEMS(id); i++)
+    for (unsigned int i = 0; i < IDELEMS(id); i++)
     {
       Print("; id[%d] = ", i+1);

libpolys/polys/nc/sca.h

@@ -16 +16 @@
 
 
-static inline unsigned int scaFirstAltVar(ring r)
+static inline short scaFirstAltVar(ring r)
 {
   assume(rIsSCA(r));
@@ -23 +23 @@
 }
 
-static inline unsigned int scaLastAltVar(ring r)
+static inline short scaLastAltVar(ring r)
 {
   assume(rIsSCA(r));
@@ -32 +32 @@
 
 // The following inlines are just helpers for setup functions.
-static inline void scaFirstAltVar(ring r, int n)
+static inline void scaFirstAltVar(ring r, short n)
 {
   assume(rIsSCA(r));
@@ -39 +39 @@
 }
 
-static inline void scaLastAltVar(ring r, int n)
+static inline void scaLastAltVar(ring r, short n)
 {
   assume(rIsSCA(r));
@@ -54 +54 @@
 // this is not a basic operation... but it for efficiency we did it specially for SCA:
 // return x_i * pPoly; preserve pPoly.
-poly sca_pp_Mult_xi_pp(unsigned int i, const poly pPoly, const ring rRing);
+poly sca_pp_Mult_xi_pp(short i, const poly pPoly, const ring rRing);
 
 //////////////////////////////////////////////////////////////////////////////////////
@@ -134 +134 @@
 // reduce polynomial p modulo <y_i^2> , i = iFirstAltVar .. iLastAltVar
 poly p_KillSquares(const poly p,
-  const unsigned int iFirstAltVar, const unsigned int iLastAltVar,
+  const short iFirstAltVar, const short iLastAltVar,
   const ring r);
 
@@ -143 +143 @@
 // default - no skipping!
 ideal id_KillSquares(const ideal id,
-  const unsigned int iFirstAltVar, const unsigned int iLastAltVar,
+  const short iFirstAltVar, const short iLastAltVar,
   const ring r, const bool bSkipZeroes = false);