Changeset 596 for branches

Timestamp:

11/20/12 12:42:04 (3 years ago)

Author:

mmckerns

Message:

update caching to explicitly use deep_round

Location:

branches/UQ/math/legacy/envelope

Files:

• Looper_BoLiSurr_Cy.py (modified) (1 diff)
• memoize.py (modified) (5 diffs)
• otm_hvi.py (modified) (1 diff)
• otm_hvi_new.py (modified) (1 diff)
• sausage.py (modified) (1 diff)

branches/UQ/math/legacy/envelope/Looper_BoLiSurr_Cy.py

@@ -119 +119 @@
 
   # generate primary constraints function
-# @memoized(tol=3)
+# @memoized(tol=3, deep=True)
   def constraints(rv):
     rrv = range(len(rv))

branches/UQ/math/legacy/envelope/memoize.py

@@ -50 +50 @@
 
 
+def simple_round_factory(tol):
+  def simple_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
+    for i,j in kwds.items():
+      if isinstance(j, float): _kwds[i] = round(j, tol)
+    return argstype(_args), _kwds
+  return simple_round
+
+def simple_round(tol=0): #NOTE: only rounds floats, nothing else
+  def dec(f):
+    def func(*args, **kwds):
+      _simple_round = simple_round_factory(tol)
+      _args,_kwds = _simple_round(*args, **kwds)
+      return f(*_args, **_kwds)
+    return func
+  return dec
+
+
 def get_archive(archive):
     import dill as pickle
@@ -101 +123 @@
 #FIXME: resolve signature difference...  @memoized versus @memoized()
 
-def memoized0_nopickle_round(tol=0):
+def memoized0_nopickle_round(tol=0, deep=False):
     """Decorator that memoizes a function's return value each time it is called.
     If called later with the same arguments, the memoized value is returned, and
@@ -111 +133 @@
     memo = {}
 
-    @deep_round(tol)
+    if deep: rounded = deep_round
+    else: rounded = simple_round
+
+    @rounded(tol)
     def rounded_args(*args, **kwds):
         return (args, kwds)
@@ -130 +155 @@
 
 
-def memoized0_round(tol=0):
+def memoized0_round(tol=0, deep=False):
     """Decorator that memoizes a function's return value each time it is called.
     If called later with the same arguments, the memoized value is returned, and
@@ -139 +164 @@
     memo = {}
 
-    @deep_round(tol)
+    if deep: rounded = deep_round
+    else: rounded = simple_round
+
+    @rounded(tol)
     def rounded_args(*args, **kwds):
         return (args, kwds)

branches/UQ/math/legacy/envelope/otm_hvi.py

@@ -33 +33 @@
 from memoize import memoized0_nopickle_round as memoized
 
-@memoized(tol=3)
+@memoized(tol=3, deep=True)
 def eureka(x, root_path="."):
     """ Notes for now, will be fixed in the future!!!

branches/UQ/math/legacy/envelope/otm_hvi_new.py

@@ -33 +33 @@
 from memoize import memoized0_nopickle_round as memoized
 
-@memoized(tol=3)
+@memoized(tol=3, deep=True)
 def eureka(x, root_path="."):
     """ Notes for now, will be fixed in the future!!!

branches/UQ/math/legacy/envelope/sausage.py

@@ -103 +103 @@
 from memoize import memoized0_nopickle_round as memoized
 # vectorize 'sausage_bounds' to find min/max for every evaluation point
-@memoized(tol=3)
+@memoized(tol=3, deep=True)
 def model_sausage(x):
   "find the boundary of the sausage in Y for the given x"