From 77e226f356d64601e1b9275f46d8f5b5ff80d805 Mon Sep 17 00:00:00 2001 From: Paul Leroy Date: Mon, 5 Jun 2023 10:06:21 +0200 Subject: [PATCH] Changes following PR --- confusionmatrix.cpp | 5 +++++ confusionmatrix.h | 3 ++- qTrain3DMASCDialog.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/confusionmatrix.cpp b/confusionmatrix.cpp index 2c3d8c1..f96ec12 100644 --- a/confusionmatrix.cpp +++ b/confusionmatrix.cpp @@ -299,3 +299,8 @@ bool ConfusionMatrix::save(QString filePath) return true; } + +float ConfusionMatrix::getOverallAccuracy() +{ + return m_overallAccuracy; +} diff --git a/confusionmatrix.h b/confusionmatrix.h index 6d7d85b..25bfc42 100644 --- a/confusionmatrix.h +++ b/confusionmatrix.h @@ -30,8 +30,8 @@ public: float computeOverallAccuracy(cv::Mat& matrix); void compute(const std::vector &actual, const std::vector &predicted); void setSessionRun(QString session, int run); - float m_overallAccuracy; bool save(QString filePath); + float getOverallAccuracy(); private: std::set classes; @@ -40,4 +40,5 @@ private: cv::Mat confusionMatrix; cv::Mat precisionRecallF1Score; std::vector class_numbers; + float m_overallAccuracy; }; diff --git a/qTrain3DMASCDialog.cpp b/qTrain3DMASCDialog.cpp index 89064a5..3959bf7 100644 --- a/qTrain3DMASCDialog.cpp +++ b/qTrain3DMASCDialog.cpp @@ -332,7 +332,7 @@ void Train3DMASCDialog::saveTraces(ConfusionMatrix *confusionMatrix) // save the run number and the overall accuracy if (m_traceStream.device()) - m_traceStream << run << " " << confusionMatrix->m_overallAccuracy << Qt::endl; + m_traceStream << run << " " << confusionMatrix->getOverallAccuracy() << Qt::endl; confusionMatrix->save(m_tracePath + "/" + "run_" + QString::number(run) + "_confusion_matrix.txt"); }