diff --git a/src/stats.py b/src/stats.py index 2740126..24f9a5c 100644 --- a/src/stats.py +++ b/src/stats.py @@ -69,6 +69,7 @@ def run_group_changed(self, rg_index): self.runs.append(run) params = self.get_params(self.runs[0]) + params['Feature significance'] = False if params['Distance measure'] is not 'Minkowski2' else params['Feature significance'] self.window.label_dataset.setText(params['Dataset']) opt_config = core.Config(params) self.window.label_classes.setText(str(opt_config.dataset.params['Classes'])) @@ -87,7 +88,8 @@ def populate_table(self): cls_sum=0 dist_sum=[] dist_cnt=[] - for row, run in enumerate(self.runs): + runs_by_name = sorted(self.runs, key=lambda run: run['name']) + for row, run in enumerate(runs_by_name): colormap = run['colormaps'][-1] l_counts = [colormap.count(x) for x in set(colormap)] @@ -117,7 +119,7 @@ def populate_table(self): elif col == 3: item = QTableWidgetItem('%.4f' % (1 / conf.dataset.getOptimalFitness(conf))) elif col == 4: - item = QTableWidgetItem('%.4f' % run['measures'][-1][5]) + item = QTableWidgetItem('%.4f' % (1 / run['measures'][-1][5])) elif col == 5: btn = QPushButton(self.table) btn.setText('Show') diff --git a/ui/gui.py b/ui/gui.py index b61436a..82d98e5 100644 --- a/ui/gui.py +++ b/ui/gui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'gui.ui' # -# Created: Thu Feb 12 20:35:04 2015 +# Created: Sat Feb 14 22:18:14 2015 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -243,6 +243,7 @@ def retranslateUi(self, MainWindow): self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_current), _translate("MainWindow", "Current Run", None)) self.label_2.setText(_translate("MainWindow", "Select result group", None)) self.datasetComboBox.setItemText(0, _translate("MainWindow", "---", None)) + self.table_results.setSortingEnabled(True) item = self.table_results.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name", None)) item = self.table_results.horizontalHeaderItem(1) @@ -252,9 +253,9 @@ def retranslateUi(self, MainWindow): item.setText(_translate("MainWindow", "DDist", None)) item.setToolTip(_translate("MainWindow", "

Detected distribution of classes

", None)) item = self.table_results.horizontalHeaderItem(3) - item.setText(_translate("MainWindow", "OFit", None)) + item.setText(_translate("MainWindow", "Oindex", None)) item = self.table_results.horizontalHeaderItem(4) - item.setText(_translate("MainWindow", "DFit", None)) + item.setText(_translate("MainWindow", "Dindex", None)) item.setToolTip(_translate("MainWindow", "Best detected fitness", None)) item = self.table_results.horizontalHeaderItem(5) item.setText(_translate("MainWindow", "Details", None)) diff --git a/ui/gui.ui b/ui/gui.ui index 0c4673f..aba36e4 100644 --- a/ui/gui.ui +++ b/ui/gui.ui @@ -366,6 +366,9 @@ 381 + + true + Name @@ -389,12 +392,12 @@ - OFit + Oindex - DFit + Dindex Best detected fitness