Changeset 3476:6639d97db7d4 in orange


Ignore:
Timestamp:
04/03/07 14:30:12 (7 years ago)
Author:
blaz <blaz.zupan@…>
Branch:
default
Convert:
88af4fb1daa0c2ec01cf7c48a43fbfd35fc1f1a0
Message:

some updates in GUI

Location:
orange/OrangeWidgets
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • orange/OrangeWidgets/Classify/OWClassificationTreeGraph.py

    r3190 r3476  
    184184         
    185185        self.inputs = [("Classification Tree", orange.TreeClassifier, self.ctree)] 
    186         self.outputs = [("Examples", ExampleTable), ("Classified Examples", ExampleTableWithClass)] 
     186        self.outputs = [("Examples", ExampleTable)] 
    187187         
    188188        self.ShowPies=1 
  • orange/OrangeWidgets/Regression/OWRegressionTree.py

    r3420 r3476  
    3737 
    3838        self.inputs=[("Example Table",ExampleTable,self.dataset)] 
    39         self.outputs=[("Learner",orange.Learner),("Classifier",orange.Classifier),("Classification Tree",orange.TreeClassifier)] 
     39        self.outputs=[("Learner",orange.Learner),("Regressor",orange.Classifier),("Regression Tree",orange.TreeClassifier)] 
    4040         
    4141        ## 
     
    4343        ## 
    4444        OWGUI.lineEdit(self.controlArea, self, "Name", box="Learner/Classifier name") 
     45 
     46        OWGUI.separator(self.controlArea) 
    4547        OWGUI.checkBox(self.controlArea, self, "Bin", label="Binarization", box ="Tree structure") 
    4648         
     49        OWGUI.separator(self.controlArea) 
    4750        self.prePBox=OWGUI.widgetBox(self.controlArea, "Pre-Pruning") 
    48         self.postPBox=OWGUI.widgetBox(self.controlArea, "Post-Pruning") 
    4951 
    5052        #OWGUI.checkWithSpin(self.prePBox, self, "Min. instances in leaves: ", 1, 1000, 
     
    5860 
    5961        #OWGUI.checkBox(self.postPBox, self, 'PostMaj', 'Recursively merge leaves with same majority class') 
    60         OWGUI.checkWithSpin(self.postPBox, self, "m for m-error pruning ", 0, 1000, 'PostMPCheck', 'PostMPVal') 
     62 
     63        OWGUI.separator(self.controlArea) 
     64        self.postPBox=OWGUI.widgetBox(self.controlArea, "Post-Pruning") 
     65        OWGUI.checkWithSpin(self.postPBox, self, "Prunning with m-estimate, m:", 0, 1000, 'PostMPCheck', 'PostMPVal') 
    6166 
    6267        OWGUI.button(self.controlArea, self, "&Apply settings",callback=self.setLearner) 
     
    8085            classifier=learner(self.data) 
    8186            classifier.name=self.Name 
    82             self.send("Classifier",classifier) 
    83             self.send("Classification Tree",classifier) 
     87            self.send("Regressor",classifier) 
     88            self.send("Regression Tree", classifier) 
    8489        except orange.KernelException, (errValue): 
    8590            self.error(str(errValue)) 
    8691            print errValue 
    87             self.send("Classifier",None) 
    88             self.send("Classification Tree", None) 
     92            self.send("Regressor",None) 
     93            self.send("Regression Tree", None) 
    8994        #orngTree.printTxt(classifier) 
    9095     
     
    95100        else: 
    96101            self.send("Learner",None) 
    97             self.send("Classifier",None) 
    98  
     102            self.send("Regressor",None) 
     103            self.send("Regression Tree", None) 
    99104 
    100105if __name__=="__main__": 
  • orange/OrangeWidgets/Regression/OWRegressionTreeViewer2D.py

    r2013 r3476  
    11""" 
    2 <name> Regression Tree Viewer 2D</name> 
     2<name> Regression Tree Graph</name> 
    33<description>Regression tree viewer (graph view).</description> 
    4 <icon>icons/RegressionTreeViewer2D.png</icon> 
     4<icon>icons/RegressionTreeGraph.png</icon> 
    55<contact>Ales Erjavec (ales.erjavec(@at@)fri.uni-lj.si)</contact>  
    6 <priority>2120</priority> 
     6<priority>2110</priority> 
    77""" 
    88from OWTreeViewer2D import * 
     
    2626        self.addTextLine(self.name, None, False) 
    2727        self.textind=[] 
    28         self.rule=(isinstance(self.parent, QCanvasRectangle) and self.parent.rule+[(self.parent.tree.branchSelector.classVar, attrVal)]) or [] 
     28        self.rule=(isinstance(self.parent, QCanvasRectangle) and \ 
     29                   self.parent.rule+[(self.parent.tree.branchSelector.classVar, attrVal)]) or [] 
    2930        self.textAdvance=15 
    3031 
     
    150151        self.navWidget.resize(400,400) 
    151152        self.navWidget.setCaption("Qt Navigator") 
    152         OWGUI.button(self.TreeTab,self,"Navigator",self.toggleNavigator) 
    153153        self.setMouseTracking(True) 
    154154 
    155155        nodeInfoBox = QVButtonGroup("Show Info On", self.NodeTab) 
    156         nodeInfoButtons = ['Predicted Value', 'Variance', 'Deviance', ' Error', 'Number of Instances'] 
     156        nodeInfoButtons = ['Predicted value', 'Variance', 'Deviance', 'Error', 'Number of instances'] 
    157157        nodeInfoSettings = ['maj', 'majp', 'tarp', 'error', 'inst'] 
    158158        self.NodeInfoW = []; self.dummy = 0 
     
    163163            self.NodeInfoW.append(w) 
    164164 
    165         OWGUI.comboBox(self.NodeTab, self, 'NodeColorMethod', items=['Default', 'Instances in Node', 'Variance', 'Deviance', 'Error'], box='Node Color',                             
     165        OWGUI.comboBox(self.NodeTab, self, 'NodeColorMethod', items=['Default', 'Instances in node', 'Variance', 'Deviance', 'Error'], box='Node Color',                             
    166166                                callback=self.toggleNodeColor) 
    167167         
Note: See TracChangeset for help on using the changeset viewer.