Changeset 63d199 in git

Timestamp:

Jul 6, 2015, 1:30:39 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

3d2cb9e83ceb74b520ab757ffac6abe4eed415f9

Parents:

ddc1937b20b15407322fe606d93ad53240f5b367

Message:

cleanup p_GetShortExpVector

File:

• libpolys/polys/monomials/p_polys.cc (modified) (6 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -4531 +4531 @@
 {
   assume(p != NULL);
-  if (p == NULL) return 0;
   unsigned long ev = 0; // short exponent vector
   unsigned int n = BIT_SIZEOF_LONG / r->N; // number of bits per exp
   unsigned int m1; // highest bit which is filled with (n+1)
-  unsigned int i = 0, j=1;
+  int i=0,j=1;
 
   if (n == 0)
@@ -4546 +4545 @@
     else
     {
-      for (; j<=(unsigned long) r->N; j++)
+      for (; j<=r->N; j++)
       {
         if (p_GetExp(p,j,r) > 0) i++;
@@ -4552 +4551 @@
       }
       if (i>0)
-        ev = ~((unsigned long)0) >> ((unsigned long) (BIT_SIZEOF_LONG - i));
+        ev = ~(0UL) >> (BIT_SIZEOF_LONG - i);
       return ev;
     }
@@ -4580 +4579 @@
 
 
+///  p_GetShortExpVector of p * pp
 unsigned long p_GetShortExpVector(const poly p, const poly pp, const ring r)
 {
   assume(p != NULL);
   assume(pp != NULL);
-  if (p == NULL || pp == NULL) return 0;
 
   unsigned long ev = 0; // short exponent vector
   unsigned int n = BIT_SIZEOF_LONG / r->N; // number of bits per exp
   unsigned int m1; // highest bit which is filled with (n+1)
-  unsigned int i = 0, j=1;
+  int j=1;
+  unsigned long i = 0L;
 
   if (n == 0)
@@ -4600 +4600 @@
     else
     {
-      for (; j<=(unsigned long) r->N; j++)
+      for (; j<=r->N; j++)
       {
         if (p_GetExp(p,j,r) > 0 || p_GetExp(pp,j,r) > 0) i++;
@@ -4606 +4606 @@
       }
       if (i>0)
-        ev = ~((unsigned long)0) >> ((unsigned long) (BIT_SIZEOF_LONG - i));
+        ev = ~(0UL) >> (BIT_SIZEOF_LONG - i);
       return ev;
     }