Changeset 441 for branches/thune/thread_safe/math.c

Timestamp:

08/05/07 00:26:15 (16 months ago)

Author:

krobillard

Message:

random handles coord!

Files:

• branches/thune/thread_safe/math.c (modified) (1 diff)

branches/thune/thread_safe/math.c

@@ -653 +653 @@
 UR_CALL( uc_random )
 {
-    if( ur_is(tos, UT_DECIMAL) )
-    {
-        ur_decimal(tos) *= genrand_real2();
-    }
-    else if( ur_is(tos, UT_INT) )
-    {
-        if( ur_int(tos) > 0 )
-            ur_int(tos) = (genrand_int32() % ur_int(tos)) + 1;
-    }
-    else if( ur_isASeries( tos ) )
+    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;
-    }
+        return;
+    }
+
+    switch( ur_type(tos) )
+    {
+        case UT_DECIMAL:
+            ur_decimal(tos) *= genrand_real2();
+            break;
+
+        case UT_INT:
+            if( ur_int(tos) > 0 )
+                ur_int(tos) = (genrand_int32() % ur_int(tos)) + 1;
+            break;
+
+        case UT_LOGIC:
+            ur_logic(tos) = genrand_int32() & 1;
+            break;
+
 #ifdef UR_CONFIG_MATH3D
-    else if( ur_is(tos, UT_VEC3) )
-    {
-        tos->vec3.xyz[0] *= genrand_real2();
-        tos->vec3.xyz[1] *= genrand_real2();
-        tos->vec3.xyz[2] *= genrand_real2();
-    }
+        case UT_VEC3:
+            tos->vec3.xyz[0] *= genrand_real2();
+            tos->vec3.xyz[1] *= genrand_real2();
+            tos->vec3.xyz[2] *= genrand_real2();
+            break;
 #endif
-    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) ) );
+        case UT_COORD:
+        {
+            int i, n;
+            for( i = 0; i < tos->coord.len; ++i )
+            {
+                n = tos->coord.elem[i];
+                if( n > 0 )
+                    tos->coord.elem[i] = (genrand_int32() % n) + 1;
+            }
+        }
+            break;
+
+        case UT_WORD:
+        case UT_LITWORD:
+        {
+            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 );
+        }
+            break;
+
+        default:
+            ur_throwErr( UR_ERR_DATATYPE, "random does not handle %s",
+                         ur_typeName( ur_type(tos) ) );
+            break;
     }
 }