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

clang formating re #22143

parent 7fb06a76
......@@ -183,7 +183,8 @@ public:
/// Function to return the separator token for the category string. A default
/// implementation ';' is provided
const std::string categorySeparator() const override { return ";"; }
/// Function to return all of the seeAlso (these are not validated) algorithms related to this algorithm.A default implementation is provided.
/// Function to return all of the seeAlso (these are not validated) algorithms
/// related to this algorithm.A default implementation is provided.
const std::vector<std::string> seeAlso() const { return {}; };
/// function to return any aliases to the algorithm; A default implementation
/// is provided
......
......@@ -185,10 +185,10 @@ private:
const std::string m_name; ///< name of the real algorithm
const std::string m_category; ///< category of the real algorithm
const std::string
m_categorySeparator; ///< category seperator of the real algorithm
m_categorySeparator; ///< category seperator of the real algorithm
const std::vector<std::string> m_seeAlso; ///< seeAlso of the real algorithm
const std::string m_alias; ///< alias to the algorithm
const std::string m_helpURL; ///< Optional documentation URL
const std::string m_alias; ///< alias to the algorithm
const std::string m_helpURL; ///< Optional documentation URL
const std::string m_summary; ///<Message to display in GUI and help.
const int m_version; ///< version of the real algorithm
......
......@@ -19,9 +19,10 @@ AlgorithmProxy::AlgorithmProxy(Algorithm_sptr alg)
m_executeAsync(new Poco::ActiveMethod<bool, Poco::Void, AlgorithmProxy>(
this, &AlgorithmProxy::executeAsyncImpl)),
m_name(alg->name()), m_category(alg->category()),
m_categorySeparator(alg->categorySeparator()), m_seeAlso(alg->seeAlso()), m_alias(alg->alias()),
m_summary(alg->summary()), m_version(alg->version()), m_alg(alg),
m_isExecuted(), m_isLoggingEnabled(true), m_loggingOffset(0),
m_categorySeparator(alg->categorySeparator()), m_seeAlso(alg->seeAlso()),
m_alias(alg->alias()), m_summary(alg->summary()),
m_version(alg->version()), m_alg(alg), m_isExecuted(),
m_isLoggingEnabled(true), m_loggingOffset(0),
m_isAlgStartupLoggingEnabled(true), m_rethrow(false), m_isChild(false),
m_setAlwaysStoreInADS(true) {
if (!alg) {
......
......@@ -30,7 +30,7 @@ public:
return "ProxyCat";
} ///< Algorithm's category for identification
const std::vector<std::string> seeAlso() const override {
return{ "elephant", "seal" };
return {"elephant", "seal"};
} ///< Algorithm's seeAlso
const std::string alias() const override {
return "Dog";
......@@ -137,7 +137,7 @@ public:
TS_ASSERT_EQUALS(alg->version(), 1);
TS_ASSERT_EQUALS(alg->category(), "ProxyCat");
TS_ASSERT_EQUALS(alg->alias(), "Dog");
std::vector <std::string> seeAlsoList{ "elephant", "seal" };
std::vector<std::string> seeAlsoList{"elephant", "seal"};
TS_ASSERT_EQUALS(alg->seeAlso(), seeAlsoList);
TS_ASSERT(alg->isInitialized());
TS_ASSERT(alg->existsProperty("prop1"));
......
......@@ -242,7 +242,7 @@ public:
}
void testSeeAlso() {
std::vector<std::string> result{ "rabbit" };
std::vector<std::string> result{"rabbit"};
result.emplace_back("goldfish");
result.emplace_back("Spotted Hyena");
TS_ASSERT_EQUALS(alg.seeAlso(), result);
......
......@@ -23,7 +23,9 @@ public:
} ///< Algorithm's category for identification
const std::string alias() const override { return "Dog"; }
const std::string summary() const override { return "Test summary"; }
const std::vector<std::string> seeAlso() const override { return{ "rabbit", "goldfish", "Spotted Hyena" }; }
const std::vector<std::string> seeAlso() const override {
return {"rabbit", "goldfish", "Spotted Hyena"};
}
void init() override {
declareProperty("prop1", "value");
......
......@@ -48,7 +48,7 @@ public:
/// Algorithm's version for identification
int version() const override { return 1; };
const std::vector<std::string> seeAlso() const override {
return{ "AddSampleLog" };
return {"AddSampleLog"};
}
/// Algorithm's category for identification
const std::string category() const override { return "DataHandling\\Logs"; }
......
......@@ -43,7 +43,7 @@ public:
const std::string name() const override;
int version() const override;
const std::vector<std::string> seeAlso() const override {
return{ "Comment" };
return {"Comment"};
}
const std::string category() const override;
const std::string summary() const override;
......
......@@ -44,7 +44,7 @@ public:
/// Algorithm's version for identification
int version() const override { return 1; };
const std::vector<std::string> seeAlso() const override {
return{ "AddPeakHKL","CalculatePeaksHKL" };
return {"AddPeakHKL", "CalculatePeaksHKL"};
}
/// Algorithm's category for identification
const std::string category() const override { return "Crystal\\Peaks"; }
......
......@@ -58,7 +58,7 @@ public:
/// Algorithm's version
int version() const override { return (1); }
const std::vector<std::string> seeAlso() const override {
return{ "AddSampleLogMultiple","AddTimeSeriesLog","DeleteLog","LoadLog" };
return {"AddSampleLogMultiple", "AddTimeSeriesLog", "DeleteLog", "LoadLog"};
}
/// Algorithm's category for identification
const std::string category() const override { return "DataHandling\\Logs"; }
......
......@@ -43,7 +43,7 @@ public:
int version() const override;
const std::vector<std::string> seeAlso() const override {
return{ "AddSampleLog","GetTimeSeriesLogInformation","MergeLogs" };
return {"AddSampleLog", "GetTimeSeriesLogInformation", "MergeLogs"};
}
const std::string category() const override;
......
......@@ -68,7 +68,7 @@ public:
/// Algorithm's version for identification. @see Algorithm::version
int version() const override;
const std::vector<std::string> seeAlso() const override {
return{ "DiffractionFocussing","AlignAndFocusPowder" };
return {"DiffractionFocussing", "AlignAndFocusPowder"};
}
/// Algorithm's category for identification. @see Algorithm::category
const std::string category() const override;
......
......@@ -44,7 +44,7 @@ public:
const std::string name() const override;
int version() const override;
const std::vector<std::string> seeAlso() const override {
return{ "AbsorptionCorrection" };
return {"AbsorptionCorrection"};
}
const std::string category() const override;
const std::string summary() const override;
......
......@@ -47,7 +47,7 @@ public:
const std::string name() const override;
int version() const override;
const std::vector<std::string> seeAlso() const override {
return{ "ConjoinSpectra" };
return {"ConjoinSpectra"};
}
private:
......
......@@ -46,7 +46,7 @@ public:
/// Algorithm's version for identification
int version() const override { return 1; };
const std::vector<std::string> seeAlso() const override {
return{ "CalMuonDeadTime" };
return {"CalMuonDeadTime"};
}
/// Algorithm's category for identification
const std::string category() const override {
......
......@@ -56,7 +56,7 @@ public:
/// Algorithm's version
int version() const override { return (1); }
const std::vector<std::string> seeAlso() const override {
return{ "CalculateTransmission","CalculateTransmissionBeamSpreader" };
return {"CalculateTransmission", "CalculateTransmissionBeamSpreader"};
}
/// Algorithm's category for identification
const std::string category() const override {
......
......@@ -62,7 +62,7 @@ public:
/// Algorithm's version for identification overriding a virtual method
int version() const override { return 1; }
const std::vector<std::string> seeAlso() const override {
return{ "CalculateMuonAsymmetry" };
return {"CalculateMuonAsymmetry"};
}
/// Algorithm's category for identification overriding a virtual method
const std::string category() const override { return "Muon"; }
......
......@@ -41,7 +41,7 @@ public:
const std::string name() const override;
int version() const override;
const std::vector<std::string> seeAlso() const override {
return{ "Rebin2D" };
return {"Rebin2D"};
}
const std::string category() const override;
const std::string summary() const override;
......
......@@ -46,7 +46,7 @@ public:
/// Algorithm's version for identification overriding a virtual method
int version() const override { return 1; };
const std::vector<std::string> seeAlso() const override {
return{ "InvertMask" };
return {"InvertMask"};
}
/// Algorithm's category for identification overriding a virtual method
const std::string category() const override { return "Transforms\\Masking"; }
......
......@@ -46,7 +46,7 @@ public:
/// Algorithm's version for identification overriding a virtual method
int version() const override { return 1; }
const std::vector<std::string> seeAlso() const override {
return{ "ApplyDeadTimeCorr" };
return {"ApplyDeadTimeCorr"};
}
/// Algorithm's category for identification overriding a virtual method
const std::string category() const override { return "Muon"; }
......
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