Ignore:
Timestamp:
11/30/12 16:15:30 (17 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Parents:
11215:a55eaa72e6ef (diff), 11045:a66a74b38e91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged from upstream (biolab/orange).

Files:
2 edited

Legend:

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

    r11015 r11216  
    22<name>Classification Tree</name> 
    33<description>Classification tree learner/classifier.</description> 
    4 <icon>icons/ClassificationTree.png</icon> 
     4<icon>icons/ClassificationTree.svg</icon> 
    55<contact>Janez Demsar (janez.demsar(@at@)fri.uni-lj.si)</contact> 
    66<priority>30</priority> 
  • Orange/OrangeWidgets/Classify/OWClassificationTree.py

    r11096 r11216  
    3535        self.inputs = [("Data", ExampleTable, self.setData), 
    3636                       ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    37          
     37 
    3838        self.outputs = [("Learner", Orange.classification.tree.TreeLearner), 
    39                         ("Classification Tree", Orange.classification.tree.TreeClassifier), 
    40                         ("Classification Tree Graph", Orange.network.Graph)] 
     39                        ("Classification Tree", Orange.classification.tree.TreeClassifier), ] 
    4140 
    4241        self.name = 'Classification Tree' 
     
    146145            self.classifier = None 
    147146 
    148         tree_graph = None 
    149         if self.classifier is not None: 
    150             tree_graph = self.classifier.to_network() 
    151  
    152147        self.send("Classification Tree", self.classifier) 
    153         self.send("Classification Tree Graph", tree_graph) 
    154  
    155148 
    156149    def measureChanged(self): 
Note: See TracChangeset for help on using the changeset viewer.