Changeset 595

Timestamp:

11/20/12 11:48:23 (3 years ago)

Author:

mmckerns

Message:

enable a simple round (only rounds floats, does not 'deep round')

Location:

branches/decorate

Files:

• memoize.py (modified) (5 diffs)
• surrogate.py (modified) (1 diff)
• test_memoize.py (modified) (2 diffs)

branches/decorate/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/decorate/surrogate.py

@@ -1 +1 @@
 #! /usr/bin/env python
-"""Original matlab code:
-
-function A=marc_surr(x)
-h=x(1)*25.4*10^(-3);
-a=x(2)*pi/180;
-v=x(3);
-Ho=0.5794;
-s=1.4004;
-n=0.4482;
-K=10.3963;
-p=0.4757;
-u=1.0275;
-m=0.4682;
-Dp=1.778;
-
-v_bl=Ho*(h/(cos(a))^(n))^s;
-
-if v<v_bl
-  A=0
-else
-  A=K*((h/Dp)^p)*((cos(a))^u)*(tanh((v/v_bl)-1))^m;
-end
-"""
-
-### NOTES ###
-# h = thickness = [60,105]
-# a = obliquity = [0,30]
-# v = speed = [2.1,2.8]
-
-# explore the cuboid (h,a,v), with
-# subdivisions at h=100, a=20, v=2.2
-# due to ballistic limit: v(h=100,a=20) = 2.22,
-# perforation in this region should be zero.
-# NOTE: 'failure' is A < = t
-# 
-# Calculate for each of the 8 subcuboids:
-#  * probability mass, i.e. the product of the normalized side-lengths,
-#    since we're taking h, a and v to be uniformly distributed in their
-#    intervals
-#  * McDiarmid diameter of the perforation area A when restricted to that
-#    cuboid or subcuboid
-#  * the mean value of the perforation area A on each (sub)cuboid
-
 from math import pi, cos, tanh
 

branches/decorate/test_memoize.py

@@ -90 +90 @@
 cost1 = memoized0_round(1)(cost)
 cost0 = memoized0_round(0)(cost)
+costD = memoized0_round(0, deep=True)(cost)
 
 print "rounding to one decimals..."
@@ -103 +104 @@
 print cost0([1,2,3.4321], 3.6789)
 
+print "\nrerun again with deep rounding to zero decimals..."
+print costD([1,2,3.1234], 3.9876)
+print costD([1,2,3.1234], 3.9876)
+print costD([1,2,3.1234], 3.6789)
+print costD([1,2,3.4321], 3.6789)
+
 
 # EOF