diff --git a/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.cpp b/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.cpp index 59a02ded18199b62bd83f379d004c3b2659056d7..a3f6740cac2be9bde64e1c0232c315cd3498d821 100644 --- a/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.cpp +++ b/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.cpp @@ -86,9 +86,24 @@ void NyTestLogFileInformation::fillMyData(std::vector<std::shared_ptr<NyTest> > dataToCalc.resize(0); status.resize(0); for (int i = 0; i < testGroup.size(); i++) { + status.push_back(testGroup.at(i)->getTestStatus()); + status.push_back(testGroup.at(i)->getTestStatus()); + std::vector<int> myLx = testGroup.at(i)->getLx(); - std::vector<double> myNy = testGroup.at(i)->getNy(); - std::vector<double> myNyDiff = testGroup.at(i)->getNyDiff(); + std::vector<double> myNy; + std::vector<double> myNyDiff; + + if (testGroup.at(i)->getTestStatus() == simulationCrashed || testGroup.at(i)->getTestStatus() == error) { + for (int i = 0; i < myLx.size(); i++) { + myNy.push_back((double)0.0); + myNyDiff.push_back((double)0.0); + } + + } + else { + myNy = testGroup.at(i)->getNy(); + myNyDiff = testGroup.at(i)->getNyDiff(); + } lx.insert(lx.end(), myLx.begin(), myLx.end()); lxForErase.insert(lxForErase.end(), myLx.begin(), myLx.end()); ny.insert(ny.end(), myNy.begin(), myNy.end()); @@ -96,8 +111,6 @@ void NyTestLogFileInformation::fillMyData(std::vector<std::shared_ptr<NyTest> > orderOfAccuracyNyDiff.push_back(testGroup.at(i)->getOrderOfAccuracyNyDiff()); dataToCalc.push_back(testGroup.at(i)->getDataToCalculate()); dataToCalc.push_back(testGroup.at(i)->getDataToCalculate()); - status.push_back(testGroup.at(i)->getTestStatus()); - status.push_back(testGroup.at(i)->getTestStatus()); } for (int i = 0; i < lxForErase.size(); i++) diff --git a/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.cpp b/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.cpp index 43a3cf002636609c9f54919d5519a5afe9eff0c9..bcc0a2be794d9be1641d3eb588c832a5f827f166 100644 --- a/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.cpp +++ b/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.cpp @@ -85,8 +85,17 @@ void PhiTestLogFileInformation::fillMyData(std::vector<std::shared_ptr<PhiTest> dataToCalc.resize(0); status.resize(0); for (int i = 0; i < testGroup.size(); i++) { + status.push_back(testGroup.at(i)->getTestStatus()); + status.push_back(testGroup.at(i)->getTestStatus()); + std::vector<int> myLx = testGroup.at(i)->getLx(); - std::vector<double> myPhiDiff = testGroup.at(i)->getPhiDiff(); + std::vector<double> myPhiDiff; + if (testGroup.at(i)->getTestStatus() == simulationCrashed || testGroup.at(i)->getTestStatus() == error) { + for (int i = 0; i < myLx.size(); i++) + myPhiDiff.push_back((double)0.0); + } + else + myPhiDiff = testGroup.at(i)->getPhiDiff(); lx.insert(lx.end(), myLx.begin(), myLx.end()); lxForErase.insert(lxForErase.end(), myLx.begin(), myLx.end()); @@ -94,8 +103,7 @@ void PhiTestLogFileInformation::fillMyData(std::vector<std::shared_ptr<PhiTest> orderOfAccuracy.push_back(testGroup.at(i)->getOrderOfAccuracy()); dataToCalc.push_back(testGroup.at(i)->getDataToCalculate()); dataToCalc.push_back(testGroup.at(i)->getDataToCalculate()); - status.push_back(testGroup.at(i)->getTestStatus()); - status.push_back(testGroup.at(i)->getTestStatus()); + } for (int i = 0; i < lxForErase.size(); i++)