Full support for arbitrary radixes is in place.

It computes the radix and bitwidth dynamically, we could probably speed
that up another step by simply having a table of common ones, but for
now it'll work for anything.

1 files changed, 103 insertions, 1 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;

 }