Commits

Miha Stajdohar committed 33b9ee3 Merge

Merged.

Comments (0)

Files changed (2)

Orange/OrangeWidgets/Data/OWPaintData.py

             return
         # if we start updating from previously undone actions, we cut off redos in our history
         if not self.historyCounter == len(self.dataHistory)-1:
-            self.dataHistory = self.dataHistory[0:self.historyCounter+1]
+            self.dataHistory = self.dataHistory[:self.historyCounter+1]
         # append an update of labels and data
         labels = list(self.classValuesModel)
         self.dataHistory.append((copy.deepcopy(self.graph.data), labels))
                 self.addNewClassLabel()
             # if not, update data
             else:
-                self.graph.data = data
+                self.graph.data = copy.deepcopy(data)
                 self.graph.updateGraph()
             self.updateHistoryBool = True
 
             elif len(self.classValuesModel) < len(labels):
                 self.addNewClassLabel()
             else:
-                self.graph.data = data
+                self.graph.data = copy.deepcopy(data)
                 self.graph.updateGraph()
             self.updateHistoryBool = True
 

Orange/data/discretization.py

 
 from Orange.core import\
     EquiNDiscretization as EqualFreq,\
+    EquiDistDiscretization as EqualWidth,\
+    EntropyDiscretization as Entropy,\
     BiModalDiscretization as BiModal,\
     Preprocessor_discretize