Changeset 597 for branches

Timestamp:

11/20/12 14:46:46 (3 years ago)

Author:

mmckerns

Message:

add 'shallow' rounding (one level deep for floats, lists, arrays)

Location:

branches/decorate

Files:

• memoize.py (modified) (3 diffs)
• surrogate.py (modified) (1 diff)

branches/decorate/memoize.py

@@ -72 +72 @@
 
 
+def shallow_round_factory(tol):
+  from numpy import round as around #XXX: try or numpy makes this slow
+  def shallow_round(*args, **kwds):
+    argstype = type(args) 
+    _args = list(args)
+    _kwds = kwds.copy()
+    for i,j in enumerate(args):
+      try:
+        jtype = type(j)
+        _args[i] = jtype(around(j, tol))
+      except: pass
+    for i,j in kwds.items():
+      try:
+        jtype = type(j)
+        _kwds[i] = jtype(around(j, tol))
+      except: pass
+    return argstype(_args), _kwds
+  return shallow_round
+
+def shallow_round(tol=0): #NOTE: rounds floats, lists, arrays one level deep
+  def dec(f):
+    def func(*args, **kwds):
+      _shallow_round = shallow_round_factory(tol)
+      _args,_kwds = _shallow_round(*args, **kwds)
+      return f(*_args, **_kwds)
+    return func
+  return dec
+
+
 def get_archive(archive):
     import dill as pickle
@@ -135 +164 @@
     if deep: rounded = deep_round
     else: rounded = simple_round
+   #else: rounded = shallow_round
 
     @rounded(tol)
@@ -166 +196 @@
     if deep: rounded = deep_round
     else: rounded = simple_round
+   #else: rounded = shallow_round
 
     @rounded(tol)

branches/decorate/surrogate.py

@@ -22 +22 @@
 from memoize import memoized0_round, memoized0_nopickle_round
 from memoize import memoized0_archived, memoized0_nopickle_archived
-#@memoized0_round(0)         # slower, but more robust
-#@memoized0_nopickle_round(0)
-#@memoized0_archived()       # slower, but more robust
+#@memoized0_round(0, deep=True)          # slower, but more robust
+#@memoized0_nopickle_round(0, deep=True)
+#@memoized0_archived()                   # slower, but more robust
 @memoized0_nopickle_archived()
 def marc_surr(x):