Changeset 839 for mystic

Timestamp:

10/24/15 08:43:05 (7 months ago)

Author:

mmckerns

Message:

fix spelling error for suppress

Location:

mystic

Files:

• examples/test_svc1.py (modified) (1 diff)
• examples/test_svc2.py (modified) (1 diff)
• examples/test_svr1.py (modified) (1 diff)
• examples/test_svr2.py (modified) (1 diff)
• examples_other/test_smo1.py (modified) (1 diff)
• mystic/_symbolic.py (modified) (4 diffs)
• mystic/symbolic.py (modified) (1 diff)
• mystic/tools.py (modified) (5 diffs)

mystic/examples/test_svc1.py

@@ -50 +50 @@
 constrain = constraint(solvers(solve(constrain,target=['x0'])))
 
-from mystic import supressed
-@supressed(1e-5)
+from mystic import suppressed
+@suppressed(1e-5)
 def conserve(x):
     return constrain(x)

mystic/examples/test_svc2.py

@@ -70 +70 @@
 #constrain = constraint(solvers(solve(constrain)))
 
-from mystic import supressed
-@supressed(5e-2)
+from mystic import suppressed
+@suppressed(5e-2)
 def conserve(x):
     return constrain(x)

mystic/examples/test_svr1.py

@@ -47 +47 @@
 constrain = constraint(solvers(solve(constrain,target=['x0'])))
 
-from mystic import supressed
-@supressed(1e-5)
+from mystic import suppressed
+@suppressed(1e-5)
 def conserve(x):
     return constrain(x)

mystic/examples/test_svr2.py

@@ -49 +49 @@
 constrain = constraint(solvers(solve(constrain,target=['x0'])))
 
-from mystic import supressed
-@supressed(1e-5)
+from mystic import suppressed
+@suppressed(1e-5)
 def conserve(x):
     return constrain(x)

mystic/examples_other/test_smo1.py

@@ -44 +44 @@
 constrain = constraint(solvers(solve(constrain,target=['x0'])))
 
-from mystic import supressed
-@supressed(1e-5)
+from mystic import suppressed
+@suppressed(1e-5)
 def conserve(x):
     return constrain(x)

mystic/mystic/_symbolic.py

@@ -268 +268 @@
     nvars = None
     permute = False # if True, return all permutations
-    warn = True  # if True, don't supress warnings
+    warn = True  # if True, don't suppress warnings
     verbose = False  # if True, print debug info
     #-----------------------undocumented-------------------------------
@@ -437 +437 @@
     nvars = None
     permute = False # if True, return all permutations
-    warn = True  # if True, don't supress warnings
+    warn = True  # if True, don't suppress warnings
     verbose = False  # if True, print debug info
     #-----------------------undocumented-------------------------------
@@ -635 +635 @@
     #-----------------------undocumented-------------------------------
    #kwds['permute'] = False # if True, return all permutations
-    kwds['warn'] = False  # if True, don't supress warnings
+    kwds['warn'] = False  # if True, don't suppress warnings
     kwds['verbose'] = False  # if True, print debug info
     #------------------------------------------------------------------
@@ -704 +704 @@
     nvars = None
     permute = False # if True, return all permutations
-    warn = True  # if True, don't supress warnings
+    warn = True  # if True, don't suppress warnings
     verbose = False # if True, print details from _classify_variables
     #-----------------------undocumented-------------------------------

mystic/mystic/symbolic.py

@@ -198 +198 @@
                 after, before = eval(after, locals_), eval(before, locals_)
                 break
-            except ValueError as error:
+            except ValueError as error:  #FIXME: python2.5
                 if error.message.startswith('negative number') and \
                    error.message.endswith('raised to a fractional power'):

mystic/mystic/tools.py

@@ -36 +36 @@
     - insert_missing: return a sequence with the 'missing' elements inserted
     - clipped: generate a function where values outside of bounds are clipped
-    - supressed: generate a function where values less than tol are supressed
-    - supress: supress small values less than tol
+    - suppressed: generate a function where values less than tol are suppressed
+    - suppress: suppress small values less than tol
     - unpair: convert a 1D array of N pairs to two 1D arrays of N values
     - src: extract source code from a python code object
@@ -381 +381 @@
     if bounds:
         def function_wrapper(x):
-            settings = seterr(all='ignore') #XXX: slow to supress warnings?
+            settings = seterr(all='ignore') #XXX: slow to suppress warnings?
             if any((x<min)|(x>max)): #if violate bounds, evaluate as inf
                 seterr(**settings)
@@ -568 +568 @@
 
 
-def supress(x, tol=1e-8, clip=True):
-    """supress small values less than tol"""
+def suppress(x, tol=1e-8, clip=True):
+    """suppress small values less than tol"""
     from numpy import asarray, abs
     x = asarray(list(x))
     mask = abs(x) < tol
     if not clip:
-        # preserve sum by spreading supressed values to the non-zero elements
+        # preserve sum by spreading suppressed values to the non-zero elements
         x[mask==False] = (x + sum(x[mask])/(len(mask)-sum(mask)))[mask==False]
     x[mask] = 0.0
     return x.tolist()
 
-def supressed(tol=1e-8, exit=False, clip=True):
-    """generate a function, where values less than tol are supressed
+def suppressed(tol=1e-8, exit=False, clip=True):
+    """generate a function, where values less than tol are suppressed
 
 For example,
-    >>> @supressed(1e-8)
+    >>> @suppressed(1e-8)
     ... def square(x):
     ...     return [i**2 for i in x]
@@ -591 +591 @@
     >>> 
     >>> from mystic.math.measures import normalize
-    >>> @supressed(1e-8, exit=True, clip=False)
+    >>> @suppressed(1e-8, exit=True, clip=False)
     ... def norm(x):
     ...     return normalize(x, mass=1)
@@ -603 +603 @@
         if exit:
             def func(x, *args, **kwds):
-                return supress(f(x, *args, **kwds), tol, clip)
+                return suppress(f(x, *args, **kwds), tol, clip)
         else:
             def func(x, *args, **kwds):
-                return f(supress(x, tol, clip), *args, **kwds)
+                return f(suppress(x, tol, clip), *args, **kwds)
         func.__wrapped__ = f
         func.__doc__ = f.__doc__