From f6af676df712fea19c0d028fa8807831abca12a0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Dec 2021 16:08:44 +0100
Subject: [PATCH] rename ret -> result
---
App/main.cpp | 8 ++--
Base/Util/Algorithms.h | 12 +++---
Base/Util/FileSystemUtils.cpp | 12 +++---
Core/Export/ComponentKeyHandler.h | 6 +--
Device/Data/DataUtils.cpp | 8 ++--
Device/Data/OutputData.h | 18 ++++----
GUI/Model/Sample/LayerItem.cpp | 10 ++---
GUI/Model/To/DomainSimulationBuilder.cpp | 42 +++++++++----------
Resample/Options/SimulationOptions.cpp | 6 +--
Resample/Processed/ProcessedLayout.cpp | 10 ++---
Sample/Aggregate/Interference1DLattice.cpp | 10 ++---
Sample/Aggregate/Interference2DLattice.cpp | 10 ++---
.../Aggregate/Interference2DParaCrystal.cpp | 10 ++---
.../Aggregate/Interference2DSuperLattice.cpp | 10 ++---
Sample/Aggregate/Interference3DLattice.cpp | 8 ++--
.../Aggregate/InterferenceFinite2DLattice.cpp | 8 ++--
.../Aggregate/InterferenceFinite3DLattice.cpp | 6 +--
Sample/Aggregate/InterferenceHardDisk.cpp | 4 +-
Sample/Aggregate/InterferenceNone.cpp | 6 +--
.../InterferenceRadialParaCrystal.cpp | 12 +++---
Sample/Aggregate/InterferenceTwin.cpp | 6 +--
Sample/HardParticle/FormFactorFullSphere.cpp | 6 +--
Sample/Lattice/Lattice3D.cpp | 6 +--
Sample/Multilayer/MultiLayer.cpp | 25 +++++------
Sample/ff/PolyhedralComponents.cpp | 32 +++++++-------
Sample/ff/Polyhedron.cpp | 8 ++--
Tests/Functional/PyStd/Check.cpp | 6 +--
27 files changed, 153 insertions(+), 152 deletions(-)
diff --git a/App/main.cpp b/App/main.cpp
index 43d85e01475..9c0c5d93b3b 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
ApplicationSettings applicationSettings;
SessionData GSession;
- int ret;
+ int result;
#if !defined(BUILD_DEBUG)
try {
@@ -75,7 +75,7 @@ int main(int argc, char* argv[])
win.show();
- ret = QApplication::exec();
+ result = QApplication::exec();
GSession.instrumentLibrary.saveIfModified();
#if !defined(BUILD_DEBUG)
@@ -88,9 +88,9 @@ int main(int argc, char* argv[])
+ QString::fromStdString(boost::current_exception_diagnostic_information()));
box.addButton("Acknowledge", QMessageBox::AcceptRole);
box.exec();
- ret = EXIT_FAILURE;
+ result = EXIT_FAILURE;
}
#endif
- return ret;
+ return result;
}
diff --git a/Base/Util/Algorithms.h b/Base/Util/Algorithms.h
index 0bbb4011ffd..b39aa8c6ea9 100644
--- a/Base/Util/Algorithms.h
+++ b/Base/Util/Algorithms.h
@@ -58,11 +58,11 @@ double BaseUtils::algo::min_value(const Iterator& begin, const Iterator& end,
const Evaluator& evaluate)
{
ASSERT(begin != end);
- double ret = evaluate(*begin);
+ double result = evaluate(*begin);
Iterator it = begin;
while (++it != end)
- ret = std::min(ret, evaluate(*it));
- return ret;
+ result = std::min(result, evaluate(*it));
+ return result;
}
template <typename Evaluator, typename Iterator>
@@ -70,11 +70,11 @@ double BaseUtils::algo::max_value(const Iterator& begin, const Iterator& end,
const Evaluator& evaluate)
{
ASSERT(begin != end);
- double ret = evaluate(*begin);
+ double result = evaluate(*begin);
Iterator it = begin;
while (++it != end)
- ret = std::max(ret, evaluate(*it));
- return ret;
+ result = std::max(result, evaluate(*it));
+ return result;
}
template <class T>
diff --git a/Base/Util/FileSystemUtils.cpp b/Base/Util/FileSystemUtils.cpp
index d491ecbd610..d09af3c8602 100644
--- a/Base/Util/FileSystemUtils.cpp
+++ b/Base/Util/FileSystemUtils.cpp
@@ -57,16 +57,16 @@ bool BaseUtils::Filesystem::createDirectories(const std::string& dir_name)
std::vector<std::string> BaseUtils::Filesystem::filesInDirectory(const std::string& dir_name)
{
- std::vector<std::string> ret;
+ std::vector<std::string> result;
if (!fs::exists(dir_name))
throw std::runtime_error("BaseUtils::Filesystem::filesInDirectory '" + dir_name
+ "' does not exist");
for (const auto& entry : fs::directory_iterator(dir_name))
if (entry.is_regular_file())
- ret.push_back(entry.path().filename().string());
+ result.push_back(entry.path().filename().string());
- return ret;
+ return result;
}
std::string BaseUtils::Filesystem::jointPath(const std::string& path1, const std::string& path2)
@@ -87,11 +87,11 @@ std::string BaseUtils::Filesystem::filename(const std::string& path)
std::vector<std::string> BaseUtils::Filesystem::glob(const std::string& dir,
const std::string& pattern)
{
- std::vector<std::string> ret;
+ std::vector<std::string> result;
for (const std::string& fname : filesInDirectory(dir))
if (std::regex_match(fname, std::regex(pattern)))
- ret.push_back(fname);
- return ret;
+ result.push_back(fname);
+ return result;
}
std::string BaseUtils::Filesystem::stem(const std::string& path)
diff --git a/Core/Export/ComponentKeyHandler.h b/Core/Export/ComponentKeyHandler.h
index ec04b60abac..8e7484343f8 100644
--- a/Core/Export/ComponentKeyHandler.h
+++ b/Core/Export/ComponentKeyHandler.h
@@ -41,12 +41,12 @@ private:
template <class T> std::vector<const T*> ComponentKeyHandler::objectsOfType() const
{
- std::vector<const T*> ret;
+ std::vector<const T*> result;
for (const auto& it : m_objects)
for (const INode* s : it.second)
if (const auto* c = dynamic_cast<const T*>(s); c)
- ret.emplace_back(c);
- return ret;
+ result.emplace_back(c);
+ return result;
}
#endif // BORNAGAIN_CORE_EXPORT_COMPONENTKEYHANDLER_H
diff --git a/Device/Data/DataUtils.cpp b/Device/Data/DataUtils.cpp
index 3cd01756ff0..f0f2395aa2c 100644
--- a/Device/Data/DataUtils.cpp
+++ b/Device/Data/DataUtils.cpp
@@ -23,10 +23,10 @@ namespace {
std::vector<std::vector<double>> FT2DArray(const std::vector<std::vector<double>>& signal)
{
FourierTransform ft;
- std::vector<std::vector<double>> ret;
- ft.fft(signal, ret);
- ft.fftshift(ret); // low frequency to center of array
- return ret;
+ std::vector<std::vector<double>> result;
+ ft.fft(signal, result);
+ ft.fftshift(result); // low frequency to center of array
+ return result;
}
} // namespace
diff --git a/Device/Data/OutputData.h b/Device/Data/OutputData.h
index 2e4434a9e3d..b8b6b87ea76 100644
--- a/Device/Data/OutputData.h
+++ b/Device/Data/OutputData.h
@@ -257,10 +257,10 @@ template <class T> OutputData<T>::~OutputData()
template <class T> OutputData<T>* OutputData<T>::clone() const
{
- auto* ret = new OutputData<T>();
- ret->m_axes = m_axes;
- (*ret->m_ll_data) = *m_ll_data;
- return ret;
+ auto* result = new OutputData<T>();
+ result->m_axes = m_axes;
+ (*result->m_ll_data) = *m_ll_data;
+ return result;
}
template <class T> void OutputData<T>::copyFrom(const OutputData<T>& other)
@@ -283,12 +283,12 @@ template <class T> template <class U> void OutputData<T>::copyShapeFrom(const Ou
template <class T> OutputData<double>* OutputData<T>::meanValues() const
{
- auto* ret = new OutputData<double>();
- ret->copyShapeFrom(*this);
- ret->allocate();
+ auto* result = new OutputData<double>();
+ result->copyShapeFrom(*this);
+ result->allocate();
for (size_t i = 0; i < m_ll_data->getTotalSize(); ++i)
- (*ret)[i] = getValue(i);
- return ret;
+ (*result)[i] = getValue(i);
+ return result;
}
template <class T> void OutputData<T>::addAxis(const IAxis& new_axis)
diff --git a/GUI/Model/Sample/LayerItem.cpp b/GUI/Model/Sample/LayerItem.cpp
index d6e303c3b8b..53eb6da52c1 100644
--- a/GUI/Model/Sample/LayerItem.cpp
+++ b/GUI/Model/Sample/LayerItem.cpp
@@ -30,7 +30,7 @@ namespace {
QVector<ItemWithMaterial*> layoutItemsWithMaterial(ParticleLayoutItem* item)
{
- QVector<ItemWithMaterial*> ret;
+ QVector<ItemWithMaterial*> result;
QVector<ItemWithParticles*> itemsWithParticles{item->particles()};
while (!itemsWithParticles.empty()) {
@@ -43,16 +43,16 @@ QVector<ItemWithMaterial*> layoutItemsWithMaterial(ParticleLayoutItem* item)
else if (auto* p = dynamic_cast<MesoCrystalItem*>(item))
itemsWithParticles << p->basisParticle();
else if (auto* p = dynamic_cast<ParticleItem*>(item))
- ret << p;
+ result << p;
else if (auto* p = dynamic_cast<ParticleCoreShellItem*>(item)) {
if (p->core())
- ret << p->core();
+ result << p->core();
if (p->shell())
- ret << p->shell();
+ result << p->shell();
} else
ASSERT(false);
}
- return ret;
+ return result;
}
} // namespace
diff --git a/GUI/Model/To/DomainSimulationBuilder.cpp b/GUI/Model/To/DomainSimulationBuilder.cpp
index 8d79baa67c6..382e4ec6163 100644
--- a/GUI/Model/To/DomainSimulationBuilder.cpp
+++ b/GUI/Model/To/DomainSimulationBuilder.cpp
@@ -125,17 +125,17 @@ std::unique_ptr<GISASSimulation> createGISASSimulation(std::unique_ptr<MultiLaye
const SimulationOptionsItem& optionsItem)
{
std::unique_ptr<const Instrument> instrument = instrumentItem->createInstrument();
- std::unique_ptr<GISASSimulation> ret{
+ std::unique_ptr<GISASSimulation> result{
new GISASSimulation(instrument->beam(), *multilayer, instrument->detector())};
- addDistributionParametersToSimulation(*instrumentItem->beamItem(), *ret);
+ addDistributionParametersToSimulation(*instrumentItem->beamItem(), *result);
// ISimulation options
- setSimulationOptions(ret.get(), optionsItem);
+ setSimulationOptions(result.get(), optionsItem);
- addBackgroundToSimulation(*instrumentItem, *ret);
+ addBackgroundToSimulation(*instrumentItem, *result);
- return ret;
+ return result;
}
std::unique_ptr<OffSpecularSimulation>
@@ -144,12 +144,12 @@ createOffSpecularSimulation(std::unique_ptr<MultiLayer> multilayer,
const SimulationOptionsItem& optionsItem)
{
std::unique_ptr<const Instrument> instrument = instrumentItem->createInstrument();
- std::unique_ptr<OffSpecularSimulation> ret{
+ std::unique_ptr<OffSpecularSimulation> result{
new OffSpecularSimulation(instrument->beam(), *multilayer, instrument->detector())};
auto* beamItem = instrumentItem->beamItem();
auto* axisItem = instrumentItem->alphaAxis();
- ret->setBeamParameters(beamItem->wavelength(), *axisItem->createAxis(Units::deg),
+ result->setBeamParameters(beamItem->wavelength(), *axisItem->createAxis(Units::deg),
beamItem->getAzimuthalAngle());
// TODO Take care about distributions
@@ -157,11 +157,11 @@ createOffSpecularSimulation(std::unique_ptr<MultiLayer> multilayer,
// gisas.get());
// ISimulation options
- setSimulationOptions(ret.get(), optionsItem);
+ setSimulationOptions(result.get(), optionsItem);
- addBackgroundToSimulation(*instrumentItem, *ret);
+ addBackgroundToSimulation(*instrumentItem, *result);
- return ret;
+ return result;
}
std::unique_ptr<SpecularSimulation>
@@ -169,8 +169,8 @@ createSpecularSimulation(std::unique_ptr<MultiLayer> P_multilayer,
const SpecularInstrumentItem* instrument,
const SimulationOptionsItem& optionsItem)
{
- std::unique_ptr<SpecularSimulation> ret = std::make_unique<SpecularSimulation>();
- ret->setSample(*P_multilayer);
+ std::unique_ptr<SpecularSimulation> result = std::make_unique<SpecularSimulation>();
+ result->setSample(*P_multilayer);
auto* beam_item = instrument->beamItem();
auto* const axis_item = beam_item->inclinationAxis();
@@ -181,15 +181,15 @@ createSpecularSimulation(std::unique_ptr<MultiLayer> P_multilayer,
addBeamDivergencesToScan(*beam_item, scan);
- ret->beam().setIntensity(beam_item->intensity());
- ret->setScan(scan);
+ result->beam().setIntensity(beam_item->intensity());
+ result->setScan(scan);
// ISimulation options
- setSimulationOptions(ret.get(), optionsItem);
+ setSimulationOptions(result.get(), optionsItem);
- addBackgroundToSimulation(*instrument, *ret);
+ addBackgroundToSimulation(*instrument, *result);
- return ret;
+ return result;
}
std::unique_ptr<DepthProbeSimulation>
@@ -197,12 +197,12 @@ createDepthProbeSimulation(std::unique_ptr<MultiLayer> multilayer,
const DepthProbeInstrumentItem* instrument,
const SimulationOptionsItem& optionsItem)
{
- std::unique_ptr<DepthProbeSimulation> ret = instrument->createSimulation();
- ret->setSample(*multilayer);
+ std::unique_ptr<DepthProbeSimulation> result = instrument->createSimulation();
+ result->setSample(*multilayer);
- setSimulationOptions(ret.get(), optionsItem);
+ setSimulationOptions(result.get(), optionsItem);
- return ret;
+ return result;
}
} // namespace
diff --git a/Resample/Options/SimulationOptions.cpp b/Resample/Options/SimulationOptions.cpp
index 53005464df8..74ed70486f2 100644
--- a/Resample/Options/SimulationOptions.cpp
+++ b/Resample/Options/SimulationOptions.cpp
@@ -63,9 +63,9 @@ unsigned SimulationOptions::getNumberOfBatches() const
unsigned SimulationOptions::getCurrentBatch() const
{
- unsigned ret = m_thread_info.current_batch;
- ASSERT(ret < m_thread_info.n_batches);
- return ret;
+ unsigned result = m_thread_info.current_batch;
+ ASSERT(result < m_thread_info.n_batches);
+ return result;
}
unsigned SimulationOptions::getHardwareConcurrency() const
diff --git a/Resample/Processed/ProcessedLayout.cpp b/Resample/Processed/ProcessedLayout.cpp
index 49fbff1b744..575af20d670 100644
--- a/Resample/Processed/ProcessedLayout.cpp
+++ b/Resample/Processed/ProcessedLayout.cpp
@@ -32,13 +32,13 @@ size_t zToSliceIndex(double z, const SliceStack& slices)
return 0;
double z0 = slices[0].zBottom();
- size_t ret = 0;
- while (ret < n_layers - 1) {
- ++ret;
- if (slices[ret].zBottom() - z0 < z)
+ size_t result = 0;
+ while (result < n_layers - 1) {
+ ++result;
+ if (slices[result].zBottom() - z0 < z)
break;
}
- return ret;
+ return result;
}
std::pair<size_t, size_t> SliceIndexSpan(const IParticle& particle, const SliceStack& slices,
diff --git a/Sample/Aggregate/Interference1DLattice.cpp b/Sample/Aggregate/Interference1DLattice.cpp
index bf4fc6d633b..5bb6e141c8e 100644
--- a/Sample/Aggregate/Interference1DLattice.cpp
+++ b/Sample/Aggregate/Interference1DLattice.cpp
@@ -41,12 +41,12 @@ Interference1DLattice::~Interference1DLattice() = default;
Interference1DLattice* Interference1DLattice::clone() const
{
- auto* ret = new Interference1DLattice(m_length, m_xi);
- ret->setPositionVariance(m_position_var);
- ret->m_na = m_na;
+ auto* result = new Interference1DLattice(m_length, m_xi);
+ result->setPositionVariance(m_position_var);
+ result->m_na = m_na;
if (m_decay)
- ret->setDecayFunction(*m_decay);
- return ret;
+ result->setDecayFunction(*m_decay);
+ return result;
}
//! Sets one-dimensional decay function.
diff --git a/Sample/Aggregate/Interference2DLattice.cpp b/Sample/Aggregate/Interference2DLattice.cpp
index bf46e747312..722553f8e0f 100644
--- a/Sample/Aggregate/Interference2DLattice.cpp
+++ b/Sample/Aggregate/Interference2DLattice.cpp
@@ -42,12 +42,12 @@ Interference2DLattice::~Interference2DLattice() = default;
Interference2DLattice* Interference2DLattice::clone() const
{
- auto* ret = new Interference2DLattice(*m_lattice);
- ret->setPositionVariance(m_position_var);
- ret->setIntegrationOverXi(integrationOverXi());
+ auto* result = new Interference2DLattice(*m_lattice);
+ result->setPositionVariance(m_position_var);
+ result->setIntegrationOverXi(integrationOverXi());
if (m_decay)
- ret->setDecayFunction(*m_decay);
- return ret;
+ result->setDecayFunction(*m_decay);
+ return result;
}
//! Sets two-dimensional decay function.
diff --git a/Sample/Aggregate/Interference2DParaCrystal.cpp b/Sample/Aggregate/Interference2DParaCrystal.cpp
index f230c1ea06d..980ec2275cc 100644
--- a/Sample/Aggregate/Interference2DParaCrystal.cpp
+++ b/Sample/Aggregate/Interference2DParaCrystal.cpp
@@ -33,13 +33,13 @@ Interference2DParaCrystal::~Interference2DParaCrystal() = default;
Interference2DParaCrystal* Interference2DParaCrystal::clone() const
{
- auto* ret = new Interference2DParaCrystal(*m_lattice, m_damping_length, m_domain_sizes[0],
+ auto* result = new Interference2DParaCrystal(*m_lattice, m_damping_length, m_domain_sizes[0],
m_domain_sizes[1]);
- ret->setPositionVariance(m_position_var);
+ result->setPositionVariance(m_position_var);
if (m_pdf1 && m_pdf2)
- ret->setProbabilityDistributions(*m_pdf1, *m_pdf2);
- ret->setIntegrationOverXi(m_integrate_xi);
- return ret;
+ result->setProbabilityDistributions(*m_pdf1, *m_pdf2);
+ result->setIntegrationOverXi(m_integrate_xi);
+ return result;
}
//! Sets the probability distributions (Fourier transformed) for the two lattice directions.
diff --git a/Sample/Aggregate/Interference2DSuperLattice.cpp b/Sample/Aggregate/Interference2DSuperLattice.cpp
index 956639617ac..8c434a46fd7 100644
--- a/Sample/Aggregate/Interference2DSuperLattice.cpp
+++ b/Sample/Aggregate/Interference2DSuperLattice.cpp
@@ -51,11 +51,11 @@ Interference2DSuperLattice::~Interference2DSuperLattice() = default;
Interference2DSuperLattice* Interference2DSuperLattice::clone() const
{
- auto* ret = new Interference2DSuperLattice(*m_lattice, m_size_1, m_size_2);
- ret->setPositionVariance(m_position_var);
- ret->setSubstructureIFF(*m_substructure);
- ret->setIntegrationOverXi(integrationOverXi());
- return ret;
+ auto* result = new Interference2DSuperLattice(*m_lattice, m_size_1, m_size_2);
+ result->setPositionVariance(m_position_var);
+ result->setSubstructureIFF(*m_substructure);
+ result->setIntegrationOverXi(integrationOverXi());
+ return result;
}
void Interference2DSuperLattice::setSubstructureIFF(const IInterference& sub_iff)
diff --git a/Sample/Aggregate/Interference3DLattice.cpp b/Sample/Aggregate/Interference3DLattice.cpp
index c61af507b95..800ca201829 100644
--- a/Sample/Aggregate/Interference3DLattice.cpp
+++ b/Sample/Aggregate/Interference3DLattice.cpp
@@ -33,11 +33,11 @@ Interference3DLattice::~Interference3DLattice() = default;
Interference3DLattice* Interference3DLattice::clone() const
{
- auto* ret = new Interference3DLattice(m_lattice);
- ret->setPositionVariance(m_position_var);
+ auto* result = new Interference3DLattice(m_lattice);
+ result->setPositionVariance(m_position_var);
if (m_peak_shape)
- ret->setPeakShape(*m_peak_shape);
- return ret;
+ result->setPeakShape(*m_peak_shape);
+ return result;
}
void Interference3DLattice::setPeakShape(const IPeakShape& peak_shape)
diff --git a/Sample/Aggregate/InterferenceFinite2DLattice.cpp b/Sample/Aggregate/InterferenceFinite2DLattice.cpp
index 68e84d0d6a7..478f487cba2 100644
--- a/Sample/Aggregate/InterferenceFinite2DLattice.cpp
+++ b/Sample/Aggregate/InterferenceFinite2DLattice.cpp
@@ -36,10 +36,10 @@ InterferenceFinite2DLattice::~InterferenceFinite2DLattice() = default;
InterferenceFinite2DLattice* InterferenceFinite2DLattice::clone() const
{
- auto* ret = new InterferenceFinite2DLattice(*m_lattice, m_N_1, m_N_2);
- ret->setPositionVariance(m_position_var);
- ret->setIntegrationOverXi(integrationOverXi());
- return ret;
+ auto* result = new InterferenceFinite2DLattice(*m_lattice, m_N_1, m_N_2);
+ result->setPositionVariance(m_position_var);
+ result->setIntegrationOverXi(integrationOverXi());
+ return result;
}
void InterferenceFinite2DLattice::setIntegrationOverXi(bool integrate_xi)
diff --git a/Sample/Aggregate/InterferenceFinite3DLattice.cpp b/Sample/Aggregate/InterferenceFinite3DLattice.cpp
index c9b42630d38..780800e09f5 100644
--- a/Sample/Aggregate/InterferenceFinite3DLattice.cpp
+++ b/Sample/Aggregate/InterferenceFinite3DLattice.cpp
@@ -29,9 +29,9 @@ InterferenceFinite3DLattice::~InterferenceFinite3DLattice() = default;
InterferenceFinite3DLattice* InterferenceFinite3DLattice::clone() const
{
- auto* ret = new InterferenceFinite3DLattice(*m_lattice, m_N_1, m_N_2, m_N_3);
- ret->setPositionVariance(m_position_var);
- return ret;
+ auto* result = new InterferenceFinite3DLattice(*m_lattice, m_N_1, m_N_2, m_N_3);
+ result->setPositionVariance(m_position_var);
+ return result;
}
const Lattice3D& InterferenceFinite3DLattice::lattice() const
diff --git a/Sample/Aggregate/InterferenceHardDisk.cpp b/Sample/Aggregate/InterferenceHardDisk.cpp
index a3384bc999b..4ee593ed26a 100644
--- a/Sample/Aggregate/InterferenceHardDisk.cpp
+++ b/Sample/Aggregate/InterferenceHardDisk.cpp
@@ -59,8 +59,8 @@ InterferenceHardDisk::InterferenceHardDisk(double radius, double density, double
InterferenceHardDisk* InterferenceHardDisk::clone() const
{
- auto* ret = new InterferenceHardDisk(m_radius, m_density, m_position_var);
- return ret;
+ auto* result = new InterferenceHardDisk(m_radius, m_density, m_position_var);
+ return result;
}
double InterferenceHardDisk::getParticleDensity() const
diff --git a/Sample/Aggregate/InterferenceNone.cpp b/Sample/Aggregate/InterferenceNone.cpp
index 9d35ed44c35..be365d435f1 100644
--- a/Sample/Aggregate/InterferenceNone.cpp
+++ b/Sample/Aggregate/InterferenceNone.cpp
@@ -18,9 +18,9 @@ InterferenceNone::InterferenceNone() : IInterference(0) {}
InterferenceNone* InterferenceNone::clone() const
{
- auto* ret = new InterferenceNone();
- ret->setPositionVariance(m_position_var);
- return ret;
+ auto* result = new InterferenceNone();
+ result->setPositionVariance(m_position_var);
+ return result;
}
double InterferenceNone::iff_without_dw(const R3) const
diff --git a/Sample/Aggregate/InterferenceRadialParaCrystal.cpp b/Sample/Aggregate/InterferenceRadialParaCrystal.cpp
index 63b797d928b..341eb32dc96 100644
--- a/Sample/Aggregate/InterferenceRadialParaCrystal.cpp
+++ b/Sample/Aggregate/InterferenceRadialParaCrystal.cpp
@@ -39,13 +39,13 @@ InterferenceRadialParaCrystal::InterferenceRadialParaCrystal(double peak_distanc
InterferenceRadialParaCrystal* InterferenceRadialParaCrystal::clone() const
{
- auto* ret = new InterferenceRadialParaCrystal(m_peak_distance, m_damping_length);
- ret->setPositionVariance(m_position_var);
+ auto* result = new InterferenceRadialParaCrystal(m_peak_distance, m_damping_length);
+ result->setPositionVariance(m_position_var);
if (m_pdf)
- ret->setProbabilityDistribution(*m_pdf);
- ret->setKappa(m_kappa);
- ret->setDomainSize(m_domain_size);
- return ret;
+ result->setProbabilityDistribution(*m_pdf);
+ result->setKappa(m_kappa);
+ result->setDomainSize(m_domain_size);
+ return result;
}
//! Sets size spacing coupling parameter of the Size Spacing Correlation Approximation.
diff --git a/Sample/Aggregate/InterferenceTwin.cpp b/Sample/Aggregate/InterferenceTwin.cpp
index c8a22b7c362..894c4595a93 100644
--- a/Sample/Aggregate/InterferenceTwin.cpp
+++ b/Sample/Aggregate/InterferenceTwin.cpp
@@ -29,9 +29,9 @@ InterferenceTwin::InterferenceTwin(const R3& direction, double mean_distance, do
InterferenceTwin* InterferenceTwin::clone() const
{
- auto* ret = new InterferenceTwin(m_direction, m_distance, m_std_dev);
- ret->setPositionVariance(m_position_var);
- return ret;
+ auto* result = new InterferenceTwin(m_direction, m_distance, m_std_dev);
+ result->setPositionVariance(m_position_var);
+ return result;
}
R3 InterferenceTwin::direction() const
diff --git a/Sample/HardParticle/FormFactorFullSphere.cpp b/Sample/HardParticle/FormFactorFullSphere.cpp
index 67bd382d81e..fbe0a937338 100644
--- a/Sample/HardParticle/FormFactorFullSphere.cpp
+++ b/Sample/HardParticle/FormFactorFullSphere.cpp
@@ -54,10 +54,10 @@ double FormFactorFullSphere::topZ(const IRotation* rotation) const
complex_t FormFactorFullSphere::formfactor(C3 q) const
{
- complex_t ret = SampleUtils::someff::ffSphere(q, m_radius);
+ complex_t result = SampleUtils::someff::ffSphere(q, m_radius);
if (!m_position_at_center)
- ret *= exp_I(q.z() * m_radius);
- return ret;
+ result *= exp_I(q.z() * m_radius);
+ return result;
}
IFormFactor* FormFactorFullSphere::sliceFormFactor(ZLimits limits, const IRotation* rotation,
diff --git a/Sample/Lattice/Lattice3D.cpp b/Sample/Lattice/Lattice3D.cpp
index ec17a00adf1..195528fb423 100644
--- a/Sample/Lattice/Lattice3D.cpp
+++ b/Sample/Lattice/Lattice3D.cpp
@@ -76,7 +76,7 @@ std::vector<R3> Lattice3D::reciprocalLatticeVectorsWithinRadius(const R3 q, doub
int max_Y = std::lround(m_b.mag() * dq / M_TWOPI);
int max_Z = std::lround(m_c.mag() * dq / M_TWOPI);
- std::vector<R3> ret;
+ std::vector<R3> result;
for (int index_X = -max_X; index_X <= max_X; ++index_X) {
for (int index_Y = -max_Y; index_Y <= max_Y; ++index_Y) {
for (int index_Z = -max_Z; index_Z <= max_Z; ++index_Z) {
@@ -85,11 +85,11 @@ std::vector<R3> Lattice3D::reciprocalLatticeVectorsWithinRadius(const R3 q, doub
continue;
R3 latticePoint = coords.x() * m_ra + coords.y() * m_rb + coords.z() * m_rc;
if ((latticePoint - q).mag() <= dq)
- ret.push_back(latticePoint);
+ result.push_back(latticePoint);
}
}
}
- return ret;
+ return result;
}
void Lattice3D::computeReciprocalVectors() const
diff --git a/Sample/Multilayer/MultiLayer.cpp b/Sample/Multilayer/MultiLayer.cpp
index f0f2b111f28..d858133f827 100644
--- a/Sample/Multilayer/MultiLayer.cpp
+++ b/Sample/Multilayer/MultiLayer.cpp
@@ -33,18 +33,19 @@ MultiLayer::~MultiLayer() = default;
MultiLayer* MultiLayer::clone() const
{
- auto* ret = new MultiLayer;
- ret->setCrossCorrLength(crossCorrLength());
- ret->setExternalField(externalField());
- ret->setRoughnessModel(roughnessModel());
+ auto* result = new MultiLayer;
+ result->setCrossCorrLength(crossCorrLength());
+ result->setExternalField(externalField());
+ result->setRoughnessModel(roughnessModel());
for (size_t i = 0; i < numberOfLayers(); ++i) {
const auto* interface = i > 0 ? m_interfaces[i - 1] : nullptr;
if (i > 0 && interface->getRoughness())
- ret->addLayerWithTopRoughness(std::as_const(*m_layers[i]), *interface->getRoughness());
+ result->addLayerWithTopRoughness(
+ std::as_const(*m_layers[i]), *interface->getRoughness());
else
- ret->addLayer(std::as_const(*m_layers[i]));
+ result->addLayer(std::as_const(*m_layers[i]));
}
- return ret;
+ return result;
}
//! Adds layer with default (zero) roughness
@@ -115,17 +116,17 @@ void MultiLayer::setRoughnessModel(RoughnessModel roughnessModel)
std::vector<const INode*> MultiLayer::nodeChildren() const
{
- std::vector<const INode*> ret;
+ std::vector<const INode*> result;
const size_t N = m_layers.size();
- ret.reserve(N + m_interfaces.size());
+ result.reserve(N + m_interfaces.size());
for (size_t i = 0; i < N; ++i) {
- ret.push_back(m_layers[i]);
+ result.push_back(m_layers[i]);
if (i == N - 1)
break;
- ret.push_back(layerInterface(i));
+ result.push_back(layerInterface(i));
}
- return ret;
+ return result;
}
void MultiLayer::addLayer(Layer* child)
diff --git a/Sample/ff/PolyhedralComponents.cpp b/Sample/ff/PolyhedralComponents.cpp
index c8ed8e33987..61ea33b9dc4 100644
--- a/Sample/ff/PolyhedralComponents.cpp
+++ b/Sample/ff/PolyhedralComponents.cpp
@@ -46,10 +46,10 @@ void ff::PolyhedralDiagnosis::reset()
};
std::string ff::PolyhedralDiagnosis::message() const
{
- std::string ret = "algo=" + std::to_string(algo) + ", order=" + std::to_string(order);
+ std::string result = "algo=" + std::to_string(algo) + ", order=" + std::to_string(order);
if (!msg.empty())
- ret += ", msg:\n" + msg;
- return ret;
+ result += ", msg:\n" + msg;
+ return result;
}
bool ff::PolyhedralDiagnosis::operator==(const PolyhedralDiagnosis& other) const
{
@@ -87,30 +87,30 @@ complex_t ff::PolyhedralEdge::contrib(int M, C3 qpa, complex_t qrperp) const
return 0.;
return ReciprocalFactorialArray[M] * (pow(u, M) / (M + 1.) - pow(v1, M));
}
- complex_t ret = 0;
+ complex_t result = 0;
// the l=0 term, minus (qperp.R)^M, which cancels under the sum over E*contrib()
if (v1 == 0.)
- ret = ReciprocalFactorialArray[M] * pow(v2, M);
+ result = ReciprocalFactorialArray[M] * pow(v2, M);
else if (v2 == 0.) {
- ; // leave ret=0
+ ; // leave result=0
} else {
// binomial expansion
for (int mm = 1; mm <= M; ++mm) {
complex_t term = ReciprocalFactorialArray[mm] * ReciprocalFactorialArray[M - mm]
* pow(v2, mm) * pow(v1, M - mm);
- ret += term;
- // std::cout << "contrib mm=" << mm << " t=" << term << " s=" << ret << "\n";
+ result += term;
+ // std::cout << "contrib mm=" << mm << " t=" << term << " s=" << result << "\n";
}
}
if (u == 0.)
- return ret;
+ return result;
for (int l = 1; l <= M / 2; ++l) {
complex_t term = ReciprocalFactorialArray[M - 2 * l] * ReciprocalFactorialArray[2 * l + 1]
* pow(u, 2 * l) * pow(v, M - 2 * l);
- ret += term;
- // std::cout << "contrib l=" << l << " t=" << term << " s=" << ret << "\n";
+ result += term;
+ // std::cout << "contrib l=" << l << " t=" << term << " s=" << result << "\n";
}
- return ret;
+ return result;
}
// ************************************************************************************************
@@ -226,18 +226,18 @@ void ff::PolyhedralFace::decompose_q(C3 q, complex_t& qperp, C3& qpa) const
complex_t ff::PolyhedralFace::ff_n_core(int m, C3 qpa, complex_t qperp) const
{
const C3 prevec = 2. * m_normal.cross(qpa); // complex conjugation not here but in .dot
- complex_t ret = 0;
+ complex_t result = 0;
const complex_t qrperp = qperp * m_rperp;
for (size_t i = 0; i < edges.size(); ++i) {
const PolyhedralEdge& e = edges[i];
const complex_t vfac = prevec.dot(e.E());
const complex_t tmp = e.contrib(m + 1, qpa, qrperp);
- ret += vfac * tmp;
+ result += vfac * tmp;
// std::cout << std::scientific << std::showpos << std::setprecision(16)
// << "DBX ff_n_core " << m << " " << vfac << " " << tmp
- // << " term=" << vfac * tmp << " sum=" << ret << "\n";
+ // << " term=" << vfac * tmp << " sum=" << result << "\n";
}
- return ret;
+ return result;
}
//! Returns contribution qn*f_n [of order q^(n+1)] from this face to the polyhedral form factor.
diff --git a/Sample/ff/Polyhedron.cpp b/Sample/ff/Polyhedron.cpp
index df2beff1c35..d9e02473477 100644
--- a/Sample/ff/Polyhedron.cpp
+++ b/Sample/ff/Polyhedron.cpp
@@ -104,11 +104,11 @@ double ff::Polyhedron::radius() const
std::vector<R3> ff::Polyhedron::vertices() const
{
- std::vector<R3> ret;
- ret.reserve(m_vertices.size());
+ std::vector<R3> result;
+ result.reserve(m_vertices.size());
for (const auto& vertex : m_vertices)
- ret.emplace_back(R3{vertex});
- return ret;
+ result.emplace_back(R3{vertex});
+ return result;
}
//! Returns the form factor F(q) of this polyhedron, respecting the offset z_bottom.
diff --git a/Tests/Functional/PyStd/Check.cpp b/Tests/Functional/PyStd/Check.cpp
index 48b0d08b6a3..7ea323df1d5 100644
--- a/Tests/Functional/PyStd/Check.cpp
+++ b/Tests/Functional/PyStd/Check.cpp
@@ -58,11 +58,11 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& test_name,
if (err)
throw std::runtime_error("Exported Python script did not execute properly");
- auto ret =
+ auto result =
std::unique_ptr<OutputData<double>>(IntensityDataIOFactory::readOutputData(output_path));
- if (!ret)
+ if (!result)
throw std::runtime_error("Could not read back simulation output from file " + output_path);
- return ret;
+ return result;
}
} // namespace
--
GitLab