From 75ef201c413736dbdb7434767e8a19c18695effd Mon Sep 17 00:00:00 2001
From: Timon Habenicht <t.habenicht@tu-bs.de>
Date: Thu, 17 May 2018 10:11:10 +0200
Subject: [PATCH] renames Reader to ConfigFileReader
---
.../ConfigFileReader.cpp} | 24 +++++++++----------
.../ConfigFileReader.h} | 12 +++++-----
.../package.include | 0
targets/tests/NumericalTests/main.cpp | 8 +++----
4 files changed, 22 insertions(+), 22 deletions(-)
rename targets/tests/NumericalTests/Utilities/{Reader/Reader.cpp => ConfigFileReader/ConfigFileReader.cpp} (89%)
rename targets/tests/NumericalTests/Utilities/{Reader/Reader.h => ConfigFileReader/ConfigFileReader.h} (85%)
rename targets/tests/NumericalTests/Utilities/{Reader => ConfigFileReader}/package.include (100%)
diff --git a/targets/tests/NumericalTests/Utilities/Reader/Reader.cpp b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
similarity index 89%
rename from targets/tests/NumericalTests/Utilities/Reader/Reader.cpp
rename to targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
index c462c9cb9..0e838586d 100644
--- a/targets/tests/NumericalTests/Utilities/Reader/Reader.cpp
+++ b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
@@ -1,4 +1,4 @@
-#include "reader.h"
+#include "ConfigFileReader.h"
#include <fstream>
#include <iostream>
@@ -23,7 +23,7 @@
#include "Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h"
#include "Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.h"
-bool Reader::testShouldRun(std::vector<bool> test)
+bool ConfigFileReader::testShouldRun(std::vector<bool> test)
{
for (int i = 0; i < test.size(); i++) {
if (test.at(i))
@@ -32,22 +32,22 @@ bool Reader::testShouldRun(std::vector<bool> test)
return false;
}
-std::shared_ptr<Reader> Reader::getNewInstance(const std::string aFilePath)
+std::shared_ptr<ConfigFileReader> ConfigFileReader::getNewInstance(const std::string aFilePath)
{
- return std::shared_ptr<Reader>(new Reader(aFilePath));
+ return std::shared_ptr<ConfigFileReader>(new ConfigFileReader(aFilePath));
}
-std::shared_ptr<TestInformation> Reader::getTestInformation()
+std::shared_ptr<TestInformation> ConfigFileReader::getTestInformation()
{
return testInfo;
}
-std::vector<std::shared_ptr<TestParameter>> Reader::getTestParameter()
+std::vector<std::shared_ptr<TestParameter>> ConfigFileReader::getTestParameter()
{
return testParameter;
}
-Reader::Reader(const std::string aFilePath)
+ConfigFileReader::ConfigFileReader(const std::string aFilePath)
{
std::ifstream stream;
stream.open(aFilePath.c_str(), std::ios::in);
@@ -112,7 +112,7 @@ Reader::Reader(const std::string aFilePath)
makeTestInformation();
}
-void Reader::makeTestInformation()
+void ConfigFileReader::makeTestInformation()
{
testInfo = TestInformationImp::getNewInstance();
@@ -129,7 +129,7 @@ void Reader::makeTestInformation()
testInfo->setTestResults(testResults);
}
-void Reader::makeTestParameter()
+void ConfigFileReader::makeTestParameter()
{
if (testShouldRun(tgv)) {
std::shared_ptr< PhiAndNuTest> tgvTestResults = PhiAndNuTest::getNewInstance("TaylorGreenVortex", minOrderOfAccuracy, testOutput);
@@ -153,7 +153,7 @@ void Reader::makeTestParameter()
}
}
-void Reader::makeSimulationInfo()
+void ConfigFileReader::makeSimulationInfo()
{
for (int i = 0; i < tgv.size(); i++) {
if (tgv.at(i)) {
@@ -167,7 +167,7 @@ void Reader::makeSimulationInfo()
}
}
-void Reader::makeLogFileInformation()
+void ConfigFileReader::makeLogFileInformation()
{
logInfo.push_back(LogFileInformationOutput::getNewInstance(devices));
@@ -185,7 +185,7 @@ void Reader::makeLogFileInformation()
}
}
-void Reader::makeTestResults()
+void ConfigFileReader::makeTestResults()
{
for (int i = 0; i < tests.size(); i++) {
testResults.push_back(tests.at(i));
diff --git a/targets/tests/NumericalTests/Utilities/Reader/Reader.h b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.h
similarity index 85%
rename from targets/tests/NumericalTests/Utilities/Reader/Reader.h
rename to targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.h
index 4142f7fcb..781572ce9 100644
--- a/targets/tests/NumericalTests/Utilities/Reader/Reader.h
+++ b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.h
@@ -1,5 +1,5 @@
-#ifndef READER_H
-#define READER_H
+#ifndef CONFIG_FILE_READER_H
+#define CONFIG_FILE_READER_H
#include "LBM\LB.h"
@@ -16,17 +16,17 @@ class PhiAndNuTest;
class SimulationInfo;
class LogFileInformation;
-class Reader
+class ConfigFileReader
{
public:
- static std::shared_ptr< Reader> getNewInstance(const std::string aFilePath);
+ static std::shared_ptr< ConfigFileReader> getNewInstance(const std::string aFilePath);
std::shared_ptr <TestInformation> getTestInformation();
std::vector <std::shared_ptr< TestParameter> > getTestParameter();
protected:
- Reader() {};
- Reader(const std::string aFilePath);
+ ConfigFileReader() {};
+ ConfigFileReader(const std::string aFilePath);
private:
void makeTestInformation();
diff --git a/targets/tests/NumericalTests/Utilities/Reader/package.include b/targets/tests/NumericalTests/Utilities/ConfigFileReader/package.include
similarity index 100%
rename from targets/tests/NumericalTests/Utilities/Reader/package.include
rename to targets/tests/NumericalTests/Utilities/ConfigFileReader/package.include
diff --git a/targets/tests/NumericalTests/main.cpp b/targets/tests/NumericalTests/main.cpp
index 00d0d9a9b..216c7a533 100644
--- a/targets/tests/NumericalTests/main.cpp
+++ b/targets/tests/NumericalTests/main.cpp
@@ -3,16 +3,16 @@
#include "VirtualFluids_GPU/LBM/Simulation.h"
-#include "Utilities/Reader/Reader.h"
+#include "Utilities/ConfigFileReader/ConfigFileReader.h"
#include "Utilities/TestCondition/TestCondition.h"
#include "Utilities/TestConditionFactory/TestConditionFactoryImp.h"
#include "Utilities/Calculator/Calculator.h"
#include "Utilities/TestResults/TestResults.h"
#include "Utilities/TestInformation/TestInformation.h"
-static void testHULC(const std::string &configFile)
+static void startNumericalTests(const std::string &configFile)
{
- std::shared_ptr< Reader> configReader = Reader::getNewInstance(configFile);
+ std::shared_ptr< ConfigFileReader> configReader = ConfigFileReader::getNewInstance(configFile);
std::shared_ptr<TestInformation> testInfo = configReader->getTestInformation();
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
MPI_Init(&argc, &argv);
if (argc > 1)
- testHULC(argv[1]);
+ startNumericalTests(argv[1]);
MPI_Finalize();
--
GitLab