Changeset 1706:fee5567c52af in orange-bioinformatics

Timestamp:

08/10/12 10:55:33 (9 months ago)

Author:

markotoplak

Branch:

default

Message:

Make the datasets with joined class values picklable.

File:

• _bioinformatics/obiGsea.py (modified) (2 diffs)

_bioinformatics/obiGsea.py

@@ -493 +493 @@
         return data
 
+class transform_class(object):
+    
+    def __init__(self, cv, mapval, class_values, nclass):
+        self.cv = cv
+        self.mapval = mapval
+        self.class_values = class_values
+        self.nclass = nclass
+    
+    def __call__(self, ex, *args, **kwargs):
+        """
+        Removes unnecessary class values and joins them according
+        to function input.
+        """
+        if ex[self.cv] in self.class_values:
+            return self.nclass(self.mapval[str(ex[self.cv].value)])
+        else:
+            return "?"
+
 def takeClasses(datai, classValues=None):
     """
@@ -541 +559 @@
         nclass = orange.EnumVariable(cv.name, values=nclassvalues)
 
-        def transform_class(ex,cv,mapval,classValues):
-            """
-            Removes unnecessary class values and joins them according
-            to function input.
-            """
-            if ex[cv] in classValues:
-                nex = orange.Example(ndom, ex)
-                return nclass(mapval[str(ex[cv].value)])
-            else:
-                return "?"
-
-        nclass.get_value_from = lambda ex,_: transform_class(ex,cv=cv,mapval=mapval,classValues=classValues)
+        tco = transform_class(cv=cv,mapval=mapval,class_values=classValues, nclass=nclass)
+
+        nclass.get_value_from = tco
 
         ndom = orange.Domain(itOrFirst(datai).domain.attributes, nclass)