Changeset 1612 for trunk

Timestamp:

Nov 9, 2009, 3:47:42 PM (15 years ago)

Author:

dkearney

Message:

updated to handle phases and choices. changed up random number generator to make it more reliable

File:

• trunk/gui/apps/simsim.in (modified) (5 diffs)

trunk/gui/apps/simsim.in

@@ -199 +199 @@
 }
 
-proc choiceHandler {child} {
+proc choiceHandler {valType child} {
     if {"yes" == [$child get "simset"]} {
         $child remove "simset"
     } else {
         set optList [$child children -as object -type option]
-        set optIdx [expr {int(rand()*[llength $optList])}]
-        set optLib [lindex $optList $optIdx]
-        set value [$optLib get value]
+        set value ""
+        if {"random" == $valType} {
+            set optIdx [expr {int(rand()*[llength $optList])}]
+            set optLib [lindex $optList $optIdx]
+            set value [$optLib get value]
+        } elseif {"default" == $valType} {
+            set defaultVal [$child get default]
+            foreach optLib $optList {
+                set label [$optLib get about.label]
+                set valTag [$optLib get value]
+                if {($defaultVal == $label) || ($defaultVal == $valTag)} {
+                    set value $valTag
+                    break
+                }
+            }
+        }
+
         if {"" == $value} {
             set value [$optLib get about.label]
@@ -226 +240 @@
             boolean     { defaultHandler $child }
             string      { defaultHandler $child }
-            choice      { defaultHandler $child }
+            choice      { choiceHandler default $child }
             loader      { loaderHandler  $child $toolDir }
             structure   { defaultHandler $child }
             group       { set cclist [groupHandler $child]
+                          set childList [concat $childList $cclist] }
+            phase       { set cclist [groupHandler $child]
                           set childList [concat $childList $cclist] }
             default     { defaultHandler $child }
@@ -269 +285 @@
             boolean   { booleanHandler $child }
             string    { defaultHandler $child }
-            choice    { choiceHandler  $child }
+            choice    { choiceHandler random  $child }
             loader    {
                 set cpath [$child element -as path]
@@ -290 +306 @@
                 set childList [concat $childList $ccList]
             }
+            phase     {
+                set ccList [groupHandler $child]
+                set childList [concat $childList $ccList]
+            }
             default   { defaultHandler $child }
         }
@@ -296 +316 @@
 
 proc random {m M} {
-    return [expr {$m+(rand()*($M-$m+1))}]
+    return [expr {$m+(rand()*($M-$m))}]
 }
 
 proc randomInt {m M} {
-    return [expr {$m+(int(rand()*($M-$m+1)))}]
+    return [expr {int(rand()*($M-$m+1)+$m)}]
 }