OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: rename the summary regression/integrationtest classes

Browse Source 
it restores c++ ODR which is nice, but the main reason is to
allow usage of summary and generic comparison classes in the
the same application.
This commit is contained in:
Arne Morten Kvarving
2018-09-07 13:03:39 +02:00
parent bee4590aaa
commit 44f3b86547
6 changed files with 46 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/test_util/summaryRegressionTest.cpp
View File

@@ -22,7 +22,7 @@
#include <ert/util/stringlist.h>
#include <string>
void RegressionTest::getRegressionTest(){
void SummaryRegressionTest::getRegressionTest(){
std::vector<double> timeVec1, timeVec2;
setTimeVecs(timeVec1, timeVec2); // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc)
setDataSets(timeVec1, timeVec2); //Figures which dataset that contains more/less values pr keyword vector.
@@ -104,7 +104,7 @@ void RegressionTest::getRegressionTest(){
void RegressionTest::getRegressionTest(const char* keyword){
void SummaryRegressionTest::getRegressionTest(const char* keyword){
std::vector<double> timeVec1, timeVec2;
setTimeVecs(timeVec1, timeVec2); // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc)
setDataSets(timeVec1, timeVec2); //Figures which dataset that contains more/less values pr keyword vector.
@@ -126,7 +126,7 @@ void RegressionTest::getRegressionTest(const char* keyword){
bool RegressionTest::checkDeviation(Deviation deviation, const char* keyword, int refIndex, int checkIndex){
bool SummaryRegressionTest::checkDeviation(Deviation deviation, const char* keyword, int refIndex, int checkIndex){
double absTol = getAbsTolerance();
double relTol = getRelTolerance();
@@ -149,7 +149,7 @@ bool RegressionTest::checkDeviation(Deviation deviation, const char* keyword, in
bool RegressionTest::checkForKeyword(std::vector<double>& timeVec1, std::vector<double>& timeVec2, const char* keyword){
bool SummaryRegressionTest::checkForKeyword(std::vector<double>& timeVec1, std::vector<double>& timeVec2, const char* keyword){
std::vector<double> dataVec1, dataVec2;
getDataVecs(dataVec1,dataVec2,keyword);
chooseReference(timeVec1, timeVec2,dataVec1,dataVec2);
@@ -158,7 +158,7 @@ bool RegressionTest::checkForKeyword(std::vector<double>& timeVec1, std::vector<
bool RegressionTest::startTest(const char* keyword){
bool SummaryRegressionTest::startTest(const char* keyword){
size_t jvar = 0;
Deviation deviation;
bool result = true;