johannes/Rennbahn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fastest sectors can only be from valid laps

Browse Source
This commit is contained in:
Johannes Paehr
2019-12-27 20:48:31 +01:00
parent f3692fb825
commit e55032d2ed
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
qvectorhelper.cpp
View File

@@ -23,7 +23,7 @@ int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
if (x.size() > 0) { if (x.size() > 0) {
for (auto vec : x) { for (auto vec : x) {
if (vec.size() >= 4) { if (vec.size() >= 4) {
if (vec.at(0) >= minSec1) { if (vec.at(0) >= minSec1 && vec.at(3) >= minTrackTime) {
min = vec.at(0); min = vec.at(0);
break; break;
} }
@@ -35,9 +35,9 @@ int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
} }
for (int i = 1; i < x.size(); i++) { for (int i = 1; i < x.size(); i++) {
if (x.at(i).size() >= 3) { // entire lap if (x.at(i).size() >= 4) { // entire lap
if (x.at(i).at(0) < min) { if (x.at(i).at(0) < min) {
if (x.at(i).at(0) >= minSec1) { if (x.at(i).at(0) >= minSec1 && x.at(i).at(3) >= minTrackTime) {
min = x.at(i).at(0); min = x.at(i).at(0);
} }
} }
@@ -49,8 +49,8 @@ int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
int min = 9999; int min = 9999;
if (x.size() > 0) { if (x.size() > 0) {
for (auto vec : x) { for (auto vec : x) {
if (vec.size() >= 3) { if (vec.size() >= 4) {
if (vec.at(1) >= minSec2) { if (vec.at(1) >= minSec2 && vec.at(3) >= minTrackTime) {
min = vec.at(1); min = vec.at(1);
break; break;
} }
@@ -62,9 +62,9 @@ int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
} }
for (int i = 1; i < x.size(); i++) { for (int i = 1; i < x.size(); i++) {
if (x.at(0).size() >= 3) { // entire lap if (x.at(0).size() >= 4) { // entire lap
if (x.at(i).at(1) < min) { if (x.at(i).at(1) < min) {
if (x.at(0).at(1) >= minSec2) { if (x.at(0).at(1) >= minSec2 && x.at(i).at(3) >= minTrackTime) {
min = x.at(i).at(1); min = x.at(i).at(1);
} }
} }
@@ -76,8 +76,8 @@ int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) {
int min = 9999; int min = 9999;
if (x.size() > 0) { if (x.size() > 0) {
for (auto vec : x) { for (auto vec : x) {
if (vec.size() >= 3) { if (vec.size() >= 4) {
if (vec.at(2) >= minSec3) { if (vec.at(2) >= minSec3 && vec.at(3) >= minTrackTime) {
min = vec.at(2); min = vec.at(2);
break; break;
} }
@@ -90,9 +90,9 @@ int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) {
} }
for (int i = 1; i < x.size(); i++) { for (int i = 1; i < x.size(); i++) {
if (x.at(i).size() >= 3) { // entire lap if (x.at(i).size() >= 4) { // entire lap
if (x.at(i).at(2) < min) { if (x.at(i).at(2) < min) {
if (x.at(0).at(2) >= minSec3) { if (x.at(0).at(2) >= minSec3 && x.at(i).at(3) >= minTrackTime) {
min = x.at(i).at(2); min = x.at(i).at(2);
} }
} }