[tidy1] some improvements to core suggested by clang-tidy ()

Merging branch 'tidy1'  into 'main'.

See merge request !1202

.clang-tidy

@@ -25,7 +25,10 @@ Checks: '*,
 -*-uppercase-literal-suffix,
 -*nodiscard,
 -abseil-string-find-str-contains,
+-altera-unroll-loops,
 -bugprone-branch-clone,
+-bugprone-easily-swappable-parameters,
+-bugprone-implicit-widening-of-multiplication-result,
 -bugprone-suspicious-include,
 -cert-err58-cpp,
 -cert-err61-cpp,
@@ -69,10 +72,10 @@ Checks: '*,
 -performance-noexcept-move-constructor,
 -performance-no-automatic-move,
 -performance-unnecessary-value-param,
+-readability-identifier-length,
 -readability-misleading-indentation,
 -readability-use-anyofallof,
 
-
 -SectionComment_To_be_manually_checked_from_time_to_time,
 
 -readability-isolate-declaration,
@@ -107,6 +110,7 @@ Checks: '*,
 
 -SectionComment_Temporarily_disabled_checks__We_need_to_investigate_them_one_by_one,
 
+-altera-id-dependent-backward-branch,
 -bugprone-copy-constructor-init,
 -bugprone-exception-escape,
 -bugprone-misplaced-widening-cast,
@@ -117,7 +121,7 @@ Checks: '*,
 -google-runtime-references,
 -misc-non-private-member-variables-in-classes,
 -modernize-loop-convert,
-
+-readability-function-cognitive-complexity,
 
 -SectionComment_Automizable__To_be_kept_satisfied,
 *-use-auto,

Base/Axis/Frame.cpp

@@ -19,8 +19,8 @@
 
 Frame::Frame(const std::vector<const IAxis*>& axes)
     : m_axes(axes)
+    , m_size(1)
 {
-    m_size = 1;
     for (size_t k = 0; k < rank(); ++k) {
         ASSERT(axis(k).size() > 0);
         m_size *= axis(k).size();
@@ -55,9 +55,9 @@ std::vector<int> Frame::allIndices(size_t i_flat) const
 
 size_t Frame::projectedIndex(size_t i_flat, size_t k_axis) const
 {
-    if (rank() == 1) {
+    if (rank() == 1)
         return i_flat;
-    } else if (rank() == 2) {
+    if (rank() == 2) {
         if (k_axis == 0)
             return (i_flat / m_axes[1]->size()) % m_axes[0]->size();
         if (k_axis == 1)
@@ -65,15 +65,6 @@ size_t Frame::projectedIndex(size_t i_flat, size_t k_axis) const
         ASSERT(0);
     }
     ASSERT(0);
-    /* // generic code for rank>2 currently unused
-    size_t remainder(i_flat);
-    for (int k = rank() - 1; k >= 0; --k) {
-        size_t result = remainder % m_axes[k]->size();
-        if (k_axis == k)
-            return result;
-        remainder /= m_axes[k]->size();
-    }
-    */
 }
 
 size_t Frame::toGlobalIndex(const std::vector<unsigned>& axes_indices) const

Base/Axis/FrameUtil.cpp

@@ -50,14 +50,14 @@ double FramUtil::coordinateFromBinf(double value, const IAxis& axis)
     return result;
 }
 
-void FramUtil::coordinatesToBinf(double& x, double& y, const Frame& data)
+void FramUtil::coordinatesToBinf(double& x, double& y, const Frame& frame)
 {
-    x = coordinateToBinf(x, data.xAxis());
-    y = coordinateToBinf(y, data.yAxis());
+    x = coordinateToBinf(x, frame.xAxis());
+    y = coordinateToBinf(y, frame.yAxis());
 }
 
-void FramUtil::coordinatesFromBinf(double& x, double& y, const Frame& data)
+void FramUtil::coordinatesFromBinf(double& x, double& y, const Frame& frame)
 {
-    x = coordinateFromBinf(x, data.xAxis());
-    y = coordinateFromBinf(y, data.yAxis());
+    x = coordinateFromBinf(x, frame.xAxis());
+    y = coordinateFromBinf(y, frame.yAxis());
 }

Base/Axis/PointwiseAxis.cpp

@@ -30,7 +30,7 @@ PointwiseAxis* PointwiseAxis::clone() const
 Bin1D PointwiseAxis::bin(size_t index) const
 {
     checkIndex(index);
-    return Bin1D(minary(index), maxary(index));
+    return {minary(index), maxary(index)};
 }
 
 double PointwiseAxis::min() const

Base/Element/DepthProbeElement.cpp

@@ -32,7 +32,7 @@ DepthProbeElement::DepthProbeElement(double wavelength, double alpha_i, const IA
     m_intensities.resize(z_positions->size(), 0.0);
 }
 
-DepthProbeElement::DepthProbeElement(DepthProbeElement&& other)
+DepthProbeElement::DepthProbeElement(DepthProbeElement&& other) noexcept
     : IElement(PolMatrices())
     , m_wavelength(other.m_wavelength)
     , m_alpha_i(other.m_alpha_i)

Base/Element/DepthProbeElement.h

@@ -27,9 +27,9 @@ class IAxis;
 class DepthProbeElement : public IElement {
 public:
     DepthProbeElement(double wavelength, double alpha_i, const IAxis* z_positions,
-                      bool calculationFlag);
+                      bool calculation_flag);
     DepthProbeElement(const DepthProbeElement& other) = delete;
-    DepthProbeElement(DepthProbeElement&& other);
+    DepthProbeElement(DepthProbeElement&& other) noexcept;
 
     ~DepthProbeElement();
 

Base/Vector/WavevectorInfo.cpp

@@ -35,6 +35,5 @@ WavevectorInfo WavevectorInfo::makeZeroQ()
 
 WavevectorInfo WavevectorInfo::transformed(const RotMatrix& transform) const
 {
-    return WavevectorInfo(transform.transformed(m_ki), transform.transformed(m_kf),
-                          m_vacuum_wavelength);
+    return {transform.transformed(m_ki), transform.transformed(m_kf), m_vacuum_wavelength};
 }

Device/Beam/Beam.cpp

@@ -31,7 +31,7 @@ Beam::Beam(double intensity, double wavelength, const Direction& direction)
 
 Beam Beam::horizontalBeam()
 {
-    return Beam(1.0, 1.0, {0, 0});
+    return {1.0, 1.0, {0, 0}};
 }
 
 Beam::~Beam() = default;

Device/Data/DataUtils.cpp

@@ -139,12 +139,12 @@ Datafield* DataUtils::Data::importArrayToDatafield(const std::vector<std::vector
     return DataUtils::Array::createPField2D(vec).release();
 }
 
-std::vector<std::pair<double, double>> DataUtils::Data::FindPeaks(const Datafield& field,
+std::vector<std::pair<double, double>> DataUtils::Data::FindPeaks(const Datafield& data,
                                                                   double sigma,
                                                                   const std::string& option,
                                                                   double threshold)
 {
-    std::vector<std::vector<double>> arr = DataUtils::Array::createVector2D(field);
+    std::vector<std::vector<double>> arr = DataUtils::Array::createVector2D(data);
     tspectrum::Spectrum2D spec;
     auto peaks = spec.find_peaks(arr, sigma, option, threshold);
 
@@ -156,10 +156,10 @@ std::vector<std::pair<double, double>> DataUtils::Data::FindPeaks(const Datafiel
         double col_value = p.second;
 
         auto xaxis_index = static_cast<size_t>(col_value);
-        size_t yaxis_index = field.yAxis().size() - 1 - static_cast<size_t>(row_value);
+        size_t yaxis_index = data.yAxis().size() - 1 - static_cast<size_t>(row_value);
 
-        Bin1D xbin = field.xAxis().bin(xaxis_index);
-        Bin1D ybin = field.yAxis().bin(yaxis_index);
+        Bin1D xbin = data.xAxis().bin(xaxis_index);
+        Bin1D ybin = data.yAxis().bin(yaxis_index);
 
         double dx = col_value - static_cast<size_t>(col_value);
         double dy = -1.0 * (row_value - static_cast<size_t>(row_value));

Device/Data/DataUtils.h

@@ -32,7 +32,7 @@ Datafield* importArrayToDatafield(const std::vector<double>& vec);
 Datafield* importArrayToDatafield(const std::vector<std::vector<double>>& vec);
 
 //! Returns vector of peak center coordinates, for peaks in given histogram.
-std::vector<std::pair<double, double>> FindPeaks(const Datafield& hist, double sigma = 2,
+std::vector<std::pair<double, double>> FindPeaks(const Datafield& data, double sigma = 2,
                                                  const std::string& option = {},
                                                  double threshold = 0.05);
 

Device/Data/Datafield.cpp

@@ -40,7 +40,7 @@ Datafield::Datafield(const Frame* frame, const std::vector<double>& values,
     , m_errSigmas(errSigmas)
 {
     ASSERT(m_values.size() == m_frame->size());
-    ASSERT(m_errSigmas.size() == 0 || m_errSigmas.size() == m_values.size());
+    ASSERT(m_errSigmas.empty() || m_errSigmas.size() == m_values.size());
 }
 
 Datafield::Datafield(const std::vector<const IAxis*>& axes)
@@ -59,11 +59,11 @@ Datafield::Datafield(const std::vector<const IAxis*>& axes, const std::vector<do
 {
 }
 
-Datafield::~Datafield() {}
+Datafield::~Datafield() = default;
 
 Datafield* Datafield::clone() const
 {
-    Datafield* data = new Datafield(m_frame->cloned_axes(), m_values, m_errSigmas);
+    auto* data = new Datafield(m_frame->cloned_axes(), m_values, m_errSigmas);
     return data;
 }
 
@@ -79,7 +79,7 @@ double Datafield::valAt(size_t i) const
 
 bool Datafield::hasErrorSigmas() const
 {
-    return m_errSigmas.size() > 0;
+    return !m_errSigmas.empty();
 }
 
 const std::vector<double>& Datafield::errorSigmas() const

Device/Detector/IDetector.cpp

@@ -40,7 +40,7 @@ inline size_t ycoord(size_t index, size_t sizeY)
 } // namespace
 
 
-IDetector::IDetector() {}
+IDetector::IDetector() = default;
 
 IDetector::IDetector(const IDetector& other)
     : INode()
@@ -301,15 +301,13 @@ size_t IDetector::detectorIndexToRegionOfInterestIndex(const size_t detectorInde
 /* -- IDetector::RoiOfAxis ----------------------------------------------------------- */
 
 IDetector::RoiOfAxis::RoiOfAxis(const IAxis& axis, double _lower, double _upper)
+    : lower(_lower)
+    , upper(_upper)
+    , lowerIndex(axis.findClosestIndex(lower))
+    , upperIndex(axis.findClosestIndex(upper))
+    , roiSize(upperIndex - lowerIndex + 1)
+    , detectorSize(axis.size())
 {
-    lower = _lower;
-    upper = _upper;
-
-    lowerIndex = axis.findClosestIndex(lower);
-    upperIndex = axis.findClosestIndex(upper);
-
-    detectorSize = axis.size();
-    roiSize = upperIndex - lowerIndex + 1;
 }
 
 /* -- from IDetector2D -- */

Device/Histo/SimulationResult.cpp

@@ -44,13 +44,13 @@ SimulationResult::SimulationResult(const SimulationResult& other)
     m_coordsys.reset(other.m_coordsys->clone());
 }
 
-SimulationResult::SimulationResult(SimulationResult&& other)
+SimulationResult::SimulationResult(SimulationResult&& other) noexcept
     : m_data(std::move(other.m_data))
     , m_coordsys(std::move(other.m_coordsys))
 {
 }
 
-SimulationResult& SimulationResult::operator=(SimulationResult&& other)
+SimulationResult& SimulationResult::operator=(SimulationResult&& other) noexcept
 {
     m_data = std::move(other.m_data);
     m_coordsys = std::move(other.m_coordsys);
@@ -121,7 +121,7 @@ std::vector<double> SimulationResult::convertedBinCenters(size_t i_axis, Coords
     if (i_axis >= m_coordsys->rank())
         throw std::runtime_error(
             "Error in SimulationResult::axis: no axis corresponds to passed index.");
-    auto axis = m_coordsys->createConvertedAxis(i_axis, units);
+    auto* axis = m_coordsys->createConvertedAxis(i_axis, units); // TODO memory leak
     return axis->binCenters();
 }
 

Device/Histo/SimulationResult.h

@@ -36,9 +36,9 @@ public:
     ~SimulationResult();
 
     SimulationResult(const SimulationResult& other);
-    SimulationResult(SimulationResult&& other);
+    SimulationResult(SimulationResult&& other) noexcept;
 
-    SimulationResult& operator=(SimulationResult&& other);
+    SimulationResult& operator=(SimulationResult&& other) noexcept;
 
     std::vector<double> flatVector(Coords units = Coords::UNDEFINED) const;
     Datafield* datafield(Coords units = Coords::UNDEFINED) const;

Device/IO/DataFormatUtils.cpp

@@ -201,7 +201,7 @@ void DataUtils::Format::fillDatafield(Datafield* data, std::istream& input_strea
         for (auto value : buffer)
             data->errorSigmas().push_back(value);
     }
-    if (data->errorSigmas().size() > 0 && data->errorSigmas().size() != data->size())
+    if (!data->errorSigmas().empty() && data->errorSigmas().size() != data->size())
         throw std::runtime_error("Error while parsing data, num errorbars != num values");
 }
 

Device/IO/IOFactory.cpp

@@ -146,7 +146,7 @@ bool IOFactory::fileTypeMatchesLoaderSelector(const std::string& fileName, Loade
 
 void IOFactory::writeSimulationResult(const SimulationResult& result, const std::string& file_name)
 {
-    auto data = result.datafield();
+    const auto* data = result.datafield();
     writeDatafield(*data, file_name); // TODO delete ptr
 }
 

Device/Mask/DetectorMask.h

@@ -51,7 +51,7 @@ public:
     //! @param mask_value The value of mask
     void addMask(const IShape2D& shape, bool mask_value);
 
-    bool isMasked(size_t index) const;
+    bool isMasked(size_t i_flat) const;
 
     //! Returns true if has masks
     bool hasMasks() const;

Resample/Element/DiffuseElement.cpp

@@ -37,7 +37,7 @@ DiffuseElement::DiffuseElement(double wavelength, double alpha_i, double phi_i,
 {
 }
 
-DiffuseElement::DiffuseElement(DiffuseElement&& other)
+DiffuseElement::DiffuseElement(DiffuseElement&& other) noexcept
     : IElement(other.m_polMatrices)
     , m_wavelength(other.m_wavelength)
     , m_alpha_i(other.m_alpha_i)
@@ -124,7 +124,7 @@ double DiffuseElement::getPhi(double x, double y) const
 
 WavevectorInfo DiffuseElement::wavevectorInfo() const
 {
-    return WavevectorInfo(getKi(), meanKf(), wavelength());
+    return {getKi(), meanKf(), wavelength()};
 }
 
 double DiffuseElement::integrationFactor(double x, double y) const

Resample/Element/DiffuseElement.h

@@ -38,7 +38,7 @@ public:
                    const SpinMatrix& analyzer, bool isSpecular_, const Fluxes* fluxes_in = nullptr,
                    const Fluxes* fluxes_out = nullptr);
     DiffuseElement(const DiffuseElement&) = delete;
-    DiffuseElement(DiffuseElement&&);
+    DiffuseElement(DiffuseElement&&) noexcept;
     ~DiffuseElement();
 
     void setFluxes(const Fluxes* fluxes_in, const Fluxes* fluxes_out);

Resample/Element/SpecularElement.cpp

@@ -19,19 +19,17 @@
 SpecularElement SpecularElement::FromQzScan(double kz, const PolMatrices& polMatrices,
                                             bool computable)
 {
-    return SpecularElement(computable, polMatrices, [kz](const SliceStack& slices) {
-        return Compute::Kz::computeKzFromSLDs(slices, kz);
-    });
+    return {computable, polMatrices,
+            [kz](const SliceStack& slices) { return Compute::Kz::computeKzFromSLDs(slices, kz); }};
 }
 
 SpecularElement SpecularElement::FromAlphaScan(double wavelength, double alpha,
                                                const PolMatrices& polMatrices, bool computable)
 {
-    return SpecularElement(
-        computable, polMatrices,
-        [k = vecOfLambdaAlphaPhi(wavelength, alpha, 0.0)](const SliceStack& slices) {
-            return Compute::Kz::computeKzFromRefIndices(slices, k);
-        });
+    return {computable, polMatrices,
+            [k = vecOfLambdaAlphaPhi(wavelength, alpha, 0.0)](const SliceStack& slices) {
+                return Compute::Kz::computeKzFromRefIndices(slices, k);
+            }};
 }
 
 SpecularElement::SpecularElement(bool computable, const PolMatrices& polMatrices,
@@ -43,7 +41,7 @@ SpecularElement::SpecularElement(bool computable, const PolMatrices& polMatrices
 {
 }
 
-SpecularElement::SpecularElement(SpecularElement&& other) = default;
+SpecularElement::SpecularElement(SpecularElement&& other) noexcept = default;
 
 SpecularElement::~SpecularElement() = default;