Fixed the memoization for Energy.

demos/wiener_filter_hamiltonian.py

@@ -34,6 +34,7 @@ class WienerFilterEnergy(Energy):
         return_g.val = g.val.real
         return return_g
 
+    @memo
     def D_inverse_x(self):
         return D.inverse_times(self.position)
 
@@ -88,7 +89,7 @@ if __name__ == "__main__":
     minimizer = VL_BFGS(convergence_tolerance=0,
                         iteration_limit=50,
                         callback=distance_measure,
-                        max_history_length=5)
+                        max_history_length=3)
 
     m0 = Field(s_space, val=1)
 

nifty/energies/__init__.py

@@ -2,3 +2,4 @@
 
 from energy import Energy
 from line_energy import LineEnergy
+from memoization import memo

nifty/energies/energy.py

@@ -24,15 +24,3 @@ class Energy(object):
     @property
     def curvature(self):
         raise NotImplementedError
-
-    def memo(f):
-        name = id(f)
-
-        def wrapped_f(self):
-            try:
-                return self._cache[name]
-            except KeyError:
-                self._cache[name] = f(self)
-                return self._cache[name]
-        return wrapped_f
-

nifty/energies/memoization.py

+# -*- coding: utf-8 -*-
+
+
+def memo(f):
+    name = id(f)
+
+    def wrapped_f(self):
+        try:
+            return self._cache[name]
+        except KeyError:
+            self._cache[name] = f(self)
+            return self._cache[name]
+    return wrapped_f