diff --git a/src/backend/hypothesis_test/HypothesisTest.cpp b/src/backend/hypothesis_test/HypothesisTest.cpp index 2dbb51588..347fc06c4 100644 --- a/src/backend/hypothesis_test/HypothesisTest.cpp +++ b/src/backend/hypothesis_test/HypothesisTest.cpp @@ -1,648 +1,720 @@ /*************************************************************************** File : HypothesisTest.cpp Project : LabPlot Description : Doing Hypothesis-Test on data provided -------------------------------------------------------------------- Copyright : (C) 2019 Devanshu Agarwal(agarwaldevanshu8@gmail.com) ***************************************************************************/ /*************************************************************************** * * * 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 2 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, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * ***************************************************************************/ #include "HypothesisTest.h" #include "HypothesisTestPrivate.h" #include "kdefrontend/hypothesis_test/HypothesisTestView.h" #include "backend/spreadsheet/Spreadsheet.h" #include "backend/core/column/Column.h" #include "backend/lib/macros.h" #include "QDebug" extern "C" { #include "backend/nsl/nsl_stats.h" } #include #include #include #include #include #include +#include +#include HypothesisTest::HypothesisTest(const QString &name) : AbstractPart(name), d(new HypothesisTestPrivate(this)) { } HypothesisTest::~HypothesisTest() { delete d; } QAbstractItemModel* HypothesisTest::dataModel() { return d->dataModel; } QAbstractItemModel* HypothesisTest::horizontalHeaderModel() { return d->horizontalHeaderModel; } +QAbstractItemModel* HypothesisTest::verticalHeaderModel() { + return d->verticalHeaderModel; +} + +QAbstractItemModel* HypothesisTest::resultModel() { + return d->resultModel; +} + + void HypothesisTest::setDataSourceType(DataSourceType type) { if (type != d->dataSourceType) { d->dataSourceType = type; } } void HypothesisTest::setDataSourceSpreadsheet(Spreadsheet *spreadsheet) { if (spreadsheet != d->dataSourceSpreadsheet) d->setDataSourceSpreadsheet(spreadsheet); } -QStringList HypothesisTest::allColumns() -{ +QStringList HypothesisTest::allColumns() { return d->all_columns; } +HypothesisTest::TailType HypothesisTest::tailType() { + return d->tail_type; +} + +void HypothesisTest::setTailType(HypothesisTest::TailType tailType) { + d->tail_type = tailType; +} + void HypothesisTest::setColumns(QVector cols) { d->m_columns = cols; } void HypothesisTest::setColumns(QStringList cols) { return d->setColumns(cols); } HypothesisTest::DataSourceType HypothesisTest::dataSourceType() const { return d->dataSourceType; } void HypothesisTest::performTwoSampleTTest() { } void HypothesisTest::performTwoSampleIndependetTTest(bool equal_variance) { - d->performTwoSampleIndependetTest("ttest", equal_variance); + d->performTwoSampleIndependetTest(HypothesisTestPrivate::TestT, equal_variance); } void HypothesisTest::performTwoSamplePairedTTest() { - d->performTwoSamplePairedTest("ttest"); + d->performTwoSamplePairedTest(HypothesisTestPrivate::TestT); } void HypothesisTest::PerformOneSampleTTest() { - d->PerformOneSampleTest("ttest"); + d->PerformOneSampleTest(HypothesisTestPrivate::TestT); } void HypothesisTest::performTwoSampleIndependetZTest() { - d->performTwoSampleIndependetTest("ztest"); + d->performTwoSampleIndependetTest(HypothesisTestPrivate::TestZ); } void HypothesisTest::performTwoSamplePairedZTest() { - d->performTwoSamplePairedTest("ztest"); + d->performTwoSamplePairedTest(HypothesisTestPrivate::TestZ); } void HypothesisTest::PerformOneSampleZTest() { - d->PerformOneSampleTest("ztest"); + d->PerformOneSampleTest(HypothesisTestPrivate::TestZ); } - - QString HypothesisTest::testName() { return d->m_currTestName; } /****************************************************************************** * Private Implementations * ****************************************************************************/ HypothesisTestPrivate::HypothesisTestPrivate(HypothesisTest* owner) : q(owner) , dataModel(new QStandardItemModel) , - horizontalHeaderModel(new QStandardItemModel) { + horizontalHeaderModel(new QStandardItemModel) , + verticalHeaderModel(new QStandardItemModel) , + resultModel(new QStandardItemModel) { } HypothesisTestPrivate::~HypothesisTestPrivate() { } void HypothesisTestPrivate::setDataSourceSpreadsheet(Spreadsheet *spreadsheet) { dataSourceSpreadsheet = spreadsheet; //setting rows and columns count; m_rowCount = dataSourceSpreadsheet->rowCount(); m_columnCount = dataSourceSpreadsheet->columnCount(); for (auto* col : dataSourceSpreadsheet->children()) { all_columns << col->name(); } } void HypothesisTestPrivate::setColumns(QStringList cols) { m_columns.clear(); Column* column = new Column("column"); for (QString col : cols) { if (col != "") { column = dataSourceSpreadsheet->column(col); -// qDebug() << "col is " << col; m_columns.append(column); } } } -void HypothesisTestPrivate::performTwoSampleIndependetTest(QString test, bool equal_variance) { - dataModel->clear(); - horizontalHeaderModel->clear(); - if (test == "ttest") - m_currTestName = i18n("Two Sample Independent T Test"); - if (test == "ztest") - m_currTestName = i18n("Two Sample Independent Z Test"); +/**************************Two Sample Independent *************************************/ - qDebug() << "performing two sample independent T test"; +void HypothesisTestPrivate::performTwoSampleIndependetTest(Test test, bool equal_variance) { + dataModel->clear(); + horizontalHeaderModel->clear(); QMessageBox* msg_box = new QMessageBox(); // checking for cols; if (m_columns.size() != 2) { msg_box->setText(i18n("Inappropriate number of columns selected")); msg_box->exec(); return; } bool modeOk = true; - bool allColumnsValid = true; for (int i = 0; i < 2; i++) { if(m_columns[i]->columnMode() == AbstractColumn::Numeric || m_columns[i]->columnMode() == AbstractColumn::Integer) continue; modeOk = false; } - if(!allColumnsValid) { - msg_box->setText(i18n("one of the selected columns is invalid")); - msg_box->exec(); - return; - } - if (!modeOk) { msg_box->setText(i18n("select only columns with numbers")); msg_box->exec(); return; } int n[2]; double sum[2], mean[2], std[2]; for (int i = 0; i < 2; i++) { findStats(m_columns[i], n[i], sum[i], mean[i], std[i]); if (n[i] < 1) { msg_box->setText(i18n("atleast one of selected column is empty")); msg_box->exec(); return; } } - if (test == "ttest") { - dataModel->setRowCount(1); - dataModel->setColumnCount(3); + dataModel->setRowCount(2); + dataModel->setColumnCount(3); + horizontalHeaderModel->setColumnCount(3); + verticalHeaderModel->setRowCount(2); - horizontalHeaderModel->setColumnCount(3); + for (int i = 0; i < 2; i++) { + dataModel->setItem(i, 0, new QStandardItem(QString::number(n[i]))); + dataModel->setItem(i, 1, new QStandardItem(QString::number(mean[i]))); + dataModel->setItem(i, 2, new QStandardItem(QString::number(std[i]))); + } + horizontalHeaderModel->setHeaderData(0, Qt::Horizontal, "N"); + horizontalHeaderModel->setHeaderData(1, Qt::Horizontal, "Mean"); + horizontalHeaderModel->setHeaderData(2, Qt::Horizontal, "StDev"); + +// qDebug() << " number of sections is " << verticalHeaderModel->cou + verticalHeaderModel->setHeaderData(0, Qt::Vertical, m_columns[0]->name()); + verticalHeaderModel->setHeaderData(1, Qt::Vertical, m_columns[1]->name()); + + if (test == TestT) { + m_currTestName = i18n("Two Sample Independet T Test for %1 vs %2", m_columns[0]->name(), m_columns[1]->name()); double t; int df; if (equal_variance) { df = n[0] + n[1] - 2; //Assuming equal variance double sp = qSqrt( ((n[0]-1)*qPow(std[0],2) + (n[1]-1)*qPow(std[1],2))/df); t = (mean[0] - mean[1])/(sp*qSqrt(1.0/n[0] + 1.0/n[1])); } else { double temp; temp = qPow( qPow(std[0], 2)/n[0] + qPow(std[1], 2)/n[1], 2); temp = temp / ( (qPow( (qPow(std[0], 2)/n[0]), 2)/(n[0]-1)) + (qPow( (qPow(std[1], 2)/n[1]), 2)/(n[1]-1))); df = qRound(temp); t = (mean[0] - mean[1]) / (qSqrt( (qPow(std[0], 2)/n[0]) + (qPow(std[1], 2)/n[1]))); } - // now finding p value from t value - double p_value = nsl_stats_tdist_p(t, df); + double p_value = 0; + if (tail_type == HypothesisTest::TailNegative) + p_value = nsl_stats_tdist_p(t, df); + else if (tail_type == HypothesisTest::TailPositive) { + t *= -1; + p_value = nsl_stats_tdist_p(t, df); + } else { + p_value = nsl_stats_tdist_p(t, df) + nsl_stats_tdist_p(-1*t, df); + } - // QString text = i18n("T value for test is %1 and\n p value is %2",t, p_value); - // msg_box->setText(text); - // msg_box->exec(); +// dataModel->setRowCount(1); +// dataModel->setColumnCount(3); - //setting dataModel - dataModel->setItem(0, 0, new QStandardItem(QString::number(t))); - dataModel->setItem(0, 1, new QStandardItem(QString::number(df))); - dataModel->setItem(0, 2, new QStandardItem(QString::number(p_value))); +// horizontalHeaderModel->setColumnCount(3); +// //setting dataModel +// dataModel->setItem(0, 0, new QStandardItem(QString::number(t))); +// dataModel->setItem(0, 1, new QStandardItem(QString::number(df))); +// dataModel->setItem(0, 2, new QStandardItem(QString::number(p_value))); - //setting horizontal header model - horizontalHeaderModel->setHeaderData(0, Qt::Horizontal, "t value"); - horizontalHeaderModel->setHeaderData(1, Qt::Horizontal, "dof"); - horizontalHeaderModel->setHeaderData(2, Qt::Horizontal, "p value"); +// //setting horizontal header model +// horizontalHeaderModel->setHeaderData(0, Qt::Horizontal, "t value"); +// horizontalHeaderModel->setHeaderData(1, Qt::Horizontal, "dof"); +// horizontalHeaderModel->setHeaderData(2, Qt::Horizontal, "p value"); + + resultModel->setRowCount(2); + resultModel->setColumnCount(1); + resultModel->setItem(0, 0, new QStandardItem("Null Hypothesis is ")); + resultModel->setItem(1, 0, new QStandardItem("T value is ")); + + resultModel->setData(resultModel->index(0, 0), "Null Hypothesis is ", Qt::DisplayRole); + resultModel->setData(resultModel->index(1, 0), "T value is ", Qt::DisplayRole); + + resultModel->setData(resultModel->index(0, 0), "Message", Qt::ToolTipRole); + resultModel->setData(resultModel->index(0, 0), QIcon("open.xpm"), Qt::DecorationRole); emit q->changed(); return; - } else if(test == "ztest") { + } else if (test == TestZ) { + m_currTestName = i18n("Two Sample Independent Z Test"); dataModel->setRowCount(1); dataModel->setColumnCount(2); horizontalHeaderModel->setColumnCount(2); int df = n[0] + n[1] - 2; //Assuming equal variance double sp = qSqrt( ((n[0]-1)*qPow(std[0],2) + (n[1]-1)*qPow(std[1],2))/df); double z = (mean[0] - mean[1])/(sp*qSqrt(1.0/n[0] + 1.0/n[1])); + double p_value = 0; + if (tail_type == HypothesisTest::TailNegative) + p_value = nsl_stats_tdist_p(z, df); + else if (tail_type == HypothesisTest::TailPositive) { + z *= -1; + p_value = nsl_stats_tdist_p(z, df); + } else { + p_value = nsl_stats_tdist_p(z, df) + nsl_stats_tdist_p(-1*z, df); + } // now finding p value from t value - double p_value = nsl_stats_tdist_p(z, df); // QString text = i18n("T value for test is %1 and\n p value is %2",t, p_value); // msg_box->setText(text); // msg_box->exec(); //setting dataModel dataModel->setItem(0, 0, new QStandardItem(QString::number(z))); dataModel->setItem(0, 1, new QStandardItem(QString::number(p_value))); //setting horizontal header model horizontalHeaderModel->setHeaderData(0, Qt::Horizontal, "z value"); horizontalHeaderModel->setHeaderData(1, Qt::Horizontal, "p value"); emit q->changed(); return; } } -void HypothesisTestPrivate::performTwoSamplePairedTest(QString test) { - dataModel->clear(); - horizontalHeaderModel->clear();\ - if (test == "ttest") - m_currTestName = i18n("Two Sample Paired T Test"); - if (test == "ztest") - m_currTestName = i18n("Two Sample Paired Z Test"); +/********************************Two Sample Paired ***************************************/ - qDebug() << "performing two sample paired t test"; +void HypothesisTestPrivate::performTwoSamplePairedTest(Test test) { + dataModel->clear(); + horizontalHeaderModel->clear(); QMessageBox* msg_box = new QMessageBox(); // checking for cols; if (m_columns.size() != 2) { msg_box->setText(i18n("Inappropriate number of columns selected")); msg_box->exec(); return; } bool modeOk = true; - bool allColumnsValid = true; for (int i = 0; i < 2; i++) { if(m_columns[i]->columnMode() == AbstractColumn::Numeric || m_columns[i]->columnMode() == AbstractColumn::Integer) continue; modeOk = false; } - if(!allColumnsValid) { - msg_box->setText(i18n("one of the selected columns is invalid")); - msg_box->exec(); - return; - } if (!modeOk) { msg_box->setText(i18n("select only columns with numbers")); msg_box->exec(); return; } int n; double sum, mean, std; findStatsPaired(m_columns[0], m_columns[1], n, sum, mean, std); if (n == -1) { msg_box->setText(i18n("both columns are having different sizes")); msg_box->exec(); return; } if (n < 1) { msg_box->setText(i18n("columns are empty")); msg_box->exec(); return; } - if (test == "ttest") { + if (test == TestT) { + m_currTestName = i18n("Two Sample Paired T Test"); dataModel->setRowCount(1); dataModel->setColumnCount(3); horizontalHeaderModel->setColumnCount(3); double t = mean / (std/qSqrt(n)); int df = n - 1; - // now finding p value from t value - double p_value = nsl_stats_tdist_p(t, df); + double p_value = 0; + if (tail_type == HypothesisTest::TailNegative) + p_value = nsl_stats_tdist_p(t, df); + else if (tail_type == HypothesisTest::TailPositive) { + t *= -1; + p_value = nsl_stats_tdist_p(t, df); + } else { + p_value = nsl_stats_tdist_p(t, df) + nsl_stats_tdist_p(-1*t, df); + } // QString text = i18n("T value for test is %1 and\n p value is %2",t, p_value); // msg_box->setText(text); // msg_box->exec(); //setting dataModel dataModel->setItem(0, 0, new QStandardItem(QString::number(t))); dataModel->setItem(0, 1, new QStandardItem(QString::number(df))); dataModel->setItem(0, 2, new QStandardItem(QString::number(p_value))); //setting horizontal header model horizontalHeaderModel->setHeaderData(0, Qt::Horizontal, "t value"); horizontalHeaderModel->setHeaderData(1, Qt::Horizontal, "dof"); horizontalHeaderModel->setHeaderData(2, Qt::Horizontal, "p value"); emit q->changed(); return; - } else if (test == "ztest") { + } else if (test == TestZ) { + m_currTestName = i18n("Two Sample Paired Z Test"); dataModel->setRowCount(1); dataModel->setColumnCount(2); horizontalHeaderModel->setColumnCount(2); double z = mean / (std/qSqrt(n)); int df = n - 1; + double p_value = 0; + if (tail_type == HypothesisTest::TailNegative) + p_value = nsl_stats_tdist_p(z, df); + else if (tail_type == HypothesisTest::TailPositive) { + z *= -1; + p_value = nsl_stats_tdist_p(z, df); + } else { + p_value = nsl_stats_tdist_p(z, df) + nsl_stats_tdist_p(-1*z, df); + } + + // now finding p value from t value - double p_value = nsl_stats_tdist_p(z, df); // QString text = i18n("T value for test is %1 and\n p value is %2",t, p_value); // msg_box->setText(text); // msg_box->exec(); //setting dataModel dataModel->setItem(0, 0, new QStandardItem(QString::number(z))); dataModel->setItem(0, 1, new QStandardItem(QString::number(p_value))); //setting horizontal header model horizontalHeaderModel->setHeaderData(0, Qt::Horizontal, "z value"); horizontalHeaderModel->setHeaderData(1, Qt::Horizontal, "p value"); emit q->changed(); return; } } -void HypothesisTestPrivate::PerformOneSampleTest(QString test) { +/******************************** One Sample ***************************************/ + +void HypothesisTestPrivate::PerformOneSampleTest(Test test) { double population_mean = 0; dataModel->clear(); horizontalHeaderModel->clear(); - if (test == "ttest") - m_currTestName = i18n("One Sample T Test"); - if (test == "ztest") - m_currTestName = i18n("One Sample Z Test"); - - qDebug() << "performing two sample paired t test"; QMessageBox* msg_box = new QMessageBox(); // checking for cols; if (m_columns.size() != 1) { msg_box->setText(i18n("Inappropriate number of columns selected")); msg_box->exec(); return; } if ( !(m_columns[0]->columnMode() == AbstractColumn::Numeric || m_columns[0]->columnMode() == AbstractColumn::Integer)) { msg_box->setText(i18n("select only columns with numbers")); msg_box->exec(); return; } int n; double sum, mean, std; findStats(m_columns[0], n, sum, mean, std); if (n < 1) { msg_box->setText(i18n("column is empty")); msg_box->exec(); return; } - if (test == "ttest") { + if (test == TestT) { + m_currTestName = i18n("One Sample T Test"); dataModel->setRowCount(1); dataModel->setColumnCount(3); horizontalHeaderModel->setColumnCount(3); double t = (mean - population_mean) / (std/qSqrt(n)); int df = n - 1; - // now finding p value from t value - double p_value = nsl_stats_tdist_p(t, df); + + double p_value = 0; + if (tail_type == HypothesisTest::TailNegative) + p_value = nsl_stats_tdist_p(t, df); + else if (tail_type == HypothesisTest::TailPositive) { + t *= -1; + p_value = nsl_stats_tdist_p(t, df); + } else { + p_value = nsl_stats_tdist_p(t, df) + nsl_stats_tdist_p(-1*t, df); + } + // QString text = i18n("T value for test is %1 and\n p value is %2",t, p_value); // msg_box->setText(text); // msg_box->exec(); //setting dataModel dataModel->setItem(0, 0, new QStandardItem(QString::number(t))); dataModel->setItem(0, 1, new QStandardItem(QString::number(df))); dataModel->setItem(0, 2, new QStandardItem(QString::number(p_value))); //setting horizontal header model horizontalHeaderModel->setHeaderData(0, Qt::Horizontal, "t value"); horizontalHeaderModel->setHeaderData(1, Qt::Horizontal, "dof"); horizontalHeaderModel->setHeaderData(2, Qt::Horizontal, "p value"); emit q->changed(); return; - } else if (test == "ztest") { + } else if (test == TestZ) { + m_currTestName = i18n("One Sample Z Test"); dataModel->setRowCount(1); dataModel->setColumnCount(2); horizontalHeaderModel->setColumnCount(2); double z = (mean - population_mean) / (std/qSqrt(n)); int df = n - 1; + double p_value = 0; + if (tail_type == HypothesisTest::TailNegative) + p_value = nsl_stats_tdist_p(z, df); + else if (tail_type == HypothesisTest::TailPositive) { + z *= -1; + p_value = nsl_stats_tdist_p(z, df); + } else { + p_value = nsl_stats_tdist_p(z, df) + nsl_stats_tdist_p(-1*z, df); + } // now finding p value from t value - double p_value = nsl_stats_tdist_p(z, df); // QString text = i18n("T value for test is %1 and\n p value is %2",t, p_value); // msg_box->setText(text); // msg_box->exec(); //setting dataModel dataModel->setItem(0, 0, new QStandardItem(QString::number(z))); dataModel->setItem(0, 1, new QStandardItem(QString::number(p_value))); //setting horizontal header model horizontalHeaderModel->setHeaderData(0, Qt::Horizontal, "z value"); horizontalHeaderModel->setHeaderData(1, Qt::Horizontal, "p value"); emit q->changed(); return; } } void HypothesisTestPrivate::findStatsPaired(Column* column1, Column* column2, int &count, double &sum, double &mean, double &std) { sum = 0; mean = 0; std = 0; int count1 = column1->rowCount(); int count2 = column2->rowCount(); count = qMin(count1, count2); double row1, row2; for (int i = 0; i < count; i++) { row1 = column1->valueAt(i); row2 = column2->valueAt(i); if (std::isnan(row1) || std::isnan(row2)) { if (std::isnan(row1) && std::isnan(row2)) count = i; else { count = -1; return; } break; } sum += row1 - row2; } if (count < 1) return; mean = sum/count; double row; for (int i = 0; i < count; i++) { row1 = column1->valueAt(i); row2 = column2->valueAt(i); row = row1 - row2; std += qPow( (row - mean), 2); } if (count > 1) std = std / (count-1); std = qSqrt(std); return; } void HypothesisTestPrivate::findStats(Column* column, int &count, double &sum, double &mean, double &std) { sum = 0; mean = 0; std = 0; count = column->rowCount(); for (int i = 0; i < count; i++) { double row = column->valueAt(i); if ( std::isnan(row)) { count = i; break; } sum += row; } if (count < 1) return; mean = sum/count; for (int i = 0; i < count; i++) { double row = column->valueAt(i); std += qPow( (row - mean), 2); } if (count > 1) std = std / (count-1); std = qSqrt(std); return; } /********************************************************************************** * virtual functions implementations * ********************************************************************************/ /*! Saves as XML. */ void HypothesisTest::save(QXmlStreamWriter* writer) const { writer->writeStartElement("hypothesisTest"); writeBasicAttributes(writer); writeCommentElement(writer); //TODO: writer->writeEndElement(); } /*! Loads from XML. */ bool HypothesisTest::load(XmlStreamReader* reader, bool preview) { Q_UNUSED(preview); if (!readBasicAttributes(reader)) return false; //TODO: return !reader->hasError(); } Spreadsheet *HypothesisTest::dataSourceSpreadsheet() const { return d->dataSourceSpreadsheet; } bool HypothesisTest::exportView() const { return true; } bool HypothesisTest::printView() { return true; } bool HypothesisTest::printPreview() const { return true; } /*! Constructs a primary view on me. This method may be called multiple times during the life time of an Aspect, or it might not get called at all. Aspects must not depend on the existence of a view for their operation. */ QWidget* HypothesisTest::view() const { if (!m_partView) { m_view = new HypothesisTestView(const_cast(this)); m_partView = m_view; } return m_partView; } /*! Returns a new context menu. The caller takes ownership of the menu. */ QMenu* HypothesisTest::createContextMenu() { QMenu* menu = AbstractPart::createContextMenu(); // Q_ASSERT(menu); // emit requestProjectContextMenu(menu); return menu; } diff --git a/src/backend/hypothesis_test/HypothesisTest.h b/src/backend/hypothesis_test/HypothesisTest.h index 209bd7d47..03da90f89 100644 --- a/src/backend/hypothesis_test/HypothesisTest.h +++ b/src/backend/hypothesis_test/HypothesisTest.h @@ -1,98 +1,104 @@ /*************************************************************************** File : HypothesisTest.h Project : LabPlot Description : Doing Hypothesis-Test on data provided -------------------------------------------------------------------- Copyright : (C) 2019 Devanshu Agarwal(agarwaldevanshu8@gmail.com) ***************************************************************************/ /*************************************************************************** * * * 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 2 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, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * ***************************************************************************/ #ifndef HYPOTHESISTEST_H #define HYPOTHESISTEST_H #include #include "backend/core/AbstractPart.h" #include "backend/lib/macros.h" class HypothesisTestPrivate; class HypothesisTestView; class Spreadsheet; class QAbstractItemModel; class QString; class Column; +class QLayout; class HypothesisTest : public AbstractPart { Q_OBJECT public: explicit HypothesisTest(const QString& name); ~HypothesisTest() override; enum DataSourceType {DataSourceSpreadsheet, DataSourceDatabase}; + enum TailType {TailPositive, TailNegative, TailTwo}; QAbstractItemModel* dataModel(); - QAbstractItemModel *horizontalHeaderModel(); + QAbstractItemModel* horizontalHeaderModel(); + QAbstractItemModel* verticalHeaderModel(); + QAbstractItemModel* resultModel(); + QString testName(); void setDataSourceSpreadsheet(Spreadsheet* spreadsheet); void setColumns(QVector cols); void setColumns(QStringList cols); void performTwoSampleTTest(); void performTwoSampleIndependetTTest(bool equal_variance); void performTwoSamplePairedTTest(); void PerformOneSampleTTest(); void performTwoSampleIndependetZTest(); void performTwoSamplePairedZTest(); void PerformOneSampleZTest(); DataSourceType dataSourceType() const; //virtual methods // QIcon icon() const override; QMenu* createContextMenu() override; QWidget* view() const override; bool exportView() const override; bool printView() override; bool printPreview() const override; void save(QXmlStreamWriter*) const override; bool load(XmlStreamReader*, bool preview) override; Spreadsheet* dataSourceSpreadsheet() const; void setDataSourceType(DataSourceType type); QStringList allColumns(); - + void setTailType(TailType tailType); + TailType tailType(); private: HypothesisTestPrivate* const d; mutable HypothesisTestView* m_view{nullptr}; friend class HypothesisTestPrivate; signals: void changed(); void requestProjectContextMenu(QMenu*); void dataSourceTypeChanged(HypothesisTest::DataSourceType); void dataSourceSpreadsheetChanged(Spreadsheet*); }; #endif // HypothesisTest_H diff --git a/src/backend/hypothesis_test/HypothesisTestPrivate.h b/src/backend/hypothesis_test/HypothesisTestPrivate.h index f3814d7c6..2a5914687 100644 --- a/src/backend/hypothesis_test/HypothesisTestPrivate.h +++ b/src/backend/hypothesis_test/HypothesisTestPrivate.h @@ -1,71 +1,78 @@ /*************************************************************************** File : HypothesisTestPrivate.h Project : LabPlot Description : Private members of Hypothesis Test -------------------------------------------------------------------- Copyright : (C) 2019 Devanshu Agarwal(agarwaldevanshu8@gmail.com) ***************************************************************************/ /*************************************************************************** * * * 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 2 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, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * ***************************************************************************/ #ifndef HYPOTHESISTESTPRIVATE_H #define HYPOTHESISTESTPRIVATE_H #include class QStandardItemModel; class HypothesisTestPrivate { public: + explicit HypothesisTestPrivate(HypothesisTest*); virtual ~HypothesisTestPrivate(); + enum Test {TestT, TestZ}; QString name() const; HypothesisTest* const q; HypothesisTest::DataSourceType dataSourceType{HypothesisTest::DataSourceSpreadsheet}; Spreadsheet* dataSourceSpreadsheet{nullptr}; void setDataSourceSpreadsheet(Spreadsheet* spreadsheet); void setColumns(QStringList cols); QVector m_columns; QStringList all_columns; QStandardItemModel* dataModel{nullptr}; QStandardItemModel* horizontalHeaderModel{nullptr}; + QStandardItemModel* verticalHeaderModel{nullptr}; bool m_dbCreated{false}; int m_rowCount{0}; int m_columnCount{0}; QString m_currTestName{"Result Table"}; - void performTwoSampleIndependetTest(QString test, bool equal_variance = true); - void performTwoSamplePairedTest(QString test); - void PerformOneSampleTest(QString test); + void performTwoSampleIndependetTest(Test test, bool equal_variance = true); + void performTwoSamplePairedTest(Test test); + void PerformOneSampleTest(Test test); + + HypothesisTest::TailType tail_type; + + QStandardItemModel* resultModel{nullptr}; private: void findStats(Column* column, int &count, double &sum, double &mean, double &std); void findStatsPaired(Column *column1, Column *column2, int &count, double &sum, double &mean, double &std); // QMap m_members; }; #endif diff --git a/src/kdefrontend/dockwidgets/HypothesisTestDock.cpp b/src/kdefrontend/dockwidgets/HypothesisTestDock.cpp index 7fe423526..9927e3565 100644 --- a/src/kdefrontend/dockwidgets/HypothesisTestDock.cpp +++ b/src/kdefrontend/dockwidgets/HypothesisTestDock.cpp @@ -1,605 +1,607 @@ /*************************************************************************** File : HypothesisTestDock.cpp Project : LabPlot Description : widget for hypothesis test properties -------------------------------------------------------------------- Copyright : (C) 2019 Devanshu Agarwal(agarwaldevanshu8@gmail.com) ***************************************************************************/ /*************************************************************************** * * * 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 2 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, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * ***************************************************************************/ #include "HypothesisTestDock.h" #include "backend/core/AspectTreeModel.h" #include "backend/core/AbstractAspect.h" #include "backend/core/Project.h" #include "backend/spreadsheet/Spreadsheet.h" #include "commonfrontend/widgets/TreeViewComboBox.h" #include "kdefrontend/datasources/DatabaseManagerDialog.h" #include "kdefrontend/datasources/DatabaseManagerWidget.h" //#include "kdefrontend/pivot/hypothesisTestView.h" #include "kdefrontend/TemplateHandler.h" #include #include #include #include #include #include /*! \class HypothesisTestDock \brief Provides a dock (widget) for hypothesis testing: \ingroup kdefrontend */ HypothesisTestDock::HypothesisTestDock(QWidget* parent) : QWidget(parent) { ui.setupUi(this); ui.cbDataSourceType->addItem(i18n("Spreadsheet")); ui.cbDataSourceType->addItem(i18n("Database")); cbSpreadsheet = new TreeViewComboBox; ui.gridLayout->addWidget(cbSpreadsheet, 5, 3, 1, 4); ui.bDatabaseManager->setIcon(QIcon::fromTheme("network-server-database")); ui.bDatabaseManager->setToolTip(i18n("Manage connections")); m_configPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).constFirst() + "sql_connections"; // making all test blocks invisible at starting. ui.lIndependentVariable1->setVisible(false); ui.cbCol1->setVisible(false); ui.cbVariable2->setVisible(false); ui.cbCol2->setVisible(false); ui.chbEqualVariance->setVisible(false); ui.chbEqualVariance->setChecked(true); ui.pbPerformTest->setEnabled(false); ui.rb_h1_one_tail_2->setVisible(false); ui.rb_h1_one_tail_1->setVisible(false); ui.rb_h1_two_tail->setVisible(false); ui.rb_h0_one_tail_1->setVisible(false); ui.rb_h0_one_tail_2->setVisible(false); ui.rb_h0_two_tail->setVisible(false); ui.l_h0->setVisible(false); ui.l_h1->setVisible(false); QString mu = QChar(0x3BC); QString mu0 = mu+QChar(0x2092); // radio button for null and alternate hypothesis // for alternative hypothesis // one_tail_1 is mu > mu0; one_tail_2 is mu < mu0; two_tail = mu != mu0; ui.rb_h1_one_tail_1->setText(mu + " " + QChar(0x3E) + " " + mu0); ui.rb_h1_one_tail_2->setText(mu + " " + QChar(0x3C) + " " + mu0); ui.rb_h1_two_tail->setText(mu + " " + QChar(0x2260) + " " + mu0); ui.rb_h0_one_tail_1->setText(mu + " " + QChar(0x2264) + " " + mu0); ui.rb_h0_one_tail_2->setText(mu + " " + QChar(0x2265) + " " + mu0); ui.rb_h0_two_tail->setText(mu + " " + QChar(0x3D) + " " + mu0); ui.rb_h0_two_tail->setEnabled(false); ui.rb_h0_one_tail_1->setEnabled(false); ui.rb_h0_one_tail_2->setEnabled(false); // readConnections(); // auto* style = ui.bAddRow->style(); // ui.bAddRow->setIcon(style->standardIcon(QStyle::SP_ArrowRight)); // ui.bAddRow->setToolTip(i18n("Add the selected field to rows")); // ui.bRemoveRow->setIcon(style->standardIcon(QStyle::SP_ArrowLeft)); // ui.bRemoveRow->setToolTip(i18n("Remove the selected field from rows")); // ui.bAddColumn->setIcon(style->standardIcon(QStyle::SP_ArrowRight)); // ui.bAddColumn->setToolTip(i18n("Add the selected field to columns")); // ui.bRemoveColumn->setIcon(style->standardIcon(QStyle::SP_ArrowLeft)); // ui.bRemoveColumn->setToolTip(i18n("Remove the selected field from columns")); // //add/remove buttons only enabled if something was selected // ui.bAddRow->setEnabled(false); // ui.bRemoveRow->setEnabled(false); // ui.bAddColumn->setEnabled(false); // ui.bRemoveColumn->setEnabled(false); // connect(ui.leName, &QLineEdit::textChanged, this, &HypothesisTestDock::nameChanged); // connect(ui.leComment, &QLineEdit::textChanged, this, &HypothesisTestDock::commentChanged); connect(ui.cbDataSourceType, static_cast(&QComboBox::currentIndexChanged), this, &HypothesisTestDock::dataSourceTypeChanged); connect(cbSpreadsheet, &TreeViewComboBox::currentModelIndexChanged, this, &HypothesisTestDock::spreadsheetChanged); // connect(ui.cbConnection, static_cast(&QComboBox::currentIndexChanged), // this, &HypothesisTestDock::connectionChanged); // connect(ui.cbTable, static_cast(&QComboBox::currentIndexChanged), // this, &HypothesisTestDock::tableChanged); // connect(ui.bDatabaseManager, &QPushButton::clicked, this, &HypothesisTestDock::showDatabaseManager); // connect(ui.bAddRow, &QPushButton::clicked, this, &HypothesisTestDock::addRow); // connect(ui.bRemoveRow, &QPushButton::clicked, this,&HypothesisTestDock::removeRow); // connect(ui.bAddColumn, &QPushButton::clicked, this, &HypothesisTestDock::addColumn); // connect(ui.bRemoveColumn, &QPushButton::clicked, this,&HypothesisTestDock::removeColumn); // connect(ui.cbCol1, static_cast(&QComboBox::currentIndexChanged), this, &HypothesisTestDock::doTTest); // connect(ui.cbCol2, static_cast(&QComboBox::currentIndexChanged), this, &HypothesisTestDock::doTTest); // connect(ui.lwFields, &QListWidget::itemSelectionChanged, this, [=]() { // bool enabled = !ui.lwFields->selectedItems().isEmpty(); // ui.bAddRow->setEnabled(enabled); // ui.bAddColumn->setEnabled(enabled); // }); // connect(ui.lwRows, &QListWidget::doubleClicked, this,&HypothesisTestDock::removeRow); // connect(ui.lwRows, &QListWidget::itemSelectionChanged, this, [=]() { // ui.bRemoveRow->setEnabled(!ui.lwRows->selectedItems().isEmpty()); // }); // connect(ui.lwColumns, &QListWidget::doubleClicked, this,&HypothesisTestDock::removeColumn); // connect(ui.lwColumns, &QListWidget::itemSelectionChanged, this, [=]() { // ui.bRemoveColumn->setEnabled(!ui.lwColumns->selectedItems().isEmpty()); // }); connect(ui.twTests, &QTreeWidget::itemClicked, this, &HypothesisTestDock::showHypothesisTest); connect(ui.pbPerformTest, &QPushButton::clicked, this, &HypothesisTestDock::doHypothesisTest); } void HypothesisTestDock::setHypothesisTest(HypothesisTest* HypothesisTest) { // m_initializing = true; m_hypothesisTest = HypothesisTest; //// m_aspectTreeModel = new AspectTreeModel(m_hypothesisTest->project()); // QList list; // list << "Folder" << "Workbook" << "Spreadsheet" << "LiveDataSource"; // cbSpreadsheet->setTopLevelClasses(list); // list.clear(); // list << "Spreadsheet" << "LiveDataSource"; //// m_aspectTreeModel->setSelectableAspects(list); //// cbSpreadsheet->setModel(m_aspectTreeModel); //show the properties ui.leName->setText(m_hypothesisTest->name()); ui.leComment->setText(m_hypothesisTest->comment()); ui.cbDataSourceType->setCurrentIndex(m_hypothesisTest->dataSourceType()); // if (m_hypothesisTest->dataSourceType() == HypothesisTest::DataSourceSpreadsheet) // setModelIndexFromAspect(cbSpreadsheet, m_hypothesisTest->dataSourceSpreadsheet()); // else // ui.cbConnection->setCurrentIndex(ui.cbConnection->findText(m_hypothesisTest->dataSourceConnection())); //clearing all cbCol* ui.cbCol1->clear(); ui.cbCol2->clear(); for (auto* col : m_hypothesisTest->dataSourceSpreadsheet()->children()) { ui.cbCol1->addItem(col->name()); ui.cbCol2->addItem(col->name()); } this->dataSourceTypeChanged(ui.cbDataSourceType->currentIndex()); // setting rows and columns in combo box; // //available dimensions and measures // ui.lwFields->clear(); // for (auto dimension : m_hypothesisTest->dimensions()) // ui.lwFields->addItem(new QListWidgetItem(QIcon::fromTheme("draw-text"), dimension)); // for (auto measure : m_hypothesisTest->measures()) // ui.lwFields->addItem(new QListWidgetItem(measure)); // //undo functions // connect(m_hypothesisTest, SIGNAL(aspectDescriptionChanged(const AbstractAspect*)), this, SLOT(hypothesisTestDescriptionChanged(const AbstractAspect*))); // //TODO: // m_initializing = false; } void HypothesisTestDock::showHypothesisTest(QTreeWidgetItem* item, int col) { if(item->parent() != nullptr){ ttest = item->parent()->text(col) == "Student's T Test"; ztest = item->parent()->text(col) == "Z Test"; } two_sample_independent = item->text(col) == "Two Sample Independent"; two_sample_paired = item->text(col) == "Two Sample Paired"; one_sample = item->text(col) == "One Sample"; ui.lIndependentVariable1->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.cbCol1->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.cbVariable2->setVisible(two_sample_independent || two_sample_paired); ui.cbCol2->setVisible(two_sample_independent || two_sample_paired); ui.chbEqualVariance->setVisible(ttest && two_sample_independent); ui.chbEqualVariance->setChecked(true); ui.pbPerformTest->setEnabled(two_sample_independent || two_sample_paired || one_sample); ui.rb_h1_one_tail_2->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.rb_h1_one_tail_1->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.rb_h1_two_tail->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.rb_h0_one_tail_1->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.rb_h0_one_tail_2->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.rb_h0_two_tail->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.l_h0->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.l_h1->setVisible(two_sample_independent || two_sample_paired || one_sample); ui.rb_h1_two_tail->setChecked(true); ui.rb_h0_two_tail->setChecked(true); } void HypothesisTestDock::doHypothesisTest() { QStringList cols; if(ttest) { if(two_sample_independent) { - cols << ui.cbCol1->currentText(); - cols << ui.cbCol2->currentText(); + cols << ui.cbCol1->currentText() << ui.cbCol2->currentText(); m_hypothesisTest->setColumns(cols); m_hypothesisTest->performTwoSampleIndependetTTest( ui.chbEqualVariance->isChecked()); } else if(two_sample_paired) { cols << ui.cbCol1->currentText(); cols << ui.cbCol2->currentText(); m_hypothesisTest->setColumns(cols); m_hypothesisTest->performTwoSamplePairedTTest(); } else if(one_sample){ cols << ui.cbCol1->currentText(); m_hypothesisTest->setColumns(cols); m_hypothesisTest->PerformOneSampleTTest(); } } else if(ztest) { if(two_sample_independent) { cols << ui.cbCol1->currentText(); cols << ui.cbCol2->currentText(); m_hypothesisTest->setColumns(cols); m_hypothesisTest->performTwoSampleIndependetZTest(); } else if(two_sample_paired) { cols << ui.cbCol1->currentText(); cols << ui.cbCol2->currentText(); m_hypothesisTest->setColumns(cols); m_hypothesisTest->performTwoSamplePairedZTest(); } else if(one_sample){ cols << ui.cbCol1->currentText(); m_hypothesisTest->setColumns(cols); m_hypothesisTest->PerformOneSampleZTest(); } } - - - cols << ui.cbCol1->currentText(); cols << ui.cbCol2->currentText(); m_hypothesisTest->setColumns(cols); m_hypothesisTest->performTwoSampleTTest(); } //void HypothesisTestDock::setModelIndexFromAspect(TreeViewComboBox* cb, const AbstractAspect* aspect) { // if (aspect) // cb->setCurrentModelIndex(m_aspectTreeModel->modelIndexOfAspect(aspect)); // else // cb->setCurrentModelIndex(QModelIndex()); //} ///*! // shows the database manager where the connections are created and edited. // The selected connection is selected in the connection combo box in this widget. //**/ //void HypothesisTestDock::showDatabaseManager() { // DatabaseManagerDialog* dlg = new DatabaseManagerDialog(this, ui.cbConnection->currentText()); // if (dlg->exec() == QDialog::Accepted) { // //re-read the available connections to be in sync with the changes in DatabaseManager // m_initializing = true; // ui.cbConnection->clear(); // readConnections(); // //select the connection the user has selected in DatabaseManager // const QString& conn = dlg->connection(); // ui.cbConnection->setCurrentIndex(ui.cbConnection->findText(conn)); // m_initializing = false; // connectionChanged(); // } // delete dlg; //} ///*! // loads all available saved connections //*/ //void HypothesisTestDock::readConnections() { // DEBUG("ImportSQLDatabaseWidget: reading available connections"); // KConfig config(m_configPath, KConfig::SimpleConfig); // for (const auto& name : config.groupList()) // ui.cbConnection->addItem(name); //} ///*! // * adds the selected field to the rows // */ //void HypothesisTestDock::addRow() { // QString field = ui.lwFields->currentItem()->text(); // ui.lwRows->addItem(field); // ui.lwFields->takeItem(ui.lwFields->currentRow()); // m_hypothesisTest->addToRows(field); //} ///*! // * removes the selected field from the rows // */ //void HypothesisTestDock::removeRow() { // const QString& field = ui.lwRows->currentItem()->text(); // ui.lwRows->takeItem(ui.lwRows->currentRow()); // m_hypothesisTest->removeFromRows(field); // updateFields(); //} ///*! // * adds the selected field to the columns // */ //void HypothesisTestDock::addColumn() { // QString field = ui.lwFields->currentItem()->text(); // ui.lwColumns->addItem(field); // ui.lwFields->takeItem(ui.lwFields->currentRow()); // m_hypothesisTest->addToColumns(field); //} ///*! // * removes the selected field from the columns // */ //void HypothesisTestDock::removeColumn() { // const QString& field = ui.lwColumns->currentItem()->text(); // ui.lwColumns->takeItem(ui.lwColumns->currentRow()); // m_hypothesisTest->removeFromColumns(field); // updateFields(); //} ///*! // * re-populates the content of the "Fields" list widget by adding the non-selected fields only. // * called when a selected field is removed from rows or columns. // */ //void HypothesisTestDock::updateFields() { // ui.lwFields->clear(); // for (auto dimension : m_hypothesisTest->dimensions()) // if (!fieldSelected(dimension)) // ui.lwFields->addItem(new QListWidgetItem(QIcon::fromTheme("draw-text"), dimension)); // for (auto measure : m_hypothesisTest->measures()) // if (!fieldSelected(measure)) // ui.lwFields->addItem(new QListWidgetItem(measure)); //} ///*! // * return \c true if the field name \c field was selected among rows or columns, // * return \c false otherwise. // * */ //bool HypothesisTestDock::fieldSelected(const QString& field) { // for (int i = 0; icount(); ++i) // if (ui.lwRows->item(i)->text() == field) // return true; // for (int i = 0; icount(); ++i) // if (ui.lwColumns->item(i)->text() == field) // return true; // return false; //} ////************************************************************* ////****** SLOTs for changes triggered in HypothesisTestDock ******* ////************************************************************* //void HypothesisTestDock::nameChanged() { // if (m_initializing) // return; // m_hypothesisTest->setName(ui.leName->text()); //} //void HypothesisTestDock::commentChanged() { // if (m_initializing) // return; // m_hypothesisTest->setComment(ui.leComment->text()); //} void HypothesisTestDock::dataSourceTypeChanged(int index) { HypothesisTest::DataSourceType type = (HypothesisTest::DataSourceType)index; bool showDatabase = (type == HypothesisTest::DataSourceDatabase); ui.lSpreadsheet->setVisible(!showDatabase); cbSpreadsheet->setVisible(!showDatabase); ui.lConnection->setVisible(showDatabase); ui.cbConnection->setVisible(showDatabase); ui.bDatabaseManager->setVisible(showDatabase); ui.lTable->setVisible(showDatabase); ui.cbTable->setVisible(showDatabase); // if (m_initializing) // return; m_hypothesisTest->setComment(ui.leComment->text()); } void HypothesisTestDock::spreadsheetChanged(const QModelIndex& index) { auto* aspect = static_cast(index.internalPointer()); Spreadsheet* spreadsheet = dynamic_cast(aspect); //clear the previous definitions of combo-box columns ui.cbCol1->clear(); ui.cbCol2->clear(); //TODO: //rows, columns, values //show all spreadsheet columns as available dimensions for (const auto* col : spreadsheet->children()) { ui.cbCol1->addItem(col->name()); ui.cbCol2->addItem(col->name()); } m_hypothesisTest->setDataSourceSpreadsheet(spreadsheet); } //void HypothesisTestDock::connectionChanged() { // if (ui.cbConnection->currentIndex() == -1) { // ui.lTable->hide(); // ui.cbTable->hide(); // return; // } // //clear the previously shown tables // ui.cbTable->clear(); // ui.lTable->show(); // ui.cbTable->show(); // const QString& connection = ui.cbConnection->currentText(); // //connection name was changed, determine the current connections settings // KConfig config(m_configPath, KConfig::SimpleConfig); // KConfigGroup group = config.group(connection); // //close and remove the previos connection, if available // if (m_db.isOpen()) { // m_db.close(); // QSqlDatabase::removeDatabase(m_db.driverName()); // } // //open the selected connection // QDEBUG("HypothesisTestDock: connecting to " + connection); // const QString& driver = group.readEntry("Driver"); // m_db = QSqlDatabase::addDatabase(driver); // const QString& dbName = group.readEntry("DatabaseName"); // if (DatabaseManagerWidget::isFileDB(driver)) { // if (!QFile::exists(dbName)) { // KMessageBox::error(this, i18n("Couldn't find the database file '%1'. Please check the connection settings.", dbName), // i18n("Connection Failed")); // return; // } else // m_db.setDatabaseName(dbName); // } else if (DatabaseManagerWidget::isODBC(driver)) { // if (group.readEntry("CustomConnectionEnabled", false)) // m_db.setDatabaseName(group.readEntry("CustomConnectionString")); // else // m_db.setDatabaseName(dbName); // } else { // m_db.setDatabaseName(dbName); // m_db.setHostName( group.readEntry("HostName") ); // m_db.setPort( group.readEntry("Port", 0) ); // m_db.setUserName( group.readEntry("UserName") ); // m_db.setPassword( group.readEntry("Password") ); // } // WAIT_CURSOR; // if (!m_db.open()) { // RESET_CURSOR; // KMessageBox::error(this, i18n("Failed to connect to the database '%1'. Please check the connection settings.", ui.cbConnection->currentText()) + // QLatin1String("\n\n") + m_db.lastError().databaseText(), // i18n("Connection Failed")); // return; // } // //show all available database tables // if (m_db.tables().size()) { // for (auto table : m_db.tables()) // ui.cbTable->addItem(QIcon::fromTheme("view-form-table"), table); // ui.cbTable->setCurrentIndex(0); // } // RESET_CURSOR; // if (m_initializing) // return; //// m_hypothesisTest->setDataSourceConnection(connection); //} //void HypothesisTestDock::tableChanged() { // const QString& table = ui.cbTable->currentText(); // //show all attributes of the selected table //// for (const auto* col : spreadsheet->children()) { //// QListWidgetItem* item = new QListWidgetItem(col->icon(), col->name()); //// ui.lwFields->addItem(item); //// } // if (m_initializing) // return; //// m_hypothesisTest->setDataSourceTable(table); //} ////************************************************************* ////******** SLOTs for changes triggered in Matrix ********* ////************************************************************* //void HypothesisTestDock::hypothesisTestDescriptionChanged(const AbstractAspect* aspect) { // if (m_hypothesisTest != aspect) // return; // m_initializing = true; // if (aspect->name() != ui.leName->text()) // ui.leName->setText(aspect->name()); // else if (aspect->comment() != ui.leComment->text()) // ui.leComment->setText(aspect->comment()); // m_initializing = false; //} ////************************************************************* ////******************** SETTINGS ******************************* ////************************************************************* //void HypothesisTestDock::load() { //} //void HypothesisTestDock::loadConfigFromTemplate(KConfig& config) { // Q_UNUSED(config); //} ///*! // loads saved matrix properties from \c config. // */ //void HypothesisTestDock::loadConfig(KConfig& config) { // Q_UNUSED(config); //} ///*! // saves matrix properties to \c config. // */ //void HypothesisTestDock::saveConfigAsTemplate(KConfig& config) { // Q_UNUSED(config); //} +//TODO: Rather than inbuilt slots use own decided slots for checked rather than clicked +// for alternate hypothesis +// one_tail_1 is mu > mu0; one_tail_2 is mu < mu0; two_tail = mu != mu0; void HypothesisTestDock::on_rb_h1_one_tail_1_clicked() { ui.rb_h0_one_tail_1->setChecked(true); + m_hypothesisTest->setTailType(HypothesisTest::TailPositive); } void HypothesisTestDock::on_rb_h1_one_tail_2_clicked() { ui.rb_h0_one_tail_2->setChecked(true); + m_hypothesisTest->setTailType(HypothesisTest::TailNegative); } void HypothesisTestDock::on_rb_h1_two_tail_clicked() { ui.rb_h0_two_tail->setChecked(true); + m_hypothesisTest->setTailType(HypothesisTest::TailTwo); } diff --git a/src/kdefrontend/hypothesis_test/HypothesisTestView.cpp b/src/kdefrontend/hypothesis_test/HypothesisTestView.cpp index 9497a5ebd..b1a2bac03 100644 --- a/src/kdefrontend/hypothesis_test/HypothesisTestView.cpp +++ b/src/kdefrontend/hypothesis_test/HypothesisTestView.cpp @@ -1,220 +1,240 @@ /*************************************************************************** File : HypothesisTestView.cpp Project : LabPlot Description : View class for Hypothesis Tests' Table -------------------------------------------------------------------- Copyright : (C) 2019 Devanshu Agarwal(agarwaldevanshu8@gmail.com) ***************************************************************************/ /*************************************************************************** * * * 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 2 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, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * ***************************************************************************/ #include "HypothesisTestView.h" #include "backend/hypothesis_test/HypothesisTest.h" #include "backend/lib/macros.h" #include "backend/lib/trace.h" #include #include #include #include #include #include #include #include #include #include #include +#include #include #include #include #include #include /*! \class HypothesisTestView \brief View class for Hypothesis Test \ingroup kdefrontend */ HypothesisTestView::HypothesisTestView(HypothesisTest* hypothesisTest) : QWidget(), m_hypothesisTest(hypothesisTest), m_tableView(new QTableView(this)), m_horizontalHeaderView(new QHeaderView(Qt::Horizontal, m_tableView)), - m_testName(new QLabel()) { + m_verticalHeaderView(new QHeaderView(Qt::Vertical, m_tableView)), + m_testName(new QLabel()), + m_resultView(new QListView(this)) { //setting alignments and fonts of testname label; m_testName->setText(m_hypothesisTest->testName()); // m_testName->setAlignment(Qt::AlignCenter); QFont font = m_testName->font(); font.setPointSize(15); m_testName->setFont(font); //setting properties for table view m_tableView->setEditTriggers(QAbstractItemView::NoEditTriggers); + m_resultView->setEditTriggers(QAbstractItemView::NoEditTriggers); // m_tableView->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); // QHBoxLayout* tableLayout = new QHBoxLayout(m_tableView); // m_tableView->setLayout(tableLayout); // m_tableView->setLayout(Qt::ho) auto* layout = new QVBoxLayout(this); layout->setContentsMargins(0,0,0,0); layout->addWidget(m_testName); layout->addSpacing(5); layout->addWidget(m_tableView); + layout->addSpacing(20); + layout->addWidget(m_resultView); +// layout->addLayout(m_hypothesisTest->resultLayout()); // layout->setAlignment(m_testName, Qt::AlignHCenter); // layout->setAlignment(m_tableView, Qt::AlignJustify); m_horizontalHeaderView->setVisible(true); m_horizontalHeaderView->setEnabled(true); m_horizontalHeaderView->setSectionsClickable(true); + m_verticalHeaderView->setVisible(true); + m_verticalHeaderView->setEnabled(true); + m_verticalHeaderView->setSectionsClickable(true); + m_tableView->setSelectionMode(QAbstractItemView::ExtendedSelection); m_tableView->setHorizontalHeader(m_horizontalHeaderView); - m_tableView->verticalHeader()->setVisible(false); + m_tableView->setVerticalHeader(m_verticalHeaderView); + init(); } HypothesisTestView::~HypothesisTestView() = default; void HypothesisTestView::init() { initActions(); initMenus(); m_tableView->setModel(m_hypothesisTest->dataModel()); m_horizontalHeaderView->setModel(m_hypothesisTest->horizontalHeaderModel()); + m_verticalHeaderView->setModel(m_hypothesisTest->verticalHeaderModel()); + + m_resultView->setModel(m_hypothesisTest->resultModel()); + + // user cant select the text. so that he/she doesn't get the feel of list view + // and get the feel of text; + m_resultView->setSelectionMode(QAbstractItemView::NoSelection); + m_resultView->setFocusPolicy(Qt::NoFocus); connect(m_hypothesisTest, &HypothesisTest::changed, this, &HypothesisTestView::changed); } void HypothesisTestView::initActions() { } void HypothesisTestView::initMenus() { } void HypothesisTestView::connectActions() { } void HypothesisTestView::fillToolBar(QToolBar* toolBar) { Q_UNUSED(toolBar); } /*! * Populates the menu \c menu with the pivot table and pivot table view relevant actions. * The menu is used * - as the context menu in PivotTableView * - as the "pivot table menu" in the main menu-bar (called form MainWin) * - as a part of the pivot table context menu in project explorer */ void HypothesisTestView::createContextMenu(QMenu* menu) { Q_ASSERT(menu); } void HypothesisTestView::goToCell() { bool ok; int col = QInputDialog::getInt(nullptr, i18n("Go to Cell"), i18n("Enter column"), 1, 1, m_tableView->model()->columnCount(), 1, &ok); if (!ok) return; int row = QInputDialog::getInt(nullptr, i18n("Go to Cell"), i18n("Enter row"), 1, 1, m_tableView->model()->rowCount(), 1, &ok); if (!ok) return; goToCell(row-1, col-1); } void HypothesisTestView::goToCell(int row, int col) { QModelIndex index = m_tableView->model()->index(row, col); m_tableView->scrollTo(index); m_tableView->setCurrentIndex(index); } bool HypothesisTestView::exportView() { return true; } bool HypothesisTestView::printView() { QPrinter printer; auto* dlg = new QPrintDialog(&printer, this); dlg->setWindowTitle(i18nc("@title:window", "Print Spreadsheet")); bool ret; if ((ret = dlg->exec()) == QDialog::Accepted) { print(&printer); } delete dlg; return ret; } bool HypothesisTestView::printPreview() { QPrintPreviewDialog* dlg = new QPrintPreviewDialog(this); connect(dlg, &QPrintPreviewDialog::paintRequested, this, &HypothesisTestView::print); return dlg->exec(); } /*! prints the complete spreadsheet to \c printer. */ void HypothesisTestView::print(QPrinter* printer) const { WAIT_CURSOR; QPainter painter (printer); RESET_CURSOR; } void HypothesisTestView::changed() { m_testName->setText(m_hypothesisTest->testName()); } void HypothesisTestView::exportToFile(const QString& path, const bool exportHeader, const QString& separator, QLocale::Language language) const { Q_UNUSED(exportHeader); Q_UNUSED(separator); Q_UNUSED(language); QFile file(path); if (!file.open(QFile::WriteOnly | QFile::Truncate)) return; PERFTRACE("export pivot table to file"); } void HypothesisTestView::exportToLaTeX(const QString & path, const bool exportHeaders, const bool gridLines, const bool captions, const bool latexHeaders, const bool skipEmptyRows, const bool exportEntire) const { Q_UNUSED(exportHeaders); Q_UNUSED(gridLines); Q_UNUSED(captions); Q_UNUSED(latexHeaders); Q_UNUSED(skipEmptyRows); Q_UNUSED(exportEntire); QFile file(path); if (!file.open(QFile::WriteOnly | QFile::Truncate)) return; PERFTRACE("export pivot table to latex"); } diff --git a/src/kdefrontend/hypothesis_test/HypothesisTestView.h b/src/kdefrontend/hypothesis_test/HypothesisTestView.h index caee50e05..216b2347e 100644 --- a/src/kdefrontend/hypothesis_test/HypothesisTestView.h +++ b/src/kdefrontend/hypothesis_test/HypothesisTestView.h @@ -1,89 +1,92 @@ /*************************************************************************** File : PivotTableView.h Project : LabPlot Description : View class for Hypothesis Tests' -------------------------------------------------------------------- Copyright : (C) 2019 Devanshu Agarwal(agarwaldevanshu8@gmail.com) ***************************************************************************/ /*************************************************************************** * * * 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 2 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, write to the Free Software * * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * ***************************************************************************/ #ifndef HYPOTHESISTESTVIEW_H #define HYPOTHESISTESTVIEW_H #include #include "backend/core/AbstractColumn.h" #include "backend/lib/IntervalAttribute.h" class Column; class HypothesisTest; class HypothesisTestModel; class AbstractAspect; class QTableView; class QHeaderView; +class QListView; class QPrinter; class QMenu; class QToolBar; class QModelIndex; class QItemSelection; class QLabel; class HypothesisTestView : public QWidget { Q_OBJECT public: explicit HypothesisTestView(HypothesisTest*); ~HypothesisTestView() override; bool exportView(); bool printView(); bool printPreview(); private: void init(); void initActions(); void initMenus(); void connectActions(); void exportToFile(const QString&, const bool, const QString&, QLocale::Language) const; void exportToLaTeX(const QString&, const bool exportHeaders, const bool gridLines, const bool captions, const bool latexHeaders, const bool skipEmptyRows,const bool exportEntire) const; - HypothesisTest* m_hypothesisTest; - QTableView* m_tableView; - QHeaderView* m_horizontalHeaderView; - QLabel* m_testName; + HypothesisTest* m_hypothesisTest; + QTableView* m_tableView; + QHeaderView* m_horizontalHeaderView; + QHeaderView* m_verticalHeaderView; + QLabel* m_testName; + QListView* m_resultView; public slots: void createContextMenu(QMenu*); void fillToolBar(QToolBar*); void print(QPrinter*) const; void changed(); private slots: void goToCell(); void goToCell(int row, int col); }; #endif diff --git a/src/kdefrontend/ui/dockwidgets/hypothesistestdock.ui b/src/kdefrontend/ui/dockwidgets/hypothesistestdock.ui index d0b17e058..3eb52985d 100644 --- a/src/kdefrontend/ui/dockwidgets/hypothesistestdock.ui +++ b/src/kdefrontend/ui/dockwidgets/hypothesistestdock.ui @@ -1,409 +1,409 @@ HypothesisTestDock 0 0 588 996 Form 9 40 71 17 Comment: 9 90 34 17 75 true Data 9 255 73 17 75 true Structure: 9 9 44 17 0 0 Name: 490 620 77 23 Do Test 147 9 411 58 10 117 561 120 Source: 0 0 Spreadsheet: 0 0 Connection: 0 0 Table: 10 279 338 289 Tests Student's T Test Two Sample Independent Two Sample Paired One Sample Z Test Two Sample Independent Two Sample Paired One Sample Qt::Vertical 20 40 Independent Variable Qt::AlignCenter - + Independent Variable Dependent Variable - + Qt::Vertical 20 40 Equal Variance 10 600 341 106 Qt::Horizontal Alternate Hypothesis mu > muo mu < muo mu != muo Null Hypothesis RadioButton RadioButton RadioButton