Ticket #1952: trac_1952-2.patch

a/sage/misc/cachefunc.py

@@ -52 +52 @@
-        EXAMPLES:
-            sage: g = CachedFunction(number_of_partitions)
-            sage: a = g(5)
-cache
+get_cache()
-            {((5,), ()): 7}
-            sage: a = g(10^5) 
-            sage: a == number_of_partitions(10^5)
-            True
-        """
-
-
-
+
+
+
+
-        w = self.f(*args, **kwds)
-self.
+
-        return w
+
+    def get_cache(self):
+        """
+        Returns the cache dictionary.
+
+        EXAMPLES:
+            sage: g = CachedFunction(number_of_partitions)
+            sage: a = g(5)
+            sage: g.get_cache()
+            {((5,), ()): 7}
+
+        """
+        return self.cache
+
+    def is_in_cache(self, *args, **kwds):
+        """
+        EXAMPLES:
+            sage: class Foo:
+            ...       def __init__(self, x):
+            ...           self._x = x
+            ...       @cached_method
+            ...       def f(self, z):
+            ...           return self._x*z
+            ...
+            sage: a = Foo(2)
+            sage: a.f.is_in_cache(3)
+            False
+            sage: a.f(3)
+            6
+            sage: a.f.is_in_cache(3)
+            True
+        """
+        cache = self.get_cache()
+        return self.get_key(*args, **kwds) in cache
+
+    def get_key(self, *args, **kwds):
+        """
+        Returns the key in the cache to be used when args 
+        and kwds are passed in as parameters.
+
+        EXAMPLES:
+            sage: class Foo:
+            ...       def __init__(self, x):
+            ...           self._x = x
+            ...       @cached_method
+            ...       def f(self):
+            ...           return self._x^2
+            ...
+            sage: a = Foo(2)
+            sage: a.f.get_key()
+            ((), ())
+        """
+        return (args, tuple(sorted(kwds.items())))
-
-    def __repr__(self):
-        """
@@ -73 +127 @@
-            Cached version of <function number_of_partitions at 0x...>
-        """
-        return "Cached version of %s"%self.f 
+
+    def clear_cache(self):
+        """
+        Clear the cache dictionary.
+
+        EXAMPLES:
+            sage: g = CachedFunction(number_of_partitions)
+            sage: a = g(5)
+            sage: g.get_cache()
+            {((5,), ()): 7}
+            sage: g.clear_cache()
+            sage: g.get_cache()
+            {}
+        """
+        cache = self.get_cache()
+        for key in cache.keys():
+            del cache[key]
+
-
-cached_function = CachedFunction
-
@@ -106 +178 @@
-            sage: a = Foo(2)
-            sage: a.f()
-            4
+            sage: a.f() is a.f()
+            True
-            sage: b = Foo(3)
-            sage: b.f()
-            9
-        """
-_instance.__dict__.setdefault(self._cache_name, {}
-(args, tuple(kwds)
+get_cache(
+self.get_key(*args, **kwds
-        if cache.has_key(key):
-            return cache[key]
-        else:
-            cache[key] = self.f(self._instance, *args, **kwds)
-            return cache[key]
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def __get__(self, inst, cls=None):
-        """
-        This is needed to allow CachedFunction to decorate

a/sage/rings/polynomial/multi_polynomial_ideal.py

@@ -147 +147 @@
-from sage.rings.integer import Integer
-from sage.structure.sequence import Sequence
-
-CachedFunction
+cached_method
-from sage.misc.misc import prod
-from sage.misc.sage_eval import sage_eval
-
@@ -255 +255 @@
-            return func(*args, **kwds)
-    wrapper.__doc__=func.__doc__
-    return wrapper
-
-class cached(CachedFunction):
-    r""" 
-    Specialised \code{CachedFunction} for the application in
-    multivariate polynomial ideals.
-
-    AUTHOR:
-        -- Martin Albrecht
-    """
-    def __call__(self, *args, **kwds):
-        """
-        EXAMPLES:
-            sage: P = PolynomialRing(GF(32003),4,'x')
-            sage: I = sage.rings.ideal.Katsura(P)
-            sage: I.groebner_basis.clear_cache()
-            sage: gb = I.groebner_basis() # indirect doctest
-            sage: I.groebner_basis.cache
-            {(Multivariate Polynomial Ring in x0, x1, x2, x3 over Finite Field of size 32003, 
-            (x0 + 2*x1 + 2*x2 + 2*x3 - 1, 
-            x1^2 + 2*x0*x2 + 2*x1*x3 - x2, 
-            2*x0*x1 + 2*x1*x2 + 2*x2*x3 - x1, 
-            x0^2 + 2*x1^2 + 2*x2^2 + 2*x3^2 - x0), 
-            (), 
-            ()): 
-            [x0 + 2*x1 + 2*x2 + 2*x3 - 1, 
-            x2^2 + 2*x1*x3 - 13711*x2*x3 - 4568*x3^2 - 4572*x1 + 13715*x2 - 9145*x3, 
-            x1*x2 - 2*x1*x3 - 9147*x2*x3 - 13719*x3^2 + 2286*x1 + 9144*x2 + 4573*x3, 
-            x1^2 + 2*x1*x3 + 4573*x2*x3 - 9142*x3^2 - 9144*x1 - 4572*x2 + 13715*x3, 
-            x2*x3^2 + 3557*x3^3 - 1778*x1*x3 - 3161*x2*x3 + 5926*x3^2 - 10075*x1 - 6124*x2 + 11853*x3, x1*x3^2 - 10668*x3^3 - 3556*x1*x3 - 10075*x2*x3 + 3556*x3^2 - 889*x1 - 11853*x2, 
-            x3^4 + 12535*x3^3 + 7471*x1*x3 + 6188*x2*x3 + 10117*x3^2 + 10521*x1 + 11393*x2 + 11829*x3]}
-        """
-        from sage.rings.polynomial.multi_polynomial_ring_generic import is_MPolynomialRing
-        k = self.gen_key(*args, **kwds)
-        if self.cache.has_key(k) and "nocache" not in kwds:
-            return self.cache[k]
-
-        w = self.f(self.instance, *args, **kwds)
-        if is_MPolynomialRing(self.instance.ring()):
-            self.cache[k] = w
-        return w
-
-    def clear_cache(self):
-        """
-        Clear the cache.
-
-        EXAMPLE:
-            sage: P = PolynomialRing(GF(32003),4,'x')
-            sage: I = sage.rings.ideal.Katsura(P)
-            sage: I.groebner_basis.clear_cache()
-            sage: I.groebner_basis.cache
-            {}
-            sage: gb = I.groebner_basis() # indirect doctest
-            sage: len(I.groebner_basis.cache)
-            1
-            sage: I.groebner_basis.clear_cache()
-            sage: len(I.groebner_basis.cache)
-            0
-        """
-        self.cache = {}
-
-    def gen_key(self, *args, **kwds): 
-        """
-        Generate a key to the cache.
-
-        EXAMPLE:
-            sage: P = PolynomialRing(GF(32003),4,'x')
-            sage: I = sage.rings.ideal.Katsura(P)
-            sage: I.groebner_basis.gen_key()
-            (Multivariate Polynomial Ring in x0, x1, x2, x3 over Finite Field of size 32003,
-            (x0 + 2*x1 + 2*x2 + 2*x3 - 1,
-            x1^2 + 2*x0*x2 + 2*x1*x3 - x2,
-            2*x0*x1 + 2*x1*x2 + 2*x2*x3 - x1,
-            x0^2 + 2*x1^2 + 2*x2^2 + 2*x3^2 - x0),
-            (),
-            ())
-        """
-        r = (self.instance.ring(), tuple(sorted(self.instance.gens())), args, tuple(kwds.iteritems()))
-        return r
-
-    def is_in_cache(self, *args, **kwds):
-        """
-        Check whether key is already in cache.
-
-        EXAMPLE:
-            sage: P = PolynomialRing(GF(32003),3,'x')
-            sage: I = sage.rings.ideal.Katsura(P)
-            sage: I.groebner_basis.is_in_cache()
-            False
-            sage: gb = I.groebner_basis()
-            sage: I.groebner_basis.is_in_cache()
-            True
-        """
-        return self.gen_key(*args, **kwds) in self.cache
-
-def is_MPolynomialIdeal(x):
-    r"""
@@ -1841 +1748 @@
-        return groebner_fan.GroebnerFan(self, is_groebner_basis=is_groebner_basis,
-                                        symmetry=symmetry, verbose=verbose)
-
-
+_method
-    def groebner_basis(self, algorithm='', *args, **kwds):
-        r"""
-        Return the reduced Groebner basis of this ideal. A Groeber basis