Changeset 10189:362d9cc5ecac in orange

Timestamp:

02/13/12 12:29:49 (16 months ago)

Author:

anze <anze.staric@…>

Branch:

default

rebase_source:

ba599ded5e10091bdf233be57c2124307ee26824

Message:

Fixed some warnings in evaluation.testing.

Location:

Orange

Files:

• data/__init__.py (modified) (1 diff)
• evaluation/testing.py (modified) (3 diffs)

Orange/data/__init__.py

@@ -2 +2 @@
 .. autoclass:: Table
 """
+from Orange import core
 
-from orange import ExampleTable as Table
-from orange import Example as Instance
-from orange import Value, StringValue, Domain
-
-import outliers
+Table = core.ExampleTable
+Instance = core.Example
+Value = core.Value
+StringValue = core.StringValue
+Domain = core.Domain

Orange/evaluation/testing.py

@@ -561 +561 @@
 
         :param learners: list of learners to be tested
-        :param examples: a dataset used for evaluation
-        :param folds: number of folds for cross-validation
+        :param learn_set: a dataset used for learning
+        :param test_set: a dataset used for evaluation
         :param proportions: proportions of train data to be used
         :param preprocessors: a list of preprocessors to be used on data.
-        :param callback: a function that is called after each classifier is computed.
         :return: list of :obj:`ExperimentResults`
         """
@@ -666 +665 @@
                 ex2 = Orange.data.Instance(example)
                 if ex2.domain.class_var: ex2.setclass("?")
-                if ex2.domain.class_vars: ex2.set_classes(["?" for cv in ex2.domain.class_vars])
+                if ex2.domain.class_vars: ex2.set_classes(["?" for _ in ex2
+                .domain.class_vars])
                 result = classifier(ex2, Orange.core.GetBoth)
                 results.append((e, c, result))
@@ -689 +689 @@
 
     def encode_PP(self, pps):
-        pps=""
         for pp in pps:
-            objname = getobjectname(pp[1], "")
+            objname = getobjectname(pp[1])
             if len(objname):
                 pps+="_"+objname