err in recursive draws when size gt 1

Author: stsmall

project/sim_modules/drawdist.py

@@ -61,8 +61,11 @@ def unif_int(self, low, high, size, trunc=-2):
             upper bound
 
         """
-        trunc = np.floor((len(str(round(low))) - 1) / 2) * -1
-        nn = np.random.randint(low, high+1, size)
+        if type(low) is int or type(low) is float:
+            trunc = np.floor((len(str(round(low))) - 1) / 2) * -1
+        else:
+            trunc = np.floor((len(str(round(low[0]))) - 1) / 2) * -1
+        nn = np.random.randint(low, np.array(high)+1, size)
         return np.around(nn, int(trunc))
 
     def log_unif_int(self, low, high, size, base=10):

project/sim_modules/recurtbi.py

@@ -15,24 +15,35 @@
 cn = 0
 
 
-def itdict(d, size):
+def itdict(dt, size):
     global cn
-    while cn < len(d):
-        for k, v in d.items():
+    while cn < len(dt):
+        for k, v in dt.items():
             if len(v) == 3:
                 dist, low, high = v
                 if "tbi" in str(low):
-                    if type(d[low]) is int:
-                        d[k][1] = d[low]
+                    if len(dt[low]) == size:
+                        dt[k][1] = dt[low]
                 elif "tbi" in str(high):
-                    if type(d[high]) is int:
-                        d[k][2] = d[high]
+                    if len(dt[high]) == size:
+                        dt[k][2] = dt[high]
                 else:
                     draw = getattr(DrawDist(), dist[1:])
-                    assert dist[1:] in avail_dist,"dist not recognized"
-                    d[k] = draw(float(low), float(high), size)
+                    assert dist[1:] in avail_dist, "dist not recognized"
+                    if type(low) is str and type(high) is str:
+                        # low is str, high is str   '0' '123'
+                        dt[k] = draw(float(low), float(high), size)
+                    elif type(low) is str and len(high) == size:
+                        # low is str, high is array '0' ([1,2,3])
+                        dt[k] = draw([float(low)]*size, high, size)
+                    elif len(low) == size and type(high) is str:
+                        # low is array, high is str ([1,2,3]) '10'
+                        dt[k] = draw(low, [float(high)]*size, size)
+                    elif len(low) == size and len(high) == size:
+                        # low is array, high is array ([1,2,3]) ([1,2,3])
+                        dt[k] = draw(low, high, size)
                     cn += 1
-                    return itdict(d, size)
-    return d
+                    return itdict(dt, size)
+    return dt
 
 # d={"tbi1": [0, "tbi2"], "tbi2": ["tbi3", "tbi4"], "tbi3":[100, "tbi4"],"tbi4": [1000, 10000]}