Commit 1d30456c authored by Nick Draper's avatar Nick Draper
Browse files

clang formatting for this PR

parent 3f4ae8ab
......@@ -462,9 +462,9 @@ private:
m_progressObserver;
std::atomic<ExecutionState> m_executionState; ///< the current execution state
std::atomic<ResultState> m_resultState; ///< the current result State
bool m_isExecuted; ///< Algorithm is executed flag
bool m_isChildAlgorithm; ///< Algorithm is a child algorithm
std::atomic<ResultState> m_resultState; ///< the current result State
bool m_isExecuted; ///< Algorithm is executed flag
bool m_isChildAlgorithm; ///< Algorithm is a child algorithm
bool m_recordHistoryForChild; ///< Flag to indicate whether history should be
/// recorded. Applicable to child algs only
bool m_alwaysStoreInADS; ///< Always store in the ADS, even for child algos
......
......@@ -101,11 +101,10 @@ Algorithm::Algorithm()
m_executionState(ExecutionState::Uninitialized),
m_resultState(ResultState::NotFinished), m_isExecuted(false),
m_isChildAlgorithm(false), m_recordHistoryForChild(false),
m_alwaysStoreInADS(true), m_runningAsync(false),
m_rethrow(false), m_isAlgStartupLoggingEnabled(true),
m_startChildProgress(0.), m_endChildProgress(0.), m_algorithmID(this),
m_singleGroup(-1), m_groupsHaveSimilarNames(false),
m_inputWorkspaceHistories(),
m_alwaysStoreInADS(true), m_runningAsync(false), m_rethrow(false),
m_isAlgStartupLoggingEnabled(true), m_startChildProgress(0.),
m_endChildProgress(0.), m_algorithmID(this), m_singleGroup(-1),
m_groupsHaveSimilarNames(false), m_inputWorkspaceHistories(),
m_communicator(std::make_unique<Parallel::Communicator>()) {}
/// Virtual destructor
......@@ -193,7 +192,9 @@ bool Algorithm::getAlwaysStoreInADS() const { return m_alwaysStoreInADS; }
void Algorithm::setRethrows(const bool rethrow) { this->m_rethrow = rethrow; }
/// True if the algorithm is running.
bool Algorithm::isRunning() const { return (executionState() == ExecutionState::Running); }
bool Algorithm::isRunning() const {
return (executionState() == ExecutionState::Running);
}
//---------------------------------------------------------------------------------------------
/** Add an observer to a notification
......
......@@ -30,10 +30,9 @@ AlgorithmProxy::AlgorithmProxy(Algorithm_sptr alg)
m_alias(alg->alias()), m_summary(alg->summary()),
m_version(alg->version()), m_alg(alg),
m_executionState(ExecutionState::Initialized),
m_resultState(ResultState::NotFinished),
m_isLoggingEnabled(true), m_loggingOffset(0),
m_isAlgStartupLoggingEnabled(true), m_rethrow(false), m_isChild(false),
m_setAlwaysStoreInADS(true) {
m_resultState(ResultState::NotFinished), m_isLoggingEnabled(true),
m_loggingOffset(0), m_isAlgStartupLoggingEnabled(true), m_rethrow(false),
m_isChild(false), m_setAlwaysStoreInADS(true) {
if (!alg) {
throw std::logic_error("Unable to create a proxy algorithm.");
}
......@@ -110,7 +109,7 @@ bool AlgorithmProxy::executeAsyncImpl(const Poco::Void &dummy) {
throw;
}
stopped();
return (resultState()==ResultState::Success);
return (resultState() == ResultState::Success);
}
/// Gets the current execution state
......@@ -132,7 +131,9 @@ bool AlgorithmProxy::isInitialized() const {
}
/// Has the AlgorithmProxy already been executed successfully
bool AlgorithmProxy::isExecuted() const { return resultState() == ResultState::Success; }
bool AlgorithmProxy::isExecuted() const {
return resultState() == ResultState::Success;
}
/// Cancel the execution of the algorithm
void AlgorithmProxy::cancel() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment