mandlm/ESGRAF48
Archived
1
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases Wiki Activity

simplyfied test result evaluation

Browse Source
This commit is contained in:
mandlm 2018-06-14 19:19:53 +02:00
parent dbf29d194b
commit 017ff01a83
5 changed files with 116 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/ResultWidget/CMakeLists.txt
View File

@ -13,6 +13,7 @@ qt5_wrap_ui(GENUS_UI
add_library(${PROJECT_NAME}
ResultWidget.cpp
ResultModel.cpp
PRMap.cpp
${GENUS_UI}
)

41
source/ResultWidget/PRMap.cpp Normal file
View File

@ -0,0 +1,41 @@
#include "PRMap.h"
unsigned int PRMap::lookup(const Age &age, const unsigned int &points)
{
if (points >= m_PRs.size())
{
return 0;
}
auto ageIndex = [&]() -> size_t {
if (m_ages.empty())
{
return 0;
}
if (age < m_ages.front())
{
return 0;
}
if (m_ages.back() < age)
{
return m_ages.size() - 1;
}
for (size_t index = 1; index < m_ages.size(); ++index)
{
if (age < m_ages.at(index))
{
return index - 1;
}
}
}();
if (ageIndex >= m_PRs.at(points).size())
{
return 0;
}
return m_PRs.at(points).at(ageIndex);
}

14
source/ResultWidget/PRMap.h Normal file
View File

@ -0,0 +1,14 @@
#pragma once
#include "../Age.h"
#include <vector>
class PRMap
{
protected:
std::vector<Age> m_ages;
std::vector<std::vector<unsigned int>> m_PRs;
public:
unsigned int lookup(const Age &age, const unsigned int &points);
};

78
source/ResultWidget/ResultModel.cpp
View File

@ -21,71 +21,49 @@ int ResultModel::columnCount(const QModelIndex &parent) const
QVariant ResultModel::data(const QModelIndex &index, int role) const
{
if (role == Qt::DisplayRole)
if (role == Qt::DisplayRole && index.column() < m_results.size())
{
switch (index.row())
{
case 0:
if (index.column() < m_results.size())
{
auto points = m_results[index.column()].points();
if (points != 0)
{
size_t points = m_results[index.column()].points();
if (points != 0)
{
return static_cast<uint>(points);
}
return static_cast<uint>(points);
}
break;
}
case 1:
switch (index.column())
{
auto pr = m_results[index.column()].pr();
if (pr >= 84)
{
case 8:
{
auto pR = getPluralPR();
if (pR >= 84)
{
return pR;
}
}
break;
default:
break;
return static_cast<uint>(pr);
}
break;
}
case 2:
switch (index.column())
{
auto pr = m_results[index.column()].pr();
if (pr < 84 && pr > 16)
{
case 8:
{
auto pR = getPluralPR();
if (pR < 84 && pR > 16)
{
return pR;
}
}
break;
default:
break;
return static_cast<uint>(pr);
}
break;
}
case 3:
switch (index.column())
{
auto pr = m_results[index.column()].pr();
if (pr <= 16)
{
case 8:
{
auto pR = getPluralPR();
if (pR <= 16)
{
return pR;
}
}
break;
default:
break;
return static_cast<uint>(pr);
}
break;
}
default:
break;
}
};
return "-";
}
@ -140,17 +118,9 @@ void ResultModel::setPluralResult(size_t points)
{
if (m_results[8].points() != points)
{
m_results[8] = points;
m_results[8].setPoints(points);
m_results[8].setPR(PluralPR().lookup(m_age, points));
emit dataChanged(index(0, 8), index(4, 8));
}
}
unsigned int ResultModel::getPluralPoints() const
{
return m_results[8].points();
}
unsigned int ResultModel::getPluralPR() const
{
return PluralPR().lookup(m_age, getPluralPoints());
}

103
source/ResultWidget/ResultModel.h
View File

@ -1,72 +1,35 @@
#pragma once
#include "../Age.h"
#include <vector>
#include "PRMap.h"
#include <QAbstractTableModel>
class PluralPR
class PluralPR : public PRMap
{
// clang-format off
const std::vector<Age> m_ages = {
{ 4, 0 },
{ 4, 6 },
{ 5, 6 },
{ 9, 0 }
};
const std::vector<std::vector<unsigned int>> m_PRs = {
{ 0, 0, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 1, 1, 0 },
{ 7, 2, 1 },
{ 10, 4, 1},
{ 26, 10, 2 },
{ 57, 25, 7 },
{ 79, 56, 27 },
{ 100, 100, 100 }
};
// clang-format on
public:
unsigned int lookup(const Age &age, const unsigned int &points)
PluralPR()
{
if (points >= m_PRs.size())
{
return 0;
}
// clang-format off
m_ages = {
{ 4, 0 },
{ 4, 6 },
{ 5, 6 },
{ 9, 0 }
};
auto ageIndex = [&]() -> size_t {
if (m_ages.empty())
{
return 0;
}
if (age < m_ages.front())
{
return 0;
}
if (m_ages.back() < age)
{
return m_ages.size() - 1;
}
for (size_t index = 1; index < m_ages.size(); ++index)
{
if (age < m_ages.at(index))
{
return index - 1;
}
}
}();
if (ageIndex >= m_PRs.at(points).size())
{
return 0;
}
return m_PRs.at(points).at(ageIndex);
m_PRs = {
{ 0, 0, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 1, 1, 0 },
{ 7, 2, 1 },
{ 10, 4, 1},
{ 26, 10, 2 },
{ 57, 25, 7 },
{ 79, 56, 27 },
{ 100, 100, 100 }
};
// clang-format on
}
};
@ -74,20 +37,25 @@ class TestResult
{
private:
QString m_name;
size_t m_points;
size_t m_points = 0;
size_t m_pr = 0;
public:
TestResult(const char *name)
: m_name(name)
, m_points(0)
{
}
void operator=(const size_t &points)
void setPoints(const size_t &points)
{
m_points = points;
}
void setPR(const unsigned int &pr)
{
m_pr = pr;
}
const QString &name() const
{
return m_name;
@ -97,6 +65,11 @@ public:
{
return m_points;
}
const size_t pr() const
{
return m_pr;
}
};
class ResultModel : public QAbstractTableModel
@ -121,8 +94,4 @@ public:
void setAge(const Age &age);
void setPluralResult(size_t points);
private:
unsigned int getPluralPoints() const;
unsigned int getPluralPR() const;
};