Changeset 581 for branches

Timestamp:

10/17/12 19:17:28 (4 years ago)

Author:

mmckerns

Message:

strong improvements to float caching in memoize, works recursively on iterables

Location:

branches/decorate

Files:

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

branches/decorate/memoize.py

@@ -2 +2 @@
 a decorator named 'memoized' that can memoize a *method* on an object.
 """
+def isiterable(x):
+ #try:
+ #    from collections import Iterable
+ #    return isinstance(x, Iterable)
+ #except ImportError:
+  try:
+    iter(x)
+    return True
+  except TypeError: return False
 
-def arglist_round(tol=0):
-    """Decorator that rounds all floats in args and kwds to given decimal tol.
-    """
-    #FIXME: works on foo([1.1111, 2.12345])... and foo(1.1111, 2.12345)
-    #       but not recursively into nested lists; also always assumes lists
-    @arg_round(tol)
-    def rounded_arg(*args):
-        return args
+def deep_round_factory(tol):
+  def deep_round(*args, **kwds):
+    argstype = type(args) 
+    _args = list(args)
+    _kwds = kwds.copy()
+    for i,j in enumerate(args):
+      if isinstance(j, float): _args[i] = round(j, tol) # don't round int
+      elif isinstance(j, (str, unicode, type(BaseException()))): continue
+      elif isinstance(j, dict): _args[i] = deep_round(**j)[1]
+      elif isiterable(j): #XXX: fails on the above, so don't iterate them
+        jtype = type(j)
+        _args[i] = jtype(deep_round(*j)[0])
+    for i,j in kwds.items():
+      if isinstance(j, float): _kwds[i] = round(j, tol)
+      elif isinstance(j, (str, unicode, type(BaseException()))): continue
+      elif isinstance(j, dict): _kwds[i] = deep_round(**j)[1]
+      elif isiterable(j): #XXX: fails on the above, so don't iterate them
+        jtype = type(j)
+        _kwds[i] = jtype(deep_round(*j)[0])
+    return argstype(_args), _kwds
+  return deep_round
 
-    def isiterable(x):
-       #try:
-       #    from collections import Iterable
-       #    return isinstance(x, Iterable)
-       #except ImportError:
-        try:
-            iter(x)
-            return True
-        except TypeError: return False
+"""
+>>> deep_round = deep_round_factory(tol=0)  #FIXME: convert to decorator !!!
+>>> deep_round([1.12,2,{'x':1.23, 'y':[4.56,5.67]}], x=set([11.22,44,'hi']))
+(([1.0, 2, {'y': [5.0, 6.0], 'x': 1.0}],), {'x': set([11.0, 'hi', 44])})
+"""
 
-    #FIXME: see note above... the following is a hack
-    def dec(f):
-        def func(*args, **kwds):
-            _args = [[rounded_arg(arg)[0] for arg in argi]
-                     if isiterable(argi)
-                     else rounded_arg(argi)[0]
-                     for argi in args]
-            _kwds = kwds.copy()
-            [_kwds.update({kw:[rounded_arg(v)[0] for v in val]})
-                if isiterable(val)
-                else _kwds.update({kw:rounded_arg(val)[0]})
-                for (kw,val) in kwds.items()]
-            return f(*tuple(_args), **_kwds)
-        return func
-    return dec
+def deep_round(tol=0):
+  def dec(f):
+    def func(*args, **kwds):
+      _deep_round = deep_round_factory(tol)
+      _args,_kwds = _deep_round(*args, **kwds)
+      return f(*_args, **_kwds)
+    return func
+  return dec
 
 
-def arg_round(tol=0):
-    """Decorator that rounds all floats in args and kwds to given decimal tol.
-    """
-    #FIXME: works on foo(1.1111, 2.12345), but not foo([1.1111, 2.12345])
-    def dec(f):
-        def func(*args, **kwds):
-            _args = list(args)
-            _kwds = kwds.copy()
-            for i,j in enumerate(args):
-                if type(j)==float: _args[i] = round(j, tol)
-            for i,j in kwds.items():
-                if type(j)==float: _kwds[i] = round(j, tol)
-            return f(*tuple(_args), **_kwds)
-        return func
-    return dec
+#FIXME: the below need expiration of cache due to time, calls, etc...
+#       and potentially r/w to database, file, or other caching mechanism
+#FIXME: memoize*_round fails when decorating a class method
 
 
@@ -66 +65 @@
     memo = {}
 
-    @arglist_round(tol)
+    @deep_round(tol)
     def rounded_args(*args, **kwds):
         return (args, kwds)
@@ -93 +92 @@
     memo = {}
 
-    @arglist_round(tol)
+    @deep_round(tol)
     def rounded_args(*args, **kwds):
         return (args, kwds)

branches/decorate/test_memoize.py

@@ -21 +21 @@
 """
 
+#from memoize import memoized0_nopickle_round as memoized
+#from memoize import memoized0_round as memoized
 #from memoize import memoized0 as memoized
 from memoize import memoized