Changeset 10860:44fb1a39ded6 in orange

Timestamp:

05/07/12 13:40:41 (14 months ago)

Author:

mstajdohar

Branch:

default

rebase_source:

796478979ddab536f07ba9b90d4f4ff9e3170605

Message:

Fixed some errors.

Location:

Orange/OrangeWidgets

Files:

• OWNetworkHist.py (modified) (14 diffs)
• OWNxHist.py (modified) (1 diff)

Orange/OrangeWidgets/OWNetworkHist.py

@@ -13 +13 @@
 
 class OWNetworkHist():
-    
+
     def __init__(self, parent=None, type=0):
         self.parent = parent
-        
+
     def addHistogramControls(self, parent=None):
         # set default settings
@@ -30 +30 @@
         self.excludeLimit = 1
         self.percentil = 0
-        
+
         if parent is None:
             parent = self.controlArea
-            
-        boxGeneral = OWGUI.widgetBox(parent, box = "Distance boundaries")
-        
+
+        boxGeneral = OWGUI.widgetBox(parent, box="Distance boundaries")
+
         OWGUI.lineEdit(boxGeneral, self, "spinLowerThreshold", "Lower:", orientation='horizontal', callback=self.changeLowerSpin, valueType=float)
         OWGUI.lineEdit(boxGeneral, self, "spinUpperThreshold", "Upper:", orientation='horizontal', callback=self.changeUpperSpin, valueType=float)
-        ribg = OWGUI.radioButtonsInBox(boxGeneral, self, "andor", [], orientation='horizontal', callback = self.generateGraph)
-        OWGUI.appendRadioButton(ribg, self, "andor", "OR", callback = self.generateGraph)
-        b = OWGUI.appendRadioButton(ribg, self, "andor", "AND", callback = self.generateGraph)
+        ribg = OWGUI.radioButtonsInBox(boxGeneral, self, "andor", [], orientation='horizontal', callback=self.generateGraph)
+        OWGUI.appendRadioButton(ribg, self, "andor", "OR", callback=self.generateGraph)
+        b = OWGUI.appendRadioButton(ribg, self, "andor", "AND", callback=self.generateGraph)
         b.setEnabled(False)
         OWGUI.spin(boxGeneral, self, "kNN", 0, 1000, 1, label="kNN:", orientation='horizontal', callback=self.generateGraph)
         OWGUI.doubleSpin(boxGeneral, self, "percentil", 0, 100, 0.1, label="Percentil:", orientation='horizontal', callback=self.setPercentil, callbackOnReturn=1)
-        
+
         # Options
         self.attrColor = ""
-        ribg = OWGUI.radioButtonsInBox(parent, self, "netOption", [], "Options", callback = self.generateGraph)
-        OWGUI.appendRadioButton(ribg, self, "netOption", "All vertices", callback = self.generateGraph)
-        OWGUI.appendRadioButton(ribg, self, "netOption", "Exclude small components", callback = self.generateGraph)
-        OWGUI.spin(OWGUI.indentedBox(ribg), self, "excludeLimit", 1, 100, 1, label="Less vertices than: ", callback = (lambda h=True: self.generateGraph(h)))
-        OWGUI.appendRadioButton(ribg, self, "netOption", "Largest connected component only", callback = self.generateGraph)
+        ribg = OWGUI.radioButtonsInBox(parent, self, "netOption", [], "Options", callback=self.generateGraph)
+        OWGUI.appendRadioButton(ribg, self, "netOption", "All vertices", callback=self.generateGraph)
+        OWGUI.appendRadioButton(ribg, self, "netOption", "Exclude small components", callback=self.generateGraph)
+        OWGUI.spin(OWGUI.indentedBox(ribg), self, "excludeLimit", 1, 100, 1, label="Less vertices than: ", callback=(lambda h=True: self.generateGraph(h)))
+        OWGUI.appendRadioButton(ribg, self, "netOption", "Largest connected component only", callback=self.generateGraph)
         OWGUI.appendRadioButton(ribg, self, "netOption", "Connected component with vertex")
         self.attribute = None
-        self.attributeCombo = OWGUI.comboBox(ribg, self, "attribute", box = "Filter attribute")#, callback=self.setVertexColor)
-        
-        ribg = OWGUI.radioButtonsInBox(parent, self, "dstWeight", [], "Distance -> Weight", callback = self.generateGraph)
-        OWGUI.appendRadioButton(ribg, self, "dstWeight", "Weight := distance", callback = self.generateGraph)
-        OWGUI.appendRadioButton(ribg, self, "dstWeight", "Weight := 1 - distance", callback = self.generateGraph)
-        
+        self.attributeCombo = OWGUI.comboBox(ribg, self, "attribute", box="Filter attribute")#, callback=self.setVertexColor)
+
+        ribg = OWGUI.radioButtonsInBox(parent, self, "dstWeight", [], "Distance -> Weight", callback=self.generateGraph)
+        OWGUI.appendRadioButton(ribg, self, "dstWeight", "Weight := distance", callback=self.generateGraph)
+        OWGUI.appendRadioButton(ribg, self, "dstWeight", "Weight := 1 - distance", callback=self.generateGraph)
+
         self.label = ''
         self.searchString = OWGUI.lineEdit(self.attributeCombo.box, self, "label", callback=self.setSearchStringTimer, callbackOnType=True)
         self.searchStringTimer = QTimer(self)
         self.connect(self.searchStringTimer, SIGNAL("timeout()"), self.generateGraph)
-        
+
         if str(self.netOption) != '3':
             self.attributeCombo.box.setEnabled(False)
-            
+
     def setPercentil(self):
         self.spinLowerThreshold = self.histogram.minValue
         net = orngNetwork.Network(self.matrix.dim, 0)
-        lower, upper = net.getDistanceMatrixThreshold(self.matrix, self.percentil/100)
+        lower, upper = net.getDistanceMatrixThreshold(self.matrix, self.percentil / 100)
         self.spinUpperThreshold = upper
         self.generateGraph()
-        
+
     def enableAttributeSelection(self):
         self.attributeCombo.box.setEnabled(True)
-        
+
     def setSearchStringTimer(self):
         self.searchStringTimer.stop()
@@ -84 +84 @@
     def setMatrix(self, data):
         if data == None: return
-        
+
         self.matrix = data
         # draw histogram
@@ -91 +91 @@
         #print "values:",values
         self.histogram.setValues(values)
-        
+
         low = min(values)
         upp = max(values)
@@ -100 +100 @@
         if (self.matrix != None):
             if hasattr(self.matrix, "items"):
-                 
+
                 if isinstance(self.matrix.items, orange.ExampleTable):
                     vars = list(self.matrix.items.domain.variables)
-                
+
                     metas = self.matrix.items.domain.getmetas(0)
                     for i, var in metas.iteritems():
                         vars.append(var)
-                        
+
         self.icons = self.createAttributeIconDict()
-                     
+
         for var in vars:
             try:
                 self.attributeCombo.addItem(self.icons[var.varType], unicode(var.name))
             except:
-                print "error adding ", var, " to the attribute combo"
+                print "Error adding ", var, " to the attribute combo."
 
     def changeLowerSpin(self):
         self.percentil = 0
-        
+
         if self.spinLowerThreshold < self.histogram.minValue:
             self.spinLowerThreshold = self.histogram.minValue
         elif self.spinLowerThreshold > self.histogram.maxValue:
             self.spinLowerThreshold = self.histogram.maxValue
-            
+
         if self.spinLowerThreshold >= self.spinUpperThreshold:
             self.spinUpperThreshold = self.spinLowerThreshold
-            
-        self.generateGraph()
-        
+
+        self.generateGraph()
+
     def changeUpperSpin(self):
         self.percentil = 0
-        
+
         if self.spinUpperThreshold < self.histogram.minValue:
             self.spinUpperThreshold = self.histogram.minValue
         elif self.spinUpperThreshold > self.histogram.maxValue:
             self.spinUpperThreshold = self.histogram.maxValue
-            
+
         if self.spinUpperThreshold <= self.spinLowerThreshold:
             self.spinLowerThreshold = self.spinUpperThreshold
-        
-        self.generateGraph()
-        
-    def generateGraph(self, N_changed = False):
+
+        self.generateGraph()
+
+    def generateGraph(self, N_changed=False):
         self.searchStringTimer.stop()
         self.attributeCombo.box.setEnabled(False)
@@ -148 +148 @@
         matrix = None
         self.warning('')
-        
+
         if N_changed:
             self.netOption = 1
-            
+
         if self.matrix == None:
             self.infoa.setText("No data loaded.")
             self.infob.setText("")
             return
-        
+
         #print len(self.histogram.yData), len(self.histogram.xData)
-        nEdgesEstimate = 2 * sum([self.histogram.yData[i] for i,e in enumerate(self.histogram.xData) if self.spinLowerThreshold <= e <= self.spinUpperThreshold])
-        
+        nEdgesEstimate = 2 * sum([self.histogram.yData[i] for i, e in enumerate(self.histogram.xData) if self.spinLowerThreshold <= e <= self.spinUpperThreshold])
+
         if nEdgesEstimate > 200000:
             self.graph = None
@@ -168 +168 @@
             graph = orngNetwork.Network(self.matrix.dim, 0)
             matrix = self.matrix
-            
-            if hasattr(self.matrix, "items"):               
+
+            if hasattr(self.matrix, "items"):
                 if type(self.matrix.items) == orange.ExampleTable:
                     #graph.setattr("items", self.data.items)
@@ -178 +178 @@
                     #graph.setattr("items", list(items))
                     graph.items = list(items)
-                
+
             # set the threshold
             # set edges where distance is lower than threshold
-                  
+
             self.warning(0)
             if self.kNN >= self.matrix.dim:
@@ -187 +187 @@
             nedges = graph.fromDistanceMatrix(self.matrix, self.spinLowerThreshold, self.spinUpperThreshold, min(self.kNN, self.matrix.dim - 1), self.andor)
             edges = graph.getEdges()
-            
+
             #print graph.nVertices, self.matrix.dim
-            
+
             if self.dstWeight == 1:
                 if graph.directed:
-                    for u,v in edges:
+                    for u, v in edges:
                         foo = 1
-                        if str(graph[u,v]) != "0":
-                            foo = 1.0 - float(graph[u,v])
-                        
-                        graph[u,v] = foo
-                else:
-                    for u,v in edges:
+                        if str(graph[u, v]) != "0":
+                            foo = 1.0 - float(graph[u, v])
+
+                        graph[u, v] = foo
+                else:
+                    for u, v in edges:
                         if u <= v:
                             foo = 1
-                            if str(graph[u,v]) != "0":
-                                foo = 1.0 - float(graph[u,v])
-                            
-                            graph[u,v] = foo
-                    
+                            if str(graph[u, v]) != "0":
+                                foo = 1.0 - float(graph[u, v])
+
+                            graph[u, v] = foo
+
             n = len(edges)
             #print 'self.netOption',self.netOption
@@ -213 +213 @@
                 components = [x for x in graph.getConnectedComponents() if len(x) > self.excludeLimit]
                 if len(components) > 0:
-                    include = reduce(lambda x,y: x+y, components)
+                    include = reduce(lambda x, y: x + y, components)
                     if len(include) > 1:
                         self.graph = orngNetwork.Network(graph.getSubGraph(include))
@@ -240 +240 @@
                 if self.attributeCombo.currentText() != '' and self.label != '':
                     components = graph.getConnectedComponents()
-                        
+
                     txt = self.label.lower()
                     #print 'txt:',txt
@@ -252 +252 @@
                                     if len(component) > 0:
                                         vertices.extend(component)
-                                        
+
                         if len(vertices) > 0:
                             #print "n vertices:", len(vertices), "n set vertices:", len(set(vertices))
@@ -260 +260 @@
             else:
                 self.graph = graph
-        
+
         if matrix != None:
-            matrix.items  = self.graph.items
+            matrix.items = self.graph.items
             self.graph_matrix = matrix
-            
+
         self.pconnected = nedges
         self.nedges = n
@@ -273 +273 @@
         if hasattr(self, "infoc"):
             self.infoc.setText("%d edges (%d average)" % (n, n / float(self.matrix.dim)))
-        
+
         #print 'self.graph:',self.graph+
         if hasattr(self, "sendSignals"):
             self.sendSignals()
-        
+
         self.histogram.setBoundary(self.spinLowerThreshold, self.spinUpperThreshold)

Orange/OrangeWidgets/OWNxHist.py

@@ -131 +131 @@
         for var in vars:
             try:
-                self.attributeCombo.addItem(self.icons[var.varType], unicode(var.name))
+                if var.varType != 7: # if not Orange.feature.Python
+                    self.attributeCombo.addItem(self.icons[var.varType], unicode(var.name))
             except:
-                print "error adding ", var, " to the attribute combo"
+                print "Error adding", var, "to the attribute combo."
 
         self.setPercentil()