Changeset 54 for trunk/orca/math.c

Timestamp:

02/17/06 15:30:01 (3 years ago)

Author:

krobillard

Message:

Now using orDecimal() & orInt() where appropriate.

Files:

• trunk/orca/math.c (modified) (14 diffs)

trunk/orca/math.c

@@ -42 +42 @@
     double n; \
     if( a1->type == OT_DECIMAL ) { \
-        n = a1->num.decimal; \
+        n = orDecimal(a1); \
     } else { \
-        n = (double) a1->integer; \
+        n = (double) orInt(a1); \
         orSetTF( a1, OT_DECIMAL ); \
     } \
     if( orRefineSet(REF_RADIANS) ) \
-        a1->num.decimal = func( n ); \
+        orDecimal(a1) = func( n ); \
     else \
-        a1->num.decimal = func( DEG_TO_RAD * n );
+        orDecimal(a1) = func( DEG_TO_RAD * n );
 
 
@@ -94 +94 @@
     if( a1->type == OT_DECIMAL )
     {
-        n = a1->num.decimal;
+        n = orDecimal(a1);
     }
     else
     {
-        n = (double) a1->integer;
+        n = (double) orInt(a1);
         orSetTF( a1, OT_DECIMAL );
     }
-    a1->num.decimal = mathSqrt( n );
+    orDecimal(a1) = mathSqrt( n );
 }
 
@@ -114 +114 @@
     {
         unsigned long seed;
-        if( a1->integer )
-            seed = a1->integer;
+        if( orInt(a1) )
+            seed = orInt(a1);
         else
             seed = randomSeed();
@@ -122 +122 @@
     else
     {
-        if( orIsSeries(a1->type) )
+        if( orIsSeries( orType(a1) ) )
         {
             if( orRefineSet(REF_RAND_ONLY) )
@@ -144 +144 @@
             }
         }
-        else if( a1->type == OT_DECIMAL )
-        {
-            a1->num.decimal *= genrand_real2();
+        else if( orIs(a1, OT_DECIMAL) )
+        {
+            orDecimal(a1) *= genrand_real2();
             return;
         }
-        else if( a1->type == OT_INTEGER )
+        else if( orIs(a1, OT_INTEGER) )
         {
             unsigned long rn = genrand_int32();
-            a1->integer = (rn % a1->integer) + 1;
+            orInt(a1) = (rn % orInt(a1)) + 1;
             return;
         }
-        else if( a1->type == OT_LOGIC )
-        {
-            a1->integer = genrand_int32() & 1;
+        else if( orIs(a1, OT_LOGIC) )
+        {
+            orInt(a1) = genrand_int32() & 1;
             return;
         }
@@ -179 +179 @@
         {
             int sum;
-            int n = b->integer;
+            int n = orInt(b);
             if( n )
             {
-                sum = a->integer;
+                sum = orInt(a);
                 while( --n )
-                    sum *= a->integer;
+                    sum *= orInt(a);
             }
             else
@@ -195 +195 @@
         else if( b->type == OT_DECIMAL )
         {
-            x = (double) a->integer;
-            y = b->num.decimal;
+            x = (double) orInt(a);
+            y = orDecimal(b);
             goto fp;
         }
@@ -203 +203 @@
     else if( a->type == OT_DECIMAL )
     {
-        x = a->num.decimal;
+        x = orDecimal(a);
         if( b->type == OT_INTEGER )
         {
-            y = (double) b->integer;
+            y = (double) orInt(b);
             goto fp;
         }
         else if( b->type == OT_DECIMAL )
         {
-            y = b->num.decimal;
+            y = orDecimal(b);
             goto fp;
         }
@@ -232 +232 @@
         if( b->type == OT_INTEGER )
         {
-            orResult( OT_INTEGER, a->integer % b->integer );
+            orResult( OT_INTEGER, orInt(a) % orInt(b) );
             return;
         }
         else if( b->type == OT_DECIMAL )
         {
-            x = (double) a->integer;
-            y = b->num.decimal;
+            x = (double) orInt(a);
+            y = orDecimal(b);
             goto fp;
         }
@@ -245 +245 @@
     else if( a->type == OT_DECIMAL )
     {
-        x = a->num.decimal;
+        x = orDecimal(a);
         if( b->type == OT_INTEGER )
         {
-            y = (double) b->integer;
+            y = (double) orInt(b);
             goto fp;
         }
         else if( b->type == OT_DECIMAL )
         {
-            y = b->num.decimal;
+            y = orDecimal(b);
             goto fp;
         }
@@ -271 +271 @@
     {
         case OT_LOGIC:
-            a1->integer ^= 1;
+            orInt(a1) ^= 1;
             break;
 
         case OT_INTEGER:
-            a1->integer = ~a1->integer;
+            orInt(a1) = ~orInt(a1);
             break;
 
@@ -300 +300 @@
     {
         case OT_INTEGER:
-            if( a1->integer < 0 )
-                a1->integer = -a1->integer;
+            if( orInt(a1) < 0 )
+                orInt(a1) = -orInt(a1);
             break;
 
         case OT_DECIMAL:
-            if( a1->num.decimal < 0.0 )
-                a1->num.decimal = -a1->num.decimal;
+            if( orDecimal(a1) < 0.0 )
+                orDecimal(a1) = -orDecimal(a1);
             break;
 
@@ -328 +328 @@
     {
         case OT_INTEGER:
-            a1->integer = -a1->integer;
+            orInt(a1) = -orInt(a1);
             break;
 
         case OT_DECIMAL:
-            a1->num.decimal = -a1->num.decimal;
+            orDecimal(a1) = -orDecimal(a1);
             break;
 
@@ -373 +373 @@
     val = orIntern( &ctx, "pi", 2, 0 );
     orSetTF( val, OT_DECIMAL );
-    val->num.decimal = PI;
+    orDecimal(val) = PI;
 
     init_genrand( randomSeed() );