Changeset 248 for trunk/thune/math.c

Timestamp:

08/11/06 16:12:18 (2 years ago)

Author:

krobillard

Message:

Thune - Added 'random.

Files:

• trunk/thune/math.c (modified) (4 diffs)

trunk/thune/math.c

@@ -23 +23 @@
 #include "internal.h"
 
-
-/*
-extern int  orSeriesUsed( OValue* );
-extern void ur_throwErrOp( const char* name, OValue* );
-
-extern void   init_genrand(unsigned long s);
-extern long   genrand_int32();
+#include <time.h>
+extern void init_genrand(unsigned long s);
+extern unsigned long genrand_int32();
 extern double genrand_real2();
-*/
 
 
@@ -360 +355 @@
 
 
+static unsigned long _clockSeed()
+{
+    unsigned long seed;
+    seed  = time(NULL);
+    seed += clock();
+    return seed;
+}
+
+
+/*
+   (max -- n)
+   (n 'seed -- )
+*/
+UR_CALL( uc_random )
+{
+    if( ur_is(tos, UT_DECIMAL) )
+    {
+        ur_decimal(tos) *= genrand_real2();
+    }
+    else if( ur_is(tos, UT_INT) )
+    {
+        ur_int(tos) = (genrand_int32() % ur_int(tos)) + 1;
+    }
+    else if( ur_isASeries( tos ) )
+    {
+        int len = ur_seriesLen( tos );
+        if( len < 0 )
+            goto bad_type;
+        if( len > 0 )
+            tos->series.it += genrand_int32() % (len - tos->series.it);
+    }
+    else if( ur_is(tos, UT_LOGIC) )
+    {
+        ur_logic(tos) = genrand_int32() & 1;
+    }
+    else if( ur_isAWord(tos) )
+    {
+        unsigned long seed;
+
+        tos = ur_s_prev(tos);
+
+        if( ur_is(tos, UT_INT) && ur_int(tos) )
+            seed = ur_int(tos);
+        else
+            seed = _clockSeed();
+        init_genrand( seed );
+
+        UR_S_DROPN( 2 );
+    }
+    else
+    {
+bad_type:
+        ur_throwErr( UR_ERR_DATATYPE, "random does not handle %s",
+                     ur_typeName( ur_type(tos) ) );
+    }
+}
+
+
 #if 0
-#define REF_RAND_SEED       a1+1
-#define REF_RAND_ONLY       a1+2
-
-/* NOTE: random does not follow REBOL behavior. */
-UR_CALL( orRandomNative )
-{
-    if( orRefineSet(REF_RAND_SEED) )
-    {
-        unsigned long seed;
-        if( ur_int(a1) )
-            seed = ur_int(a1);
-        else
-            seed = randomSeed();
-        init_genrand( seed );
-    }
-    else
-    {
-        if( orIsSeries( orType(a1) ) )
-        {
-            if( orRefineSet(REF_RAND_ONLY) )
-            {
-                ur_throwErr( "random/only not yet implemented " );
-                return;
-            }
-            else
-            {
-                unsigned long rn;
-                int used;
-
-                used = orSeriesUsed( a1 );
-                if( used > -1 )
-                {
-                    rn = genrand_int32();
-                    used -= a1->series.it;
-                    a1->series.it += rn % used;
-                    return;
-                }
-            }
-        }
-        else if( orIs(a1, UT_DECIMAL) )
-        {
-            ur_decimal(a1) *= genrand_real2();
-            return;
-        }
-        else if( orIs(a1, UT_INT) )
-        {
-            unsigned long rn = genrand_int32();
-            ur_int(a1) = (rn % ur_int(a1)) + 1;
-            return;
-        }
-        else if( orIs(a1, UT_LOGIC) )
-        {
-            ur_int(a1) = genrand_int32() & 1;
-            return;
-        }
-        /*
-        else if( a1->type == UT_TUPLE )
-        {
-        }
-        */
-    }
-    ur_throwErr( "random does not handle %s", orDatatypeName(a1->type) );
-}
-
-
 static void orOpPower( OValue* a )
 {
@@ -655 +643 @@
     { uc_arctangent,   "arctan" },
     { uc_squareRoot,   "sqrt" },
+    { uc_random,       "random" },
 /* 
-    { uc_random,       "random" },
     { uc_power,        "**" },
     { uc_remainder,    "remainder" },
@@ -682 +670 @@
     ur_initType( val, UT_DECIMAL );
     ur_decimal(val) = PI;
-
-    init_genrand( randomSeed() );
 #endif
 
+    init_genrand( _clockSeed() );
+
     ur_makeCalls( env, _mathCalls, sizeof(_mathCalls) / sizeof(UCallDef) );
 }