3 files changed, 141 insertions, 19 deletions

diff --git a/src/main.cpp b/src/main.cpp
index d436a20..6674075 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,7 @@
 #include "number.h"

 #include "packedintarray.h"

+#include <math.h>

+#include <sys/time.h>

 

 #include <bu/sio.h>

 using namespace Bu;

@@ -177,6 +179,18 @@ void numbertest1()
         arg( a.toString() ).

         arg( b.toString() ).

         arg( (a % b).toString() );

+    

+    a = "983429807324875233421784598754987439873472349875329853298732";

+    b = "18446744073709551615";

+

+    println("%1 / %2 = %3").

+        arg( a.toString() ).

+        arg( b.toString() ).

+        arg( (a / b).toString() );

+    println("%1 %% %2 = %3").

+        arg( a.toString() ).

+        arg( b.toString() ).

+        arg( (a % b).toString() );

 }

 

 #define compcheck( anum, op, bnum ) \

@@ -245,13 +259,101 @@ void numbertestcomp()
     compcheck( 123, <=, -122 );

 }

 

+int getHob( int x )

+{

+    for( int j = 31; j >= 0; j-- )

+    {

+        if( x&(1<<j) )

+        {

+            return j+1;

+        }

+    }

+    return 0;

+}

+

+int getOrd( int x )

+{

+    return (int)(log(x)*0xb.8aa3b295c17fp-3+1.0);

+}

+

+double getTime()

+{

+    timeval t;

+    gettimeofday( &t, NULL );

+    return (double)t.tv_sec + (double)(t.tv_usec*.000001);

+}

+

+void ordertest()

+{

+    for( int j = 2; j < 64; j++ )

+    {

+        if( getOrd( j ) != getHob(j-1) )

+            println("Failure on radix %1").arg( j );

+    }

+

+    double dStart, dEnd;

+

+    dStart = getTime();

+    for( int k = 0; k < 100000; k++ )

+    {

+        for( int j = 2; j < 32; j++ )

+        {

+            getOrd( j );

+        }

+    }

+    dEnd = getTime();

+

+    println("getOrd: %1 in %2 (%3 cps)").arg( 30*100000 ).arg( dEnd-dStart ).

+        arg( (30*100000)/(dEnd-dStart) );

+    

+    dStart = getTime();

+    for( int k = 0; k < 100000; k++ )

+    {

+        for( int j = 2; j < 32; j++ )

+        {

+            getHob( j-1 );

+        }

+    }

+    dEnd = getTime();

+

+    println("getHob: %1 in %2 (%3 cps)").arg( 30*100000 ).arg( dEnd-dStart ).

+        arg( (30*100000)/(dEnd-dStart) );

+}

+

+void radixtest()

+{

+    Number a( 16 ), b( 16 );

+

+    a = "f8a72bce3";

+    b = "9ea8cb3";

+    println("%1 + %2 = %3").

+        arg( a.toString() ).

+        arg( b.toString() ).

+        arg( (a + b).toString() );

+    println("%1 - %2 = %3").

+        arg( a.toString() ).

+        arg( b.toString() ).

+        arg( (a - b).toString() );

+    println("%1 / %2 = %3").

+        arg( a.toString() ).

+        arg( b.toString() ).

+        arg( (a / b).toString() );

+    println("%1 * %2 = %3").

+        arg( a.toString() ).

+        arg( b.toString() ).

+        arg( (a * b).toString() );

+}

+

 int main( int , char *[] )

 {

     println("CliC");

 

 //    packedtest1();

-    numbertest1();

+//    numbertest1();

 //    numbertestcomp();

+    radixtest();

+

+//    ordertest();

 

     return 0;

 }

diff --git a/src/number.cpp b/src/number.cpp
index b3a33dc..12a86e0 100644
--- a/src/number.cpp
+++ b/src/number.cpp
@@ -1,20 +1,23 @@
 #include "number.h"

 

 #include <bu/sio.h>

+#include <math.h>

 

-#define iRadix  (10)

+#define RadixToBits( x ) ((int)(log((x))*0xb.8aa3b295c17fp-3+1.0))

 

-Number::Number( int iOrd ) : 

+Number::Number( int iRadix, int iOrd ) :

+    iRadix( iRadix ),

     iOrd( iOrd ),

     bPositive( true ),

-    aInt( 4 )

+    aInt( RadixToBits(iRadix) )

 {

 }

 

-Number::Number( const Bu::String &sData, int iOrd ) :

+Number::Number( const Bu::String &sData, int iRadix, int iOrd ) :

+    iRadix( iRadix ),

     iOrd( iOrd ),

     bPositive( true ),

-    aInt( 4 )

+    aInt( RadixToBits( iRadix ) )

 {

     set( sData );

 }

@@ -47,7 +50,7 @@ Number Number::operator-( const Number &rhs ) const
 

 Number Number::operator*( const Number &rhs ) const

 {

-    Number ret( iOrd );

+    Number ret( iRadix, iOrd );

 

     int iCnt = aInt.getSize()+rhs.aInt.getSize();

 

@@ -91,14 +94,14 @@ Number Number::operator*( const Number &rhs ) const
 

 Number Number::operator/( const Number &rhs ) const

 {

-    Number q( iOrd ), r( iOrd );

+    Number q( iRadix, iOrd ), r( iRadix, iOrd );

     divide( rhs, q, r );

     return q;

 }

 

 Number Number::operator%( const Number &rhs ) const

 {

-    Number q( iOrd ), r( iOrd );

+    Number q( iRadix, iOrd ), r( iRadix, iOrd );

     divide( rhs, q, r );

     return r;

 }

@@ -244,7 +247,10 @@ void Number::set( const Bu::String &sNum )
             bPositive = false;

             break;

         }

-        aInt.append( sNum[j]-'0' );

+        if( sNum[j] >= '0' && sNum[j] <= '9' )

+            aInt.append( sNum[j]-'0' );

+        else

+            aInt.append( sNum[j]-'a'+10 );

     }

 }

 

@@ -259,7 +265,19 @@ Bu::String Number::toString() const
 {

     if( aInt.getSize() == 0 )

         return "0";

-    return (bPositive?"":"-") + aInt.toString();

+    Bu::String sRet;

+    if( !bPositive )

+        sRet += '-';

+    for( int j = aInt.getSize()-1; j >= 0; j-- )

+    {

+        int x = aInt.get( j );

+        if( x >= 10 )

+            sRet += x-10+'a';

+        else

+            sRet += x+'0';

+    }

+    

+    return sRet;

 }

 

 int Number::digit( int iOrder ) const

@@ -271,7 +289,7 @@ int Number::digit( int iOrder ) const
 

 Number Number::add( const Number &rhs, bool bSub ) const

 {

-    Number ret( iOrd );

+    Number ret( iRadix, iOrd );

 

     int iPlaces = Bu::buMax(rhs.aInt.getSize(), aInt.getSize() );

 

@@ -309,9 +327,10 @@ Number Number::add( const Number &rhs, bool bSub ) const
 //        Bu::println("--method b--");

         ret.bPositive = bPositive;

         int iRes;

+        int iComp = (iRadix-1);

         for( int j = 0; j < iPlaces; j++ )

         {

-            iRes = digit( j ) + (9-rhs.digit( j )) + iCarry;

+            iRes = digit( j ) + (iComp-rhs.digit( j )) + iCarry;

 //            Bu::println(" Place: %1 + %2 + (%3) = %4").

 //                arg( digit(j) ).arg( 9-rhs.digit( j ) ).arg( iCarry )

 //                .arg( iRes );

@@ -332,10 +351,10 @@ Number Number::add( const Number &rhs, bool bSub ) const
         if( iCarry == 0 )

         {

             ret.bPositive = false;

-            ret.aInt.set( 0, 9-ret.aInt.get( 0 )+1);

+            ret.aInt.set( 0, iComp-ret.aInt.get( 0 )+1);

             for( int j = 1; j < ret.aInt.getSize(); j++ )

             {

-                ret.aInt.set( j, 9-ret.aInt.get( j ));

+                ret.aInt.set( j, iComp-ret.aInt.get( j ));

             }

         }

         else

@@ -367,7 +386,7 @@ void Number::divide( const Number &rhs, Number &q, Number &r ) const
     do

     {

 //        Bu::println("%1\n-----").arg( r.aInt.toString() );

-        Number sub( iOrd );

+        Number sub( iRadix, iOrd );

         for(;;)

         {

 //            Bu::println("  -> Anchor: %1, Sample: %2").arg( iAnchor ).arg( iSample );

@@ -387,7 +406,7 @@ void Number::divide( const Number &rhs, Number &q, Number &r ) const
                 break;

         }

 

-        Number x( iOrd );

+        Number x( iRadix, iOrd );

         int iRes = 0;

         for( ; x <= sub; iRes++, x = x + rhs ) { }

         x = sub - (x - rhs);

diff --git a/src/number.h b/src/number.h
index ee000a8..8d98a1b 100644
--- a/src/number.h
+++ b/src/number.h
@@ -7,8 +7,8 @@
 class Number

 {

 public:

-    Number( int iOrd=0 );

-    Number( const Bu::String &sData, int iOrd=0 );

+    Number( int iRadix=10, int iOrd=0 );

+    Number( const Bu::String &sData, int iRadix=10, int iOrd=0 );

     virtual ~Number();

 

     Number &operator=( const Bu::String &sNum );

@@ -46,6 +46,7 @@ private:
     Number add( const Number &rhs, bool bSub ) const;

 

 private:

+    int iRadix;

     int iOrd;

     bool bPositive;

     PackedIntArray aInt;