Changeset 32304 for lang/python

Timestamp:

04/12/09 13:06:53 (4 years ago)

Author:

rezoo

Message:

shortcuts.py modify some corrections

Location:

lang/python/tremolo

Files:

• indications/volatility.py (modified) (1 diff)
• shortcuts.py (modified) (5 diffs)

lang/python/tremolo/indications/volatility.py

@@ -183 +183 @@
         def getDescription(self):
                 if self.fisher:
-                        return "Indication::Kurtosis(Fisher,%i)" % self.__length
+                        return "Kurtosis(Fisher,%i)" % self.__length
                 else:
-                        return "Indication::Kurtosis(Pearson,%i)" % self.__length
+                        return "Kurtosis(Pearson,%i)" % self.__length
         
         def getLength(self): return self.__length

lang/python/tremolo/shortcuts.py

@@ -4 +4 @@
 from copy import copy
         
-def makeKwargsList(kwargs, exception=[]):
+def makeKwargsList(kwargs, exceptions=[]):
         """
         タプルやリストを含んだ辞書から、それらの値を含む任意の組み合わせを
         すべてリストとして返します.
         例:
-        kwargs    = {"a":(1,2), "b":3, "c":(True,False), "d":(1,2)}
-        exception = "d"の場合、返される辞書のリストは、
+        kwargs     = {"a":(1,2), "b":3, "c":(True,False), "d":(1,2)}
+        exceptions = "d"の場合、返される辞書のリストは、
         [{"a":1, "b":3, "c":True, "d":(1,2)},
          {"a":1, "b":3, "c":False, "d":(1,2)},
@@ -16 +16 @@
          {"a":2, "b":3, "c":False, "d":(1,2)}] となります.
          
-        kwargs    : タプルやリストを含んだ辞書
-        exception : 組み合わせとして出力してほしくないキーのリスト
+        kwargs     : タプルやリストを含んだ辞書
+        exceptions : 組み合わせとして出力してほしくないキーのリスト
         """
         if type(kwargs) != dict: raise TypeError
@@ -25 +25 @@
         for (key, value) in kwargs.items():
                 if (type(value) == list or type(value) == tuple) and \
-                   (not (key in exception)):
+                   (not (key in exceptions)):
                         kwdict[key] = value
                 else: base[key] = value
@@ -34 +34 @@
         __makeKw(values, [], kwargs_list)
         # 結合
-        result = []
-        for args in kwargs_list:
-                new_dict = dict(zip(base.keys() + keys, base.values() + args))
-                result.append(new_dict)
-        return result
+        r = [dict(zip(base.keys() + keys, base.values() + ag)) for ag in kwargs_list]
+        return r
 
 def __makeKw(kwlist=[], base=[], kwargs_list=[]):
+        argslist  = kwlist[0]
         if len(kwlist) > 1:
-                argslist  = kwlist[0]
                 newKwlist = kwlist[1:]
                 for kw in argslist:
@@ -49 +46 @@
                         __makeKw(newKwlist, new_base, kwargs_list)
         else:
-                argslist = kwlist[0]
                 for kw in argslist:
                         new_base = copy(base)