From ba85356ef9c973340d6f3869730e1ef6ab0d927a Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Fri, 20 Oct 2023 13:22:58 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D1=80?= =?UTF-8?q?=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20?= =?UTF-8?q?=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- statapp/calculations.py | 25 ++++++---------- statapp/linear_polynom_window.py | 8 ++--- statapp/main_window.py | 10 +++---- statapp/mathtex_header_view.py | 6 ++++ ...om_model.py => regression_result_model.py} | 13 +++++---- statapp/models/squared_polynom_model.py | 29 ------------------- statapp/squared_polynom_window.py | 11 ++----- statapp/ui/linear_polynom_window.ui | 12 +++++++- statapp/ui/ui_linear_polynom_window.py | 3 ++ 9 files changed, 48 insertions(+), 69 deletions(-) rename statapp/models/{linear_polynom_model.py => regression_result_model.py} (77%) delete mode 100644 statapp/models/squared_polynom_model.py diff --git a/statapp/calculations.py b/statapp/calculations.py index 255c564..a16d41a 100644 --- a/statapp/calculations.py +++ b/statapp/calculations.py @@ -21,7 +21,7 @@ from dataclasses import dataclass import numpy as np import pandas as pd -from statapp._vendor.multipolyfit import multipolyfit +from statapp._vendor.multipolyfit import multipolyfit, getTerms DIRECT_LINK = 0 INDIRECT_LINK = 1 @@ -59,15 +59,18 @@ def varianceAnalysis(data): def correlationAnalysis(data): return pd.DataFrame(data).corr().to_numpy() + @dataclass() class RegressionResult: """ Attributes: - paramsAndImportance (np.ndarray): Параметры модели + paramsAndImportance (np.ndarray): Параметры модели. Первая колонка - residualVariance (np.float64): Остаточная дисперсия + monomials (list): Список одночленов в строковом виде без коэффициентов. Свободный член - c """ paramsAndImportance: np.ndarray residualVariance: np.float64 + monomials: list def linearPolynom(inputData) -> RegressionResult: @@ -94,20 +97,10 @@ def linearPolynom(inputData) -> RegressionResult: return RegressionResult( out.to_numpy(), - np.float64(mse[0]) + np.float64(mse[0]), + ['c'] + [f'x{i}' for i in range(1, len(params))] ) -@dataclass() -class ExtendedRegressionResult: - """ - Attributes: - paramsAndImportance (np.ndarray): Параметры модели - residualVariance (np.float64): Остаточная дисперсия - """ - paramsAndImportance: np.ndarray - residualVariance: np.float64 - powers: list - def squaredPolynom(inputData): x = inputData[:, 1:] @@ -119,8 +112,8 @@ def squaredPolynom(inputData): out[0] = betas out[1] = tStatistics - return ExtendedRegressionResult( + return RegressionResult( out.to_numpy(), np.float64(mse[0]), - powers + ['c' if str(x) == '1' else str(x) for x in getTerms(powers)] ) diff --git a/statapp/linear_polynom_window.py b/statapp/linear_polynom_window.py index 45a9fed..fc7b09e 100644 --- a/statapp/linear_polynom_window.py +++ b/statapp/linear_polynom_window.py @@ -21,7 +21,7 @@ from PySide2.QtWidgets import QDialog, QHeaderView from statapp.calculations import linearPolynom from statapp.mathtex_header_view import MathTexHeaderView -from statapp.models.linear_polynom_model import LinearPolynomModel +from statapp.models.regression_result_model import RegressionResultModel from statapp.ui.ui_linear_polynom_window import Ui_LinearPolynomWindow from statapp.utils import addIcon @@ -35,11 +35,9 @@ class LinearPolynomWindow(QDialog): result = linearPolynom(data) - self.model = LinearPolynomModel(result.paramsAndImportance.round(2)) + self.model = RegressionResultModel(result) self.ui.tableView.setModel(self.model) - self.ui.tableView.setVerticalHeader( - MathTexHeaderView(self.ui.tableView) - ) + self.ui.tableView.setVerticalHeader(MathTexHeaderView(self.ui.tableView)) header = self.ui.tableView.horizontalHeader() header.setSectionResizeMode(QHeaderView.ResizeMode.Stretch) diff --git a/statapp/main_window.py b/statapp/main_window.py index 67b520b..8f1c5a5 100644 --- a/statapp/main_window.py +++ b/statapp/main_window.py @@ -70,11 +70,11 @@ class MainWindow(QMainWindow): self.updateActionsEnabled() # # Для быстрой отладки - # n = 10 - # y = generateYValues(100, 5, n) - # x1 = generateXValues(20, 2, 0, y) - # x2 = generateXValues(10, 1, 0, y) - # self.model.updateAllData(np.concatenate([y, x1, x2], axis=1)) + n = 10 + y = generateYValues(100, 5, n) + x1 = generateXValues(20, 2, 0, y) + x2 = generateXValues(10, 1, 0, y) + self.model.updateAllData(np.concatenate([y, x1, x2], axis=1)) def updateActionsEnabled(self): diff --git a/statapp/mathtex_header_view.py b/statapp/mathtex_header_view.py index 65c3c92..ee21a80 100644 --- a/statapp/mathtex_header_view.py +++ b/statapp/mathtex_header_view.py @@ -72,6 +72,12 @@ class CacheQPixMap(dict): class MathTexHeaderView(QHeaderView): def __init__(self, view, orientation=QtCore.Qt.Vertical): super().__init__(orientation, view) + + if orientation == QtCore.Qt.Vertical: + self.setStyleSheet( + "QHeaderView::section { padding-left: 15px; padding-right: 15px }" + ) + self.converter = CacheQPixMap() def paintSection(self, painter, rect, logicalIndex): diff --git a/statapp/models/linear_polynom_model.py b/statapp/models/regression_result_model.py similarity index 77% rename from statapp/models/linear_polynom_model.py rename to statapp/models/regression_result_model.py index 40c224c..855ea8a 100644 --- a/statapp/models/linear_polynom_model.py +++ b/statapp/models/regression_result_model.py @@ -17,15 +17,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -from PySide2.QtCore import QModelIndex - +from statapp.calculations import RegressionResult from statapp.models.ro_table_model import ROTableModel -class LinearPolynomModel(ROTableModel): +class RegressionResultModel(ROTableModel): + def __init__(self, result: RegressionResult): + data = result.paramsAndImportance + super().__init__(data) + self._monomials = result.monomials + def getHorizontalHeader(self): return ['Коэффициент регрессии', 'Коэффициент значимости'] def getVerticalHeader(self): - count = (self.rowCount(QModelIndex())) - return ['c'] + [f'x{i}' for i in range(1, count)] + return self._monomials diff --git a/statapp/models/squared_polynom_model.py b/statapp/models/squared_polynom_model.py deleted file mode 100644 index 66b84f7..0000000 --- a/statapp/models/squared_polynom_model.py +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (c) 2023 Maxim Slipenko, Eugene Lazurenko. -# -# This file is part of Statapp -# (see https://github.com/shizand/statapp). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -from statapp._vendor.multipolyfit import getTerms -from statapp.models.linear_polynom_model import LinearPolynomModel - - -class SquaredPolynomModel(LinearPolynomModel): - powers: list - - def getVerticalHeader(self): - return ['c' if str(x) == '1' else str(x) for x in getTerms(self.powers)] diff --git a/statapp/squared_polynom_window.py b/statapp/squared_polynom_window.py index fe640a5..37475b1 100644 --- a/statapp/squared_polynom_window.py +++ b/statapp/squared_polynom_window.py @@ -21,10 +21,11 @@ from PySide2.QtWidgets import QDialog, QHeaderView from statapp.calculations import squaredPolynom from statapp.mathtex_header_view import MathTexHeaderView -from statapp.models.squared_polynom_model import SquaredPolynomModel +from statapp.models.regression_result_model import RegressionResultModel from statapp.ui.ui_squared_polynom_window import Ui_SquaredPolynomWindow from statapp.utils import addIcon + class SquaredPolynomWindow(QDialog): def __init__(self, data): super().__init__() @@ -34,15 +35,9 @@ class SquaredPolynomWindow(QDialog): result = squaredPolynom(data) - # Не округляем, т.к. может получиться коэффициент = 0 и значимый (t-критерий) - self.model = SquaredPolynomModel(result.paramsAndImportance) - self.model.powers = result.powers - # self.ui.tableView.setItemDelegate(TermItemDelegate()) + self.model = RegressionResultModel(result) self.ui.tableView.setModel(self.model) self.ui.tableView.setVerticalHeader(MathTexHeaderView(self.ui.tableView)) - - # x = h.indexWidget(h.model().index(0, 0)) - header = self.ui.tableView.horizontalHeader() header.setSectionResizeMode(QHeaderView.ResizeMode.Stretch) diff --git a/statapp/ui/linear_polynom_window.ui b/statapp/ui/linear_polynom_window.ui index 09e0768..75cf5f3 100644 --- a/statapp/ui/linear_polynom_window.ui +++ b/statapp/ui/linear_polynom_window.ui @@ -17,7 +17,17 @@ - + + + 40 + + + 40 + + + 40 + + diff --git a/statapp/ui/ui_linear_polynom_window.py b/statapp/ui/ui_linear_polynom_window.py index 254cb4e..9d76bac 100644 --- a/statapp/ui/ui_linear_polynom_window.py +++ b/statapp/ui/ui_linear_polynom_window.py @@ -44,6 +44,9 @@ class Ui_LinearPolynomWindow(object): self.gridLayout.setObjectName(u"gridLayout") self.tableView = QTableView(LinearPolynomWindow) self.tableView.setObjectName(u"tableView") + self.tableView.horizontalHeader().setMinimumSectionSize(40) + self.tableView.verticalHeader().setMinimumSectionSize(40) + self.tableView.verticalHeader().setDefaultSectionSize(40) self.gridLayout.addWidget(self.tableView, 0, 0, 1, 1)