Changeset 732

Timestamp:

07/28/14 06:51:58 (22 months ago)

Author:

mmckerns

Message:

fix: update_complex in scemtools for list inputs; clean and move test_scem

Location:

mystic

Files:

• examples/test_scem.py (moved) (moved from mystic/examples_other/test_scem.py) (1 diff)
• mystic/scemtools.py (modified) (5 diffs)

mystic/examples/test_scem.py

@@ -9 +9 @@
 """
 
-# from mystic.scemtools import *
+from mystic.scemtools import *
 import numpy
-
-def sort_complex(c, a):
-    # this is dumb, because c (i.e., a, are almost sorted)
-    # should sue the one below instead.
-    D = zip(a,c)
-    def mycmp(x,y):
-        if x[0] < y[0]:
-            return 1
-        elif x[0] > y[0]:
-            return -1
-        else:
-            return 0
-    D.sort(cmp = mycmp)
-    return numpy.array([x[1] for x in D]), [x[0] for x in D]
-
-def myinsert(a, x):
-    # a is in descending order
-    from bisect import bisect
-    return bisect([-i for i in a],-x)
-    
-def sort_complex2(c, a):
-    """
-- c and a are partially sorted (either the last one is bad, or the first one)
-- pos : 0 (first one out of order)
-       -1 (last one out of order)
-    """
-    from bisect import bisect
-    # find where new key is relative to the rest
-    if a[0] < a[1]:
-        ax, cx = a[0], c[0]
-        ind = myinsert(a[1:],ax)
-        a[0:ind], a[ind] = a[1:1+ind], ax
-        c[0:ind], c[ind] = c[1:1+ind], cx
-    elif a[-1] > a[-2]:
-        ax,cx = a[-1], c[0]
-        ind = myinsert(a[0:],ax)
-        a[ind+1:], a[ind] = a[ind:-1], ax
-        c[ind+1:], c[ind] = c[ind:-1], cx
-    return
 
 print "Numpy Input" 

mystic/mystic/scemtools.py

@@ -104 +104 @@
 def sort_complex0(c, a):
     # this is dumb, because c (i.e., a, are almost sorted)
-    # should sue the one below instead.
+    # should use the one below instead.
     # this is faster than sort_complex
     b = array(a)
@@ -112 +112 @@
 def sort_complex(c, a):
     # this is dumb, because c (i.e., a, are almost sorted)
-    # should sue the one below instead.
+    # should use the one below instead.
     D = zip(a,c)
     def mycmp(x,y):
@@ -135 +135 @@
        -1 (last one out of order)
     """
-    from bisect import bisect
     # find where new key is relative to the rest
     if a[0] < a[1]:
@@ -156 +155 @@
 - pos is 0, or -1
     """
-    from bisect import bisect
     if pos == 0:
         at = ak[1:]
@@ -162 +160 @@
         at = ak[:-1]
 
-    p = bisect(-at, -a)
+    p = myinsert(at, a)
 
     # not done yet.
     if pos == 0:
         Ck[0:p], ak[p] = Ck[1:p+1], ak[1:p+1]
-        ck[p], ak[p] = c, a
+        Ck[p], ak[p] = c, a
     else:
         Ck[0:p], ak[p] = Ck[1:p+1], ak[1:p+1]
-        ck[p], ak[p] = c, a
+        Ck[p], ak[p] = c, a
 
     return