Cleaned up some naming.0.01

iOrd is now iScale (places to the right of the decimal.  And iOrder is
now iIdx, since it was just an index.

2 files changed, 19 insertions, 19 deletions

diff --git a/src/number.cpp b/src/number.cpp
index b045e7c..5ef8009 100644
--- a/src/number.cpp
+++ b/src/number.cpp
@@ -5,17 +5,17 @@
 

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

 

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

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

     iRadix( iRadix ),

-    iOrd( iOrd ),

+    iScale( iScale ),

     bPositive( true ),

     aInt( RadixToBits(iRadix) )

 {

 }

 

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

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

     iRadix( iRadix ),

-    iOrd( iOrd ),

+    iScale( iScale ),

     bPositive( true ),

     aInt( RadixToBits( iRadix ) )

 {

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

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

 {

-    Number ret( iRadix, iOrd );

+    Number ret( iRadix, iScale );

 

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

 

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

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

 {

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

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

     divide( rhs, q, r );

     return q;

 }

 

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

 {

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

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

     divide( rhs, q, r );

     return r;

 }

@@ -116,7 +116,7 @@ Number Number::operator-() const
 bool Number::operator==( const Number &rhs ) const

 {

     if( rhs.bPositive != bPositive ||

-        rhs.iOrd != iOrd || 

+        rhs.iScale != iScale || 

         rhs.aInt.getSize() != aInt.getSize() )

         return false;

 

@@ -258,7 +258,7 @@ void Number::set( const Number &sNum )
 {

     aInt.set( sNum.aInt );

     bPositive = sNum.bPositive;

-    iOrd = sNum.iOrd;

+    iScale = sNum.iScale;

 }

 

 Bu::String Number::toString() const

@@ -280,16 +280,16 @@ Bu::String Number::toString() const
     return sRet;

 }

 

-int Number::digit( int iOrder ) const

+int Number::digit( int iIdx ) const

 {

-    if( iOrder >= aInt.getSize() )

+    if( iIdx >= aInt.getSize() )

         return 0;

-    return aInt[iOrder];

+    return aInt[iIdx];

 }

 

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

 {

-    Number ret( iRadix, iOrd );

+    Number ret( iRadix, iScale );

 

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

 

@@ -386,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( iRadix, iOrd );

+        Number sub( iRadix, iScale );

         for(;;)

         {

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

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

         }

 

-        Number x( iRadix, iOrd );

+        Number x( iRadix, iScale );

         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 cdae1df..deac5eb 100644
--- a/src/number.h
+++ b/src/number.h
@@ -7,8 +7,8 @@
 class Number

 {

 public:

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

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

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

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

     virtual ~Number();

 

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

@@ -40,14 +40,14 @@ public:
 

     Bu::String toString() const;

 

-    int digit( int iOrder ) const;

+    int digit( int iIdx ) const;

 

 private:

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

 

 private:

     int iRadix;

-    int iOrd;

+    int iScale;

     bool bPositive;

     PackedIntArray aInt;

 };