Skip to content
Snippets Groups Projects
Commit 4015be3b authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename "reference" -> "direct" to avoid confusion with reference data

parent 9a865baa
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ namespace ...@@ -27,7 +27,7 @@ namespace
{ {
std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/, std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/,
const Simulation& reference_simulation) const Simulation& direct_simulation)
{ {
// initializing necessary GUI // initializing necessary GUI
DocumentModel documentModel; DocumentModel documentModel;
...@@ -36,10 +36,9 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/, ...@@ -36,10 +36,9 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& /*test_name*/,
MaterialModel materialModel; MaterialModel materialModel;
// populating GUI models from domain // populating GUI models from domain
GUIObjectBuilder::populateSampleModelFromSim(&sampleModel, &materialModel, GUIObjectBuilder::populateSampleModelFromSim(&sampleModel, &materialModel, direct_simulation);
reference_simulation); GUIObjectBuilder::populateInstrumentModel(&instrumentModel, direct_simulation);
GUIObjectBuilder::populateInstrumentModel(&instrumentModel, reference_simulation); GUIObjectBuilder::populateDocumentModel(&documentModel, direct_simulation);
GUIObjectBuilder::populateDocumentModel(&documentModel, reference_simulation);
std::unique_ptr<Simulation> domain_simulation = DomainSimulationBuilder::createSimulation( std::unique_ptr<Simulation> domain_simulation = DomainSimulationBuilder::createSimulation(
sampleModel.multiLayerItem(), instrumentModel.instrumentItem(), sampleModel.multiLayerItem(), instrumentModel.instrumentItem(),
......
...@@ -28,7 +28,7 @@ namespace ...@@ -28,7 +28,7 @@ namespace
{ {
std::unique_ptr<OutputData<double>> domainData(const std::string& test_name, std::unique_ptr<OutputData<double>> domainData(const std::string& test_name,
const Simulation& reference_simulation) const Simulation& direct_simulation)
{ {
const std::string output_name = const std::string output_name =
FileSystemUtils::jointPath(BATesting::PyStandardOutputDir(), test_name); FileSystemUtils::jointPath(BATesting::PyStandardOutputDir(), test_name);
...@@ -40,7 +40,7 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& test_name, ...@@ -40,7 +40,7 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& test_name,
const std::string pyscript_filename = const std::string pyscript_filename =
FileSystemUtils::jointPath(BATesting::PyStandardOutputDir(), test_name + ".py"); FileSystemUtils::jointPath(BATesting::PyStandardOutputDir(), test_name + ".py");
std::ofstream pythonFile(pyscript_filename); std::ofstream pythonFile(pyscript_filename);
pythonFile << ExportToPython::generatePyExportTest(reference_simulation); pythonFile << ExportToPython::generatePyExportTest(direct_simulation);
pythonFile.close(); pythonFile.close();
// Run Python script // Run Python script
...@@ -76,11 +76,9 @@ bool PyStandardTest::runTest() ...@@ -76,11 +76,9 @@ bool PyStandardTest::runTest()
domainData(m_name, *m_reference_simulation); domainData(m_name, *m_reference_simulation);
// Run direct simulation // Run direct simulation
std::cout << "- run reference simulation\n"; std::cout << "- run direct simulation\n";
m_reference_simulation->runSimulation(); m_reference_simulation->runSimulation();
const std::unique_ptr<OutputData<double>> reference_data = const std::unique_ptr<OutputData<double>> direct_data = m_reference_simulation->result().data();
m_reference_simulation->result().data();
return IntensityDataFunctions::checkRelativeDifference(*domain_data, *reference_data, return IntensityDataFunctions::checkRelativeDifference(*domain_data, *direct_data, m_threshold);
m_threshold);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment