Changeset d4932a in git

Timestamp:

Jun 25, 2010, 4:25:41 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

cedebce21b0dc12678683874874cce5b35d8c23d

Parents:

9919421a652e331106b0f71cb3996f006942bc13

Message:

fix log(int) -> ilog2

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

Location:

factory

Files:

• canonicalform.cc (modified) (1 diff)
• cf_util.cc (modified) (2 diffs)
• cf_util.h (modified) (1 diff)
• fac_sqrfree.cc (modified) (5 diffs)

factory/canonicalform.cc

@@ -1204 +1204 @@
 CanonicalForm::ilog2 () const
 {
-    if ( is_imm( value ) ) {
+    if ( is_imm( value ) )
+    {
         ASSERT( is_imm( value ) == INTMARK, "ilog2() not implemented" );
         int a = imm2int( value );
         ASSERT( a > 0, "arg to ilog2() less or equal zero" );
-        int n = -1;
-        while ( a != 0 ) {
-            n++;
-            a /= 2;
-        }
-        return n;
+        return ::ilog2(a);
     }
     else

factory/cf_util.cc

@@ -21 +21 @@
 //
 //}}}
-int
-ipower ( int b, int m )
+int ipower ( int b, int m )
 {
     int prod = 1;
@@ -28 +27 @@
     while ( m != 0 )
     {
-        if ( m % 2 != 0 )
-            prod *= b;
-        m /= 2;
-        if ( m != 0 )
-            b *= b;
+        if ( m % 2 != 0 )
+            prod *= b;
+        m /= 2;
+        if ( m != 0 )
+            b *= b;
     }
     return prod;
 }
 //}}}
+
+int ilog2 (int a)
+{
+  int n = -1;
+  while ( a != 0 )
+  {
+    n++;
+    a /=2;
+  }
+  return n;
+}

factory/cf_util.h

@@ -14 +14 @@
 
 int ipower ( int b, int n );
+int ilog2 (int a);
+
 
 #endif /* ! INCL_CF_UTIL_H */

factory/fac_sqrfree.cc

@@ -34 +34 @@
     // join elements with the same degree
     while ( I.hasItem() ) {
-        f = I.getItem().factor();
-        exp = I.getItem().exp();
-        I++;
-        while ( I.hasItem() && I.getItem().exp() == exp ) {
-            f *= I.getItem().factor();
-            I++;
-        }
-        result.append( CFFactor( f, exp ) );
+        f = I.getItem().factor();
+        exp = I.getItem().exp();
+        I++;
+        while ( I.hasItem() && I.getItem().exp() == exp ) {
+            f *= I.getItem().factor();
+            I++;
+        }
+        result.append( CFFactor( f, exp ) );
     }
 
@@ -57 +57 @@
 
     if ( ! leadcf.isOne() )
-        t0 /= leadcf;
+        t0 /= leadcf;
 
     divexp = p;
     while ( t0.degree(x) > 0 )
     {
-        t = gcd( t0, t0.deriv() );
-        v = t0 / t;
-        k = 0;
-        while ( v.degree(x) > 0 )
+        t = gcd( t0, t0.deriv() );
+        v = t0 / t;
+        k = 0;
+        while ( v.degree(x) > 0 )
         {
-            k = k+1;
-            if ( k % p == 0 )
+            k = k+1;
+            if ( k % p == 0 )
             {
-                t /= v;
-                k = k+1;
-            }
-            w = gcd( t, v );
-            h = v / w;
-            v = w;
-            t /= v;
-            if ( h.degree(x) > 0 )
-                F.append( CFFactor( h/h.lc(), e*k ) );
-        }
-        t0 = apply( t, divexpfunc );
-        e = p * e;
+                t /= v;
+                k = k+1;
+            }
+            w = gcd( t, v );
+            h = v / w;
+            v = w;
+            t /= v;
+            if ( h.degree(x) > 0 )
+                F.append( CFFactor( h/h.lc(), e*k ) );
+        }
+        t0 = apply( t, divexpfunc );
+        e = p * e;
     }
     if ( ! leadcf.isOne() )
     {
-        if ( !F.isEmpty() && (F.getFirst().exp() == 1) )
+        if ( !F.isEmpty() && (F.getFirst().exp() == 1) )
         {
-            leadcf = F.getFirst().factor() * leadcf;
-            F.removeFirst();
-        }
-        F.insert( CFFactor( leadcf, 1 ) );
+            leadcf = F.getFirst().factor() * leadcf;
+            F.removeFirst();
+        }
+        F.insert( CFFactor( leadcf, 1 ) );
     }
     return F;
@@ -117 +117 @@
     while ( ! c.degree() == 0 )
     {
-        y = gcd( w, c ); z = w / y;
-        if ( degree( z ) > 0 )
-            if ( lc( z ).sign() < 0 )
-                F.append( CFFactor( -z, i ) );
-            else
-                F.append( CFFactor( z, i ) );
-        i++;
-        w = y; c = c / y;
+        y = gcd( w, c ); z = w / y;
+        if ( degree( z ) > 0 )
+            if ( lc( z ).sign() < 0 )
+                F.append( CFFactor( -z, i ) );
+            else
+                F.append( CFFactor( z, i ) );
+        i++;
+        w = y; c = c / y;
     }
     if ( degree( w ) > 0 )
-        if ( lc( w ).sign() < 0 )
-            F.append( CFFactor( -w, i ) );
-        else
-            F.append( CFFactor( w, i ) );
+        if ( lc( w ).sign() < 0 )
+            F.append( CFFactor( -w, i ) );
+        else
+            F.append( CFFactor( w, i ) );
     return F;
 }
@@ -138 +138 @@
 {
     if ( a.inCoeffDomain() )
-        return CFFactor( a, 1 );
+        return CFFactor( a, 1 );
     CanonicalForm cont = content( a );
     CanonicalForm aa = a / cont;
@@ -148 +148 @@
     while ( ! c.degree(v) == 0 )
     {
-        y = gcd( w, c ); z = w / y;
-        if ( degree( z, v ) > 0 )
-            if ( lc( z ).sign() < 0 )
-                F.append( CFFactor( -z, i ) );
-            else
-                F.append( CFFactor( z, i ) );
-        i++;
-        w = y; c = c / y;
+        y = gcd( w, c ); z = w / y;
+        if ( degree( z, v ) > 0 )
+            if ( lc( z ).sign() < 0 )
+                F.append( CFFactor( -z, i ) );
+            else
+                F.append( CFFactor( z, i ) );
+        i++;
+        w = y; c = c / y;
     }
     if ( degree( w,v ) > 0 )
-        if ( lc( w ).sign() < 0 )
-            F.append( CFFactor( -w, i ) );
-        else
-            F.append( CFFactor( w, i ) );
+        if ( lc( w ).sign() < 0 )
+            F.append( CFFactor( -w, i ) );
+        else
+            F.append( CFFactor( w, i ) );
     if ( ! cont.isOne() )
-        F = Union( F, sqrFreeZ( cont ) );
+        F = Union( F, sqrFreeZ( cont ) );
     if ( lc( a ).sign() < 0 )
     {
-        if ( F.getFirst().exp() == 1 )
+        if ( F.getFirst().exp() == 1 )
         {
-            CanonicalForm f = F.getFirst().factor();
-            CFFListIterator(F).getItem() = CFFactor( -f, 1 );
-        }
-        else
-            F.insert( CFFactor( -1, 1 ) );
+            CanonicalForm f = F.getFirst().factor();
+            CFFListIterator(F).getItem() = CFFactor( -f, 1 );
+        }
+        else
+            F.insert( CFFactor( -1, 1 ) );
     }
     return F;