Commit c94bf051 authored by Nick Draper's avatar Nick Draper
Browse files

clang formatting for this pr

parent 44e46a85
......@@ -335,8 +335,10 @@ protected:
friend class AlgorithmProxy;
void initializeFromProxy(const AlgorithmProxy &);
void setExecutionState(const ExecutionState state); ///< Sets the current execution state
void setResultState(const ResultState state); ///< Sets the result execution state
void setExecutionState(
const ExecutionState state); ///< Sets the current execution state
void
setResultState(const ResultState state); ///< Sets the result execution state
void store();
......@@ -461,8 +463,8 @@ private:
ExecutionState m_executionState; ///< the current execution state
ResultState m_resultState; ///< the current result State
bool m_isExecuted; ///< Algorithm is executed flag
bool m_isChildAlgorithm; ///< Algorithm is a child algorithm
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
......
......@@ -185,14 +185,14 @@ private:
const int m_version; ///< version of the real algorithm
mutable boost::shared_ptr<Algorithm>
m_alg; ///< Shared pointer to a real algorithm. Created on demand
ExecutionState m_executionState; ///< the current execution state
ResultState m_resultState; ///< the current result State
bool m_isExecuted; ///< Executed flag
bool m_isLoggingEnabled; ///< is the logging of the underlying algorithm
/// enabled
int m_loggingOffset; ///< the logging priority offset
m_alg; ///< Shared pointer to a real algorithm. Created on demand
ExecutionState m_executionState; ///< the current execution state
ResultState m_resultState; ///< the current result State
bool m_isExecuted; ///< Executed flag
bool m_isLoggingEnabled; ///< is the logging of the underlying algorithm
/// enabled
int m_loggingOffset; ///< the logging priority offset
bool m_isAlgStartupLoggingEnabled; /// Whether to log alg startup and
/// closedown messages from the base class
/// (default = true)
......
......@@ -28,9 +28,9 @@ namespace API {
*/
using AlgorithmID = void *;
///The current state of the algorithm object
/// The current state of the algorithm object
enum class ExecutionState { UNINITIALIZED, INITIALIZED, RUNNING, FINISHED };
///The validity of the results of the algorithm object
/// The validity of the results of the algorithm object
enum class ResultState { INCOMPLETE, FAILED, SUCCESS };
/**
......
......@@ -140,7 +140,8 @@ bool Algorithm::isInitialized() const {
/// Has the Algorithm already been executed
bool Algorithm::isExecuted() const {
return ((executionState() == ExecutionState::FINISHED) && (resultState() == ResultState::SUCCESS)) ;
return ((executionState() == ExecutionState::FINISHED) &&
(resultState() == ResultState::SUCCESS));
}
//---------------------------------------------------------------------------------------------
......
......@@ -119,8 +119,7 @@ ExecutionState AlgorithmProxy::executionState() const {
}
/// Gets the current result State
ResultState AlgorithmProxy::resultState() const {
return m_resultState; }
ResultState AlgorithmProxy::resultState() const { return m_resultState; }
/// True if the algorithm is running.
bool AlgorithmProxy::isRunning() const {
......@@ -129,7 +128,7 @@ bool AlgorithmProxy::isRunning() const {
/// Has the AlgorithmProxy already been initialized
bool AlgorithmProxy::isInitialized() const {
return true; //Algorithm Proxies will always initialize the algorithm
return true; // Algorithm Proxies will always initialize the algorithm
}
/// Has the AlgorithmProxy already been executed
......
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