From 05659a3bd548ffedfcb36e58a315e37de512379a Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Tue, 16 Jan 2018 09:51:31 +0100
Subject: [PATCH] code reordering
---
Core/Simulation/Simulation.cpp | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index 68a9735a1e5..ffaf50f1ef8 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -131,23 +131,20 @@ void Simulation::runSimulation()
+ ( sample()->hasRoughness() ? 1 : 0 );
m_progress.setExpectedNTicks(prefactor*param_combinations*numberOfSimulationElements());
- // no averaging needed:
+ std::unique_ptr<ParameterPool> P_param_pool(createParameterTree());
if (param_combinations == 1) {
- std::unique_ptr<ParameterPool> P_param_pool(createParameterTree());
+ // no averaging needed:
m_distribution_handler.setParameterValues(P_param_pool.get(), 0);
runSingleSimulation();
- transferResultsToIntensityMap();
- return;
- }
-
- // average over parameter distributions:
- std::unique_ptr<ParameterPool> P_param_pool(createParameterTree());
- const bool use_storage = true;
- for (size_t index = 0; index < param_combinations; ++index) {
- double weight = m_distribution_handler.setParameterValues(P_param_pool.get(), index);
- runSingleSimulation(use_storage, weight);
+ } else {
+ // average over parameter distributions:
+ const bool use_storage = true;
+ for (size_t index = 0; index < param_combinations; ++index) {
+ double weight = m_distribution_handler.setParameterValues(P_param_pool.get(), index);
+ runSingleSimulation(use_storage, weight);
+ }
+ moveDataFromStorage();
}
- moveDataFromStorage();
transferResultsToIntensityMap();
}
--
GitLab