Changeset 10743:626f2fdde58f in orange


Ignore:
Timestamp:
04/04/12 12:20:10 (2 years ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Message:

Changed the last orange.TreeClassifier signal types to Orange.classification.tree.TreeClassifier

Location:
Orange/OrangeWidgets
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeWidgets/Classify/OWITree.py

    r10457 r10743  
    1313from OWItemModels import VariableListModel 
    1414 
     15import Orange 
     16 
    1517class FixedTreeLearner(orange.Learner): 
    1618    def __init__(self, classifier, name): 
     
    2729    def __init__(self,parent = None, signalManager = None): 
    2830        OWClassificationTreeViewer.__init__(self, parent, signalManager, 'I&nteractive Tree Builder') 
    29         self.inputs = [("Data", ExampleTable, self.setData), ("Tree Learner", orange.Learner, self.setLearner)] 
    30         self.outputs = [("Data", ExampleTable), ("Classifier", orange.TreeClassifier), ("Tree Learner", orange.Learner)] 
     31        self.inputs = [("Data", ExampleTable, self.setData), 
     32                       ("Tree Learner", orange.Learner, self.setLearner)] 
     33         
     34        self.outputs = [("Data", ExampleTable), 
     35                        ("Classifier", Orange.classification.tree.TreeClassifier), 
     36                        ("Tree Learner", orange.Learner)] 
    3137 
    3238        self.attridx = 0 
  • Orange/OrangeWidgets/OWTreeViewer2D.py

    r10466 r10743  
    11import orange, orngTree, OWGUI, OWColorPalette 
    22from OWWidget import * 
     3 
     4import Orange 
    35 
    46from PyQt4.QtCore import * 
     
    354356        self.selectedNode = None 
    355357 
    356         self.inputs = [("Classification Tree", orange.TreeClassifier, self.ctree)] 
     358        self.inputs = [("Classification Tree", Orange.classification.tree.TreeClassifier, self.ctree)] 
    357359        self.outputs = [("Examples", ExampleTable)] 
    358360 
  • Orange/OrangeWidgets/Prototypes/OWRandomForestOld.py

    r10587 r10743  
    1313from orngWrap import PreprocessedLearner 
    1414 
     15import Orange 
     16 
    1517class OWRandomForestOld(OWWidget): 
    1618    settingsList = ["name", "trees", "attributes", "attributesP", "preNodeInst", "preNodeInstP", "limitDepth", "limitDepthP", "rseed", "outtree" ] 
     
    1921        OWWidget.__init__(self, parent, signalManager, name, wantMainArea=False, resizingEnabled=False) 
    2022 
    21         self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    22         self.outputs = [("Learner", orange.Learner),("Random Forest Classifier", orange.Classifier),("Selected Tree", orange.TreeClassifier) ] 
     23        self.inputs = [("Data", ExampleTable, self.setData), 
     24                       ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
     25        self.outputs = [("Learner", orange.Learner), 
     26                        ("Random Forest Classifier", orange.Classifier), 
     27                        ("Selected Tree", Orange.classification.tree.TreeClassifier)] 
    2328 
    2429        self.name = 'Random Forest' 
Note: See TracChangeset for help on using the changeset viewer.