CCAR: ajout __hash__ et utilisation division spéciale pour entiers

diff --git a/Extensions/param2.py b/Extensions/param2.py
index 765dd1e069cb2865a2514616efe9110a4e192b7e..e91e3e1bacf20700c7aa2ec209d97831025585e5 100644 (file)
--- a/Extensions/param2.py
+++ b/Extensions/param2.py
@@ -53,13 +53,23 @@ class Formula:
     def __le__(  self, other ): return self.eval() <= other
     def __gt__(  self, other ): return self.eval() > other
     def __ge__(  self, other ): return self.eval() >= other
+    def __hash__(self):return id(self)
+
+def _div(a,b):
+  if isinstance(a,(int,long)) and isinstance(b,(int,long)):
+    if a%b:
+      return a/b
+    else:
+      return a//b
+  else:
+    return a/b
 
 
 class Binop(Formula):
     opmap = { '+': lambda a, b: a + b,
               '*': lambda a, b: a * b,
               '-': lambda a, b: a - b,
-              '/': lambda a, b: a / b,
+              '/': _div,
               '//': lambda a, b: a // b,
               '**': lambda a, b: a ** b,
               '[]': lambda a, b: a[b] ,