Commits

Miran Levar committed ea03db0 Merge

Trivial merge

  • Participants
  • Parent commits 5aa0dea, dbaf145

Comments (0)

Files changed (4)

File Orange/OrangeWidgets/Classify/OWITree.py

 
 from OWItemModels import VariableListModel
 
+import Orange
+
 class FixedTreeLearner(orange.Learner):
     def __init__(self, classifier, name):
         self.classifier = classifier
 
     def __init__(self,parent = None, signalManager = None):
         OWClassificationTreeViewer.__init__(self, parent, signalManager, 'I&nteractive Tree Builder')
-        self.inputs = [("Data", ExampleTable, self.setData), ("Tree Learner", orange.Learner, self.setLearner)]
-        self.outputs = [("Data", ExampleTable), ("Classifier", orange.TreeClassifier), ("Tree Learner", orange.Learner)]
+        self.inputs = [("Data", ExampleTable, self.setData),
+                       ("Tree Learner", orange.Learner, self.setLearner)]
+        
+        self.outputs = [("Data", ExampleTable),
+                        ("Classifier", Orange.classification.tree.TreeClassifier),
+                        ("Tree Learner", orange.Learner)]
 
         self.attridx = 0
         self.cutoffPoint = 0.0

File Orange/OrangeWidgets/OWTreeViewer2D.py

 import orange, orngTree, OWGUI, OWColorPalette
 from OWWidget import *
 
+import Orange
+
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
         self.root = None
         self.selectedNode = None
 
-        self.inputs = [("Classification Tree", orange.TreeClassifier, self.ctree)]
+        self.inputs = [("Classification Tree", Orange.classification.tree.TreeClassifier, self.ctree)]
         self.outputs = [("Examples", ExampleTable)]
 
         #set default settings

File Orange/OrangeWidgets/Prototypes/OWGroupBy.py

         self.aggregate_view.setDragDropMode(QListView.DragDrop)
         self.aggregate_view.setItemDelegate(self.aggregate_delegate)
         self.aggregate_view.setModel(self.aggregate_list)
-        self.aggregate_view.setEditTriggers(QListView.SelectedClicked)
+        self.aggregate_view.setEditTriggers(QListView.DoubleClicked | QListView.EditKeyPressed)
 #        self.aggregate_view.setDragDropOverwriteMode(False)
         self.aggregate_view.setDefaultDropAction(Qt.MoveAction)
         self.aggregate_view.viewport().setAcceptDrops(True)

File Orange/OrangeWidgets/Prototypes/OWRandomForestOld.py

 from exceptions import Exception
 from orngWrap import PreprocessedLearner
 
+import Orange
+
 class OWRandomForestOld(OWWidget):
     settingsList = ["name", "trees", "attributes", "attributesP", "preNodeInst", "preNodeInstP", "limitDepth", "limitDepthP", "rseed", "outtree" ]
 
     def __init__(self, parent=None, signalManager = None, name='Random Forest'):
         OWWidget.__init__(self, parent, signalManager, name, wantMainArea=False, resizingEnabled=False)
 
-        self.inputs = [("Data", ExampleTable, self.setData), ("Preprocess", PreprocessedLearner, self.setPreprocessor)]
-        self.outputs = [("Learner", orange.Learner),("Random Forest Classifier", orange.Classifier),("Selected Tree", orange.TreeClassifier) ]
+        self.inputs = [("Data", ExampleTable, self.setData),
+                       ("Preprocess", PreprocessedLearner, self.setPreprocessor)]
+        self.outputs = [("Learner", orange.Learner),
+                        ("Random Forest Classifier", orange.Classifier),
+                        ("Selected Tree", Orange.classification.tree.TreeClassifier)]
 
         self.name = 'Random Forest'
         self.trees = 10