Merge branch 'polynom' into 2nd_deg

docs/polynom.mdwn

@@ -0,0 +1,16 @@
+# Les polynômes
+
+
+## Créer des polynômes
+
+### Générer un polynôme "fixe"
+
+### Générer un polynôme aléatoirement
+
+    >>> P = Polynom.random(["{b}", "{a}"]) # Polynom du type ax + b
+    >>> print(P)
+    - 8 x - 3
+    >>> P = Polynom.random(degree = 2) 
+    >>> print(P)
+    5 x^{  2 } + 4 x - 7
+

pymath/polynom.py

@@ -16,7 +16,7 @@ def power_cache(fun):
     """Decorator which cache calculated powers of polynoms """
     cache  = {}
     def cached_fun(self, power):
-        print("cache -> ", cache)
+        #print("cache -> ", cache)
         if (tuple(self._coef), power) in cache.keys():
             return cache[(tuple(self._coef), power)]
         else:
@@ -30,18 +30,37 @@ class Polynom(object):
     """Docstring for Polynom. """
 
     @classmethod
-    def random(self, coefs_form=[], conditions=[], letter = "x"):
+    def random(self, coefs_form=[], conditions=[], letter = "x", degree = 0):
         """ Create a random polynom from coefs_form and conditions 
 
         :param coefs_form: list of forms (one by coef) (ascending degree sorted)
         :param conditions: condition on variables 
+        :param letter: the letter for the polynom
+        :param degree: degree of the polynom (can't be used with coefs_form, it will be overwrite) - can't be higher than 26 (number of letters in alphabet)
 
         /!\ variables need to be in brackets {}
 
+        >>> Polynom.random(["{b}", "{a}"]) # doctest:+ELLIPSIS
+        ...
+        >>> Polynom.random(degree = 2) # doctest:+ELLIPSIS
+        ...
+        >>> Polynom.random(degree = 2, conditions=["{b**2-4*a*c}>0"]) # Polynom deg 2 with positive Delta (ax^2 + bx + c)
+        ...
+        >>> Polynom.random(["{c}", "{b}", "{a}"], conditions=["{b**2-4*a*c}>0"]) # Same as above
+        ...
+
         """
+        if (degree > 0 and degree < 26):
+            # Générer assez de lettre pour les coefs
+            coefs_name = map(chr, range(97, 98+degree))
+            coefs_form = ["{" + i + "}" for i in coefs_name].reverse()
+
         form = str(coefs_form)
+        # On créé les valeurs toutes concaténées dans un string
         coefs = RdExpression(form, conditions)()
+        # On "parse" ce string pour créer les coefs
         coefs = [eval(i) if type(i)==str else i for i in eval(coefs)]
+        # Création du polynom
         return Polynom(coef = coefs, letter = letter)
 
     def __init__(self, coef = [1], letter = "x" ):