Commit 256f387f authored by Hahn, Steven's avatar Hahn, Steven
Browse files

Use find-and-replace to remove std::endl.

parent 72c7cc5f
......@@ -398,7 +398,7 @@ private:
* @returns A user level description of the problem or "" if it is valid.
*/
std::string isValidGroup(boost::shared_ptr<WorkspaceGroup> wsGroup) const {
g_log.debug() << " Input WorkspaceGroup found " << std::endl;
g_log.debug() << " Input WorkspaceGroup found \n";
std::vector<std::string> wsGroupNames = wsGroup->getNames();
std::string error;
......@@ -414,7 +414,7 @@ private:
"will therefore be ignored as "
"part of the GroupedWorkspace.";
g_log.debug() << error << std::endl;
g_log.debug() << error << '\n';
} else {
// ... and if it is a workspace of incorrect type, exclude the group by
// returning an error.
......@@ -423,7 +423,7 @@ private:
Kernel::PropertyWithValue<boost::shared_ptr<TYPE>>::type() +
".";
g_log.debug() << error << std::endl;
g_log.debug() << error << '\n';
return error;
}
......
......@@ -355,7 +355,7 @@ void Algorithm::lockWorkspaces() {
m_writeLockedWorkspaces.end(),
ws) == m_writeLockedWorkspaces.end()) {
// Write-lock it if not already
debugLog << "Write-locking " << ws->getName() << std::endl;
debugLog << "Write-locking " << ws->getName() << '\n';
ws->getLock()->writeLock();
m_writeLockedWorkspaces.push_back(ws);
}
......@@ -373,7 +373,7 @@ void Algorithm::lockWorkspaces() {
m_writeLockedWorkspaces.end(),
ws) == m_writeLockedWorkspaces.end()) {
// Read-lock it if not already write-locked
debugLog << "Read-locking " << ws->getName() << std::endl;
debugLog << "Read-locking " << ws->getName() << '\n';
ws->getLock()->readLock();
m_readLockedWorkspaces.push_back(ws);
}
......@@ -392,13 +392,13 @@ void Algorithm::unlockWorkspaces() {
auto &debugLog = g_log.debug();
for (auto &ws : m_writeLockedWorkspaces) {
if (ws) {
debugLog << "Unlocking " << ws->getName() << std::endl;
debugLog << "Unlocking " << ws->getName() << '\n';
ws->getLock()->unlock();
}
}
for (auto &ws : m_readLockedWorkspaces) {
if (ws) {
debugLog << "Unlocking " << ws->getName() << std::endl;
debugLog << "Unlocking " << ws->getName() << '\n';
ws->getLock()->unlock();
}
}
......@@ -592,7 +592,7 @@ bool Algorithm::execute() {
else {
getLogger().error() << "Error in execution of algorithm "
<< this->name() << std::endl
<< ex.what() << std::endl;
<< ex.what() << '\n';
}
notificationCenter().postNotification(
new ErrorNotification(this, ex.what()));
......@@ -604,7 +604,7 @@ bool Algorithm::execute() {
else {
getLogger().error() << "Logic Error in execution of algorithm "
<< this->name() << std::endl
<< ex.what() << std::endl;
<< ex.what() << '\n';
}
notificationCenter().postNotification(
new ErrorNotification(this, ex.what()));
......@@ -1068,7 +1068,7 @@ void Algorithm::logAlgorithmInfo() const {
logger.notice() << name() << " started";
if (this->isChild())
logger.notice() << " (child)";
logger.notice() << std::endl;
logger.notice() << '\n';
// Make use of the AlgorithmHistory class, which holds all the info we want
// here
AlgorithmHistory AH(this);
......@@ -1539,7 +1539,7 @@ void Algorithm::reportCompleted(const double &duration,
else {
getLogger().debug() << name() << " finished with isChild = " << isChild()
<< std::endl;
<< '\n';
}
m_running = false;
}
......
......@@ -22,7 +22,7 @@ AlgorithmFactoryImpl::AlgorithmFactoryImpl()
// are constructed so that it is destroyed after us and thus does
// not close any loaded DLLs with loaded algorithms in them
Mantid::Kernel::LibraryManager::Instance();
g_log.debug() << "Algorithm Factory created." << std::endl;
g_log.debug() << "Algorithm Factory created.\n";
}
AlgorithmFactoryImpl::~AlgorithmFactoryImpl() {}
......@@ -58,9 +58,9 @@ AlgorithmFactoryImpl::create(const std::string &name,
throw std::runtime_error("algorithm not registered " + name);
else {
g_log.error() << "algorithm " << name << " version " << version
<< " is not registered " << std::endl;
<< " is not registered \n";
g_log.error() << "the latest registered version is " << it->second
<< std::endl;
<< '\n';
throw std::runtime_error("algorithm not registered " +
createName(name, local_version));
}
......@@ -142,7 +142,7 @@ AlgorithmFactoryImpl::decodeName(const std::string &mangledName) const {
ss >> version;
g_log.debug() << "mangled string:" << mangledName << " name:" << name
<< " version:" << version << std::endl;
<< " version:" << version << '\n';
return std::pair<std::string, int>(name, version);
}
......
......@@ -190,15 +190,14 @@ AlgorithmHistory::getChildAlgorithm(const size_t index) const {
*/
void AlgorithmHistory::printSelf(std::ostream &os, const int indent) const {
os << std::string(indent, ' ') << "Algorithm: " << m_name;
os << std::string(indent, ' ') << " v" << m_version << std::endl;
os << std::string(indent, ' ') << " v" << m_version << '\n';
os << std::string(indent, ' ')
<< "Execution Date: " << m_executionDate.toFormattedString() << std::endl;
<< "Execution Date: " << m_executionDate.toFormattedString() << '\n';
os << std::string(indent, ' ')
<< "Execution Duration: " << m_executionDuration << " seconds"
<< std::endl;
<< "Execution Duration: " << m_executionDuration << " seconds" << '\n';
os << std::string(indent, ' ') << "Parameters:" << std::endl;
os << std::string(indent, ' ') << "Parameters:\n";
for (const auto &property : m_properties) {
property->printSelf(os, indent + 2);
......
......@@ -22,7 +22,7 @@ AlgorithmManagerImpl::AlgorithmManagerImpl() : m_managed_algs() {
m_max_no_algs = 100; // Default to keeping 100 algorithms if not specified
}
g_log.debug() << "Algorithm Manager created." << std::endl;
g_log.debug() << "Algorithm Manager created.\n";
}
/** Private destructor
......@@ -92,12 +92,12 @@ IAlgorithm_sptr AlgorithmManagerImpl::create(const std::string &algName,
<< "All algorithms in the AlgorithmManager are running. "
<< "Cannot pop oldest algorithm. "
<< "You should increase your 'algorithms.retained' value. "
<< m_managed_algs.size() << " in queue." << std::endl;
<< m_managed_algs.size() << " in queue.\n";
break;
} else {
// Normal; erase that algorithm
g_log.debug() << "Popping out oldest algorithm " << (*it)->name()
<< std::endl;
<< '\n';
m_managed_algs.erase(it);
}
}
......@@ -108,7 +108,7 @@ IAlgorithm_sptr AlgorithmManagerImpl::create(const std::string &algName,
} catch (std::runtime_error &ex) {
g_log.error() << "AlgorithmManager:: Unable to create algorithm " << algName
<< ' ' << ex.what() << std::endl;
<< ' ' << ex.what() << '\n';
throw std::runtime_error("AlgorithmManager:: Unable to create algorithm " +
algName + ' ' + ex.what());
}
......@@ -163,11 +163,11 @@ void AlgorithmManagerImpl::removeById(AlgorithmID id) {
for (auto it = m_managed_algs.begin(); it != itend; ++it) {
if ((**it).getAlgorithmID() == id) {
if (!(*it)->isRunning()) {
g_log.debug() << "Removing algorithm " << (*it)->name() << std::endl;
g_log.debug() << "Removing algorithm " << (*it)->name() << '\n';
m_managed_algs.erase(it);
} else {
g_log.debug() << "Unable to remove algorithm " << (*it)->name()
<< ". The algorithm is running." << std::endl;
<< ". The algorithm is running.\n";
}
break;
}
......
......@@ -26,7 +26,7 @@ void Column::setPlotType(int t) {
m_plotType = t;
else {
g_log.error() << "Cannot set plot of column to " << t
<< " . Ignore this attempt." << std::endl;
<< " . Ignore this attempt.\n";
}
}
......
......@@ -676,7 +676,7 @@ void CompositeFunction::setUpForFit() {
ParameterTie *tie = getTie(i);
if (tie && !tie->isConstant()) {
g_log.warning() << "Numeric derivatives should be used when "
"non-constant ties defined." << std::endl;
"non-constant ties defined.\n";
break;
}
}
......
......@@ -345,7 +345,7 @@ Workspace_sptr DataProcessorAlgorithm::load(const std::string &inputData,
// The communicator containing all processes
boost::mpi::communicator world;
g_log.notice() << "Chunk/Total: " << world.rank() + 1 << "/"
<< world.size() << std::endl;
<< world.size() << '\n';
loadAlg->setPropertyValue("OutputWorkspace", outputWSName);
loadAlg->setProperty("ChunkNumber", world.rank() + 1);
loadAlg->setProperty("TotalChunks", world.size());
......@@ -391,7 +391,7 @@ boost::shared_ptr<PropertyManager> DataProcessorAlgorithm::getProcessProperties(
processProperties =
PropertyManagerDataService::Instance().retrieve(propertyManagerName);
} else {
getLogger().notice() << "Could not find property manager" << std::endl;
getLogger().notice() << "Could not find property manager\n";
processProperties = boost::make_shared<PropertyManager>();
PropertyManagerDataService::Instance().addOrReplace(propertyManagerName,
processProperties);
......
......@@ -814,8 +814,7 @@ ExperimentInfo::getInstrumentFilename(const std::string &instrumentName,
const std::string &date) {
if (date.empty()) {
// Just use the current date
g_log.debug() << "No date specified, using current date and time."
<< std::endl;
g_log.debug() << "No date specified, using current date and time." << '\n';
const std::string now =
Kernel::DateAndTime::getCurrentTime().toISO8601String();
// Recursively call this method, but with both parameters.
......@@ -887,7 +886,7 @@ ExperimentInfo::getInstrumentFilename(const std::string &instrumentName,
}
}
}
g_log.debug() << "IDF selected is " << mostRecentIDF << std::endl;
g_log.debug() << "IDF selected is " << mostRecentIDF << '\n';
return mostRecentIDF;
}
......@@ -1090,7 +1089,7 @@ std::string ExperimentInfo::loadInstrumentXML(const std::string &filename) {
return Strings::loadFile(filename);
} catch (std::exception &e) {
g_log.error() << "Error loading instrument IDF file: " << filename << ".\n";
g_log.debug() << e.what() << std::endl;
g_log.debug() << e.what() << '\n';
throw;
}
}
......
......@@ -43,8 +43,7 @@ searchForLoader(const std::string &filename,
for (auto it = names.begin(); it != iend; ++it) {
const std::string &name = it->first;
const int version = it->second;
logger.debug() << "Checking " << name << " version " << version
<< std::endl;
logger.debug() << "Checking " << name << " version " << version << '\n';
// Use static cast for speed. Checks have been done at registration to check
// the types
......@@ -53,7 +52,7 @@ searchForLoader(const std::string &filename,
try {
const int confidence = alg->confidence(descriptor);
logger.debug() << name << " returned with confidence=" << confidence
<< std::endl;
<< '\n';
if (confidence > maxConfidence) // strictly greater
{
bestLoader = alg;
......@@ -61,7 +60,7 @@ searchForLoader(const std::string &filename,
}
} catch (std::exception &exc) {
logger.warning() << "Checking loader '" << name << "' raised an error: '"
<< exc.what() << "'. Loader skipped." << std::endl;
<< exc.what() << "'. Loader skipped.\n";
}
callback.apply(descriptor);
}
......@@ -100,8 +99,7 @@ FileLoaderRegistryImpl::chooseLoader(const std::string &filename) const {
using Kernel::FileDescriptor;
using Kernel::NexusDescriptor;
m_log.debug() << "Trying to find loader for '" << filename << "'"
<< std::endl;
m_log.debug() << "Trying to find loader for '" << filename << "'" << '\n';
IAlgorithm_sptr bestLoader;
if (NexusDescriptor::isHDF(filename)) {
......@@ -120,7 +118,7 @@ FileLoaderRegistryImpl::chooseLoader(const std::string &filename) const {
throw Kernel::Exception::NotFoundError(filename, "Unable to find loader");
}
m_log.debug() << "Found loader " << bestLoader->name() << " for file '"
<< filename << "'" << std::endl;
<< filename << "'\n";
return bestLoader;
}
......
......@@ -67,17 +67,17 @@ FrameworkManagerImpl::FrameworkManagerImpl()
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
g_log.notice() << Mantid::welcomeMessage() << std::endl;
g_log.notice() << Mantid::welcomeMessage() << '\n';
loadPluginsUsingKey(PLUGINS_DIR_KEY);
disableNexusOutput();
setNumOMPThreadsToConfigValue();
#ifdef MPI_BUILD
g_log.notice() << "This MPI process is rank: "
<< boost::mpi::communicator().rank() << std::endl;
<< boost::mpi::communicator().rank() << '\n';
#endif
g_log.debug() << "FrameworkManager created." << std::endl;
g_log.debug() << "FrameworkManager created.\n";
AsynchronousStartupTasks();
}
......@@ -95,7 +95,7 @@ void FrameworkManagerImpl::AsynchronousStartupTasks() {
} else {
g_log.information()
<< "Instrument updates disabled - cannot update instrument definitions."
<< std::endl;
<< '\n';
}
int checkIfNewerVersionIsAvailable = 0;
......@@ -104,7 +104,7 @@ void FrameworkManagerImpl::AsynchronousStartupTasks() {
if ((retValVersionCheck == 1) && (checkIfNewerVersionIsAvailable == 1)) {
CheckIfNewerVersionIsAvailable();
} else {
g_log.information() << "Version check disabled." << std::endl;
g_log.information() << "Version check disabled.\n";
}
setupUsageReporting();
......@@ -119,7 +119,7 @@ void FrameworkManagerImpl::UpdateInstrumentDefinitions() {
Poco::ActiveResult<bool> result = algDownloadInstrument->executeAsync();
} catch (Kernel::Exception::NotFoundError &) {
g_log.debug() << "DowndloadInstrument algorithm is not available - cannot "
"update instrument definitions." << std::endl;
"update instrument definitions.\n";
}
}
......@@ -131,7 +131,7 @@ void FrameworkManagerImpl::CheckIfNewerVersionIsAvailable() {
Poco::ActiveResult<bool> result = algCheckVersion->executeAsync();
} catch (Kernel::Exception::NotFoundError &) {
g_log.debug() << "CheckMantidVersion algorithm is not available - cannot "
"check if a newer version is available." << std::endl;
"check if a newer version is available.\n";
}
}
......@@ -383,7 +383,7 @@ bool FrameworkManagerImpl::deleteWorkspace(const std::string &wsName) {
try {
ws_sptr = AnalysisDataService::Instance().retrieve(wsName);
} catch (Kernel::Exception::NotFoundError &ex) {
g_log.error() << ex.what() << std::endl;
g_log.error() << ex.what() << '\n';
return false;
}
......@@ -402,8 +402,7 @@ bool FrameworkManagerImpl::deleteWorkspace(const std::string &wsName) {
retVal = true;
} catch (Kernel::Exception::NotFoundError &) {
// workspace was not found
g_log.error() << "Workspace " << wsName << " could not be found."
<< std::endl;
g_log.error() << "Workspace " << wsName << " could not be found." << '\n';
retVal = false;
}
return retVal;
......
......@@ -776,12 +776,12 @@ void IFunction::setMatrixWorkspace(
g_log.debug()
<< "For FitParameter " << parameterName(i)
<< " centre of peak before any unit convertion is "
<< centreValue << std::endl;
<< centreValue << '\n';
centreValue =
convertValue(centreValue, centreUnit, workspace, wi);
g_log.debug() << "For FitParameter " << parameterName(i)
<< " centre of peak after any unit convertion is "
<< centreValue << std::endl;
<< centreValue << '\n';
}
double paramValue = fitParam.getValue(centreValue);
......@@ -797,11 +797,11 @@ void IFunction::setMatrixWorkspace(
fitParam.getLookUpTable().getYUnit(); // from table
g_log.debug() << "The FitParameter " << parameterName(i)
<< " = " << paramValue
<< " before y-unit convertion" << std::endl;
<< " before y-unit convertion\n";
paramValue /= convertValue(1.0, resultUnit, workspace, wi);
g_log.debug() << "The FitParameter " << parameterName(i)
<< " = " << paramValue
<< " after y-unit convertion" << std::endl;
<< " after y-unit convertion\n";
} else {
// so from formula
......@@ -828,19 +828,18 @@ void IFunction::setMatrixWorkspace(
g_log.debug() << "The FitParameter " << parameterName(i)
<< " = " << paramValue
<< " before result-unit convertion (using "
<< resultUnitStr << ")" << std::endl;
<< resultUnitStr << ")\n";
paramValue *= p.Eval();
g_log.debug() << "The FitParameter " << parameterName(i)
<< " = " << paramValue
<< " after result-unit convertion"
<< std::endl;
<< " after result-unit convertion" << '\n';
} catch (mu::Parser::exception_type &e) {
g_log.error()
<< "Cannot convert formula unit to workspace unit"
<< " Formula unit which cannot be passed is "
<< resultUnitStr
<< ". Muparser error message is: " << e.GetMsg()
<< std::endl;
<< '\n';
}
} // end if
} // end trying to convert result-unit from formula or y-unit for
......
......@@ -233,7 +233,7 @@ std::complex<double> E1(std::complex<double> z) {
exp_e1 = r;
} else if (az <= 10.0 || (rz < 0.0 && az < 20.0)) {
// Some interesting region, equal to integrate to infinity, converged
// cout << "[DB] Type 1" << endl;
// cout << "[DB] Type 1\n";
std::complex<double> r(1.0, 0.0);
exp_e1 = r;
......
......@@ -524,9 +524,9 @@ std::vector<size_t> MatrixWorkspace::getDetectorIDToWorkspaceIndexVector(
int index = det + offset;
if (index < 0 || index >= outSize) {
g_log.debug() << "MatrixWorkspace::getDetectorIDToWorkspaceIndexVector("
"): detector ID found (" << det
<< " at workspace index " << workspaceIndex
<< ") is invalid." << std::endl;
"): detector ID found ("
<< det << " at workspace index " << workspaceIndex
<< ") is invalid.\n";
} else
// Save it at that point.
out[index] = workspaceIndex;
......
......@@ -173,7 +173,7 @@ NotebookBuilder::buildPropertyString(PropertyHistory_const_sptr propHistory) {
propHistory->type()) != nonWorkspaceTypes.end() &&
propHistory->direction() == Direction::Output) {
g_log.debug() << "Ignoring property " << propHistory->name()
<< " of type " << propHistory->type() << std::endl;
<< " of type " << propHistory->type() << '\n';
// Handle numerical properties
} else if (propHistory->type() == "number") {
prop = propHistory->name() + "=" + propHistory->value();
......
......@@ -165,7 +165,7 @@ double ParamFunction::getParameter(const std::string &name) const {
if (parvalue != parvalue || !(parvalue > -DBL_MAX && parvalue < DBL_MAX)) {
g_log.warning() << "Parameter " << name << " has a NaN or infinity value "
<< std::endl;
<< '\n';
}
return parvalue;
......
......@@ -13,7 +13,7 @@ Kernel::Logger g_log("RemoteJobManagerFactory");
/// Private constructor, singleton class
RemoteJobManagerFactoryImpl::RemoteJobManagerFactoryImpl()
: Mantid::Kernel::DynamicFactory<IRemoteJobManager>() {
g_log.debug() << "RemoteJobManager factory created." << std::endl;
g_log.debug() << "RemoteJobManager factory created.\n";
}
/**
......
......@@ -148,8 +148,7 @@ double Run::getProtonCharge() const {
charge = m_manager.getProperty(PROTON_CHARGE_LOG_NAME);
} else {
g_log.warning() << PROTON_CHARGE_LOG_NAME
<< " log was not found. Proton Charge set to 0.0"
<< std::endl;
<< " log was not found. Proton Charge set to 0.0" << '\n';
}
return charge;
}
......
......@@ -200,7 +200,7 @@ ScriptBuilder::buildPropertyString(PropertyHistory_const_sptr propHistory) {
propHistory->type()) != nonWorkspaceTypes.end() &&
propHistory->direction() == Direction::Output) {
g_log.debug() << "Ignoring property " << propHistory->name()
<< " of type " << propHistory->type() << std::endl;
<< " of type " << propHistory->type() << '\n';
// Handle numerical properties
} else if (propHistory->type() == "number") {
prop = propHistory->name() + "=" + propHistory->value();
......
......@@ -20,7 +20,7 @@ using std::size_t;
/// Private constructor for singleton class
WorkspaceFactoryImpl::WorkspaceFactoryImpl()
: Mantid::Kernel::DynamicFactory<Workspace>() {
g_log.debug() << "WorkspaceFactory created." << std::endl;
g_log.debug() << "WorkspaceFactory created.\n";
}
/** Create a new instance of the same type of workspace as that given as
......
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