Allow clang-tidy to apply it's fixes

These have been:
 - Remove unused headers
 - Remove use of temporary objects during construction
 - Start using ranges functionlity

Author: php1ic

include/inch/eps_magicNumbers.hpp

@@ -16,12 +16,8 @@
 
 #include <fmt/format.h>
 
-#include <algorithm>
-#include <iterator>
-#include <map>
 #include <string>
 #include <utility>
-#include <vector>
 
 
 class EPSMagicNumbers : public MagicNumbers
@@ -34,7 +30,7 @@ class EPSMagicNumbers : public MagicNumbers
 
   /// Delete both due to const members
   EPSMagicNumbers& operator=(const EPSMagicNumbers&) = delete;
-  EPSMagicNumbers& operator=(EPSMagicNumbers&&) = delete;
+  EPSMagicNumbers& operator=(EPSMagicNumbers&&)      = delete;
 
   ~EPSMagicNumbers() noexcept override = default;
 

include/inch/partition.hpp

@@ -13,7 +13,6 @@
 
 #include "inch/chartColour.hpp"
 #include "inch/converter.hpp"
-#include "inch/nuclide.hpp"
 
 #include <algorithm>
 #include <chrono>
@@ -32,7 +31,7 @@ class Partition
   Partition(Partition&&)      = default;
 
   Partition& operator=(const Partition&) = default;
-  Partition& operator=(Partition&&) = default;
+  Partition& operator=(Partition&&)      = default;
 
   ~Partition() = default;
 

src/dripline.cpp

@@ -52,7 +52,7 @@ bool DripLine::readFRDMFile(const bool overwrite) const
 
   while (modelFile >> A >> Z >> dummy >> ME)
     {
-      DripLine::dm_data.emplace_back(drop_model_data(A, Z, ME));
+      DripLine::dm_data.emplace_back(A, Z, ME);
     }
 
   modelFile.close();

src/eps_chart.cpp

@@ -108,14 +108,12 @@ void EPSChart::write(const std::vector<Nuclide>& nuc, const Partition& part) con
 
       if (options.single_drip_lines != 2)
         {
-          drip_lines.emplace_back(
-              EPSDripLine(neutronMass, protonMass, options.limits, LineType::singleneutron, dripLineColour));
+          drip_lines.emplace_back(neutronMass, protonMass, options.limits, LineType::singleneutron, dripLineColour);
         }
 
       if (options.single_drip_lines != 3)
         {
-          drip_lines.emplace_back(
-              EPSDripLine(neutronMass, protonMass, options.limits, LineType::singleproton, dripLineColour));
+          drip_lines.emplace_back(neutronMass, protonMass, options.limits, LineType::singleproton, dripLineColour);
         }
     }
   else
@@ -132,14 +130,12 @@ void EPSChart::write(const std::vector<Nuclide>& nuc, const Partition& part) con
 
       if (options.double_drip_lines != 2)
         {
-          drip_lines.emplace_back(
-              EPSDripLine(neutronMass, protonMass, options.limits, LineType::doubleneutron, dripLineColour));
+          drip_lines.emplace_back(neutronMass, protonMass, options.limits, LineType::doubleneutron, dripLineColour);
         }
 
       if (options.double_drip_lines != 3)
         {
-          drip_lines.emplace_back(
-              EPSDripLine(neutronMass, protonMass, options.limits, LineType::doubleproton, dripLineColour));
+          drip_lines.emplace_back(neutronMass, protonMass, options.limits, LineType::doubleproton, dripLineColour);
         }
     }
   else

src/eps_dripline.cpp

@@ -1,15 +1,9 @@
 #include "inch/eps_dripline.hpp"
 
-#include "inch/options.hpp"
-
 #include <fmt/ostream.h>
 #include <fmt/std.h>
 
-#include <algorithm>
-#include <filesystem>
 #include <limits>
-#include <sstream>
-#include <vector>
 
 
 int EPSDripLine::WriteLine(std::ostream& outFile) const

src/eps_key.cpp

@@ -8,7 +8,7 @@
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 
-#include <algorithm>
+#include <ranges>
 
 
 std::string EPSKey::Setup() const
@@ -140,18 +140,18 @@ void EPSKey::Write(std::ofstream& outFile, const Partition& part) const
   const double text_yShift{ 0.2 };
 
   // Only draw the parts of the key required
-  for (auto it = part.values.crbegin(); it != part.values.crend(); ++it)
+  for (const auto& value : std::ranges::reverse_view(part.values))
     {
-      if (it->draw)
+      if (value.draw)
         {
           fmt::print(outFile,
                      "0 {} 0.5 {} curve Nucleus\n"
                      "2.5 {} m ResetWidth\n"
                      "{}",
-                     it->colour,
+                     value.colour,
                      yPos,
                      (yPos + text_yShift),
-                     it->keyText);
+                     value.keyText);
 
           yPos += 1.5;
         }

src/eps_rProcess.cpp

@@ -1,13 +1,9 @@
 #include "inch/eps_rProcess.hpp"
 
-#include "inch/options.hpp"
-
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 
 #include <fstream>
-#include <limits>
-#include <sstream>
 
 
 std::string EPSrProcess::PathSetup(const bool shaded) const
@@ -27,16 +23,16 @@ void EPSrProcess::WritePath(std::ofstream& outFile, const bool shaded) const
 
   bool initial{ true };
 
-  for (const auto& it : data)
+  for (const auto& point : data)
     {
       // it.first = N
       // it.second = Z
-      if (limits.inZRange(it.second) && limits.inNRange(it.first))
+      if (limits.inZRange(point.second) && limits.inNRange(point.first))
         {
           fmt::print(outFile,
                      "{:>3d} {:>3d} {}\n",
-                     (it.first - limits.Nmin),
-                     (it.second - limits.Zmin),
+                     (point.first - limits.Nmin),
+                     (point.second - limits.Zmin),
                      (initial ? 'm' : 'l'));
 
           initial = false;

src/io.cpp

@@ -299,7 +299,7 @@ std::map<std::string, std::string> IO::readOptionFile(const std::string& inputFi
           ++i;
         }
 
-      if (inputfile_options.count(theLine.front()) > 0)
+      if (inputfile_options.contains(theLine.front()))
         {
           fmt::print("\n**WARNING**: Already have a value for <{}> ({}), will use the new value ({})\n",
                      theLine.front(),

src/key.cpp

@@ -1,6 +1,5 @@
 #include "inch/key.hpp"
 
-#include "inch/chartColour.hpp"
 #include "inch/chartSelection.hpp"
 #include "inch/options.hpp"
 #include "inch/partition.hpp"

src/nuclide.cpp

@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <ranges>
 
 
 void Nuclide::setSpinParity() const
@@ -233,51 +234,51 @@ void Nuclide::setSeparationEnergies(const std::vector<Nuclide>& nuc) const
   // Loop from the penultimate isotope towards the beginning.
   // As the vector is ordered by A (low to high), this will
   // remove a large number of checks as the vector get bigger.
-  for (auto previous = nuc.crbegin(); previous != nuc.crend(); ++previous)
+  for (const auto& previous : std::ranges::reverse_view(nuc))
     {
       // Single particle energies.
-      if (A - previous->A == 1)
+      if (A - previous.A == 1)
         {
           // S_p(Z,N) = M(Z-1,N) - M(Z,N) + M(1,0)
-          if (N - previous->N == 0 && Z - previous->Z == 1)
+          if (N - previous.N == 0 && Z - previous.Z == 1)
             {
-              s_p  = previous->NUBASE_ME - NUBASE_ME + p_ME;
-              ds_p = errorQuadrature(previous->NUBASE_dME, NUBASE_dME, p_dME);
+              s_p  = previous.NUBASE_ME - NUBASE_ME + p_ME;
+              ds_p = errorQuadrature(previous.NUBASE_dME, NUBASE_dME, p_dME);
               numSeparationEnergiesRead++;
             }
           // S_n(Z,N) = M(Z,N-1) - M(Z,N) + M(0,1)
-          else if (Z - previous->Z == 0 && N - previous->N == 1)
+          else if (Z - previous.Z == 0 && N - previous.N == 1)
             {
-              s_n  = previous->NUBASE_ME - NUBASE_ME + n_ME;
-              ds_n = errorQuadrature(previous->NUBASE_dME, NUBASE_dME, n_dME);
+              s_n  = previous.NUBASE_ME - NUBASE_ME + n_ME;
+              ds_n = errorQuadrature(previous.NUBASE_dME, NUBASE_dME, n_dME);
               numSeparationEnergiesRead++;
             }
         }
       // Two particle energies.
-      else if (A - previous->A == 2)
+      else if (A - previous.A == 2)
         {
           // S_2p(Z,N) = M(Z-2,N) - M(Z,N) + 2*M(1,0)
-          if (N - previous->N == 0 && Z - previous->Z == 2)
+          if (N - previous.N == 0 && Z - previous.Z == 2)
             {
-              s_2p  = previous->NUBASE_ME - NUBASE_ME + 2 * p_ME;
-              ds_2p = errorQuadrature(previous->NUBASE_dME, NUBASE_dME, p_dME, p_dME);
+              s_2p  = previous.NUBASE_ME - NUBASE_ME + 2 * p_ME;
+              ds_2p = errorQuadrature(previous.NUBASE_dME, NUBASE_dME, p_dME, p_dME);
               numSeparationEnergiesRead++;
             }
           // S_2n(Z,N) = M(Z,N-2) - M(Z,N) + 2*M(0,1)
-          else if (Z - previous->Z == 0 && N - previous->N == 2)
+          else if (Z - previous.Z == 0 && N - previous.N == 2)
             {
-              s_2n  = previous->NUBASE_ME - NUBASE_ME + 2 * n_ME;
-              ds_2n = errorQuadrature(previous->NUBASE_dME, NUBASE_dME, n_dME, n_dME);
+              s_2n  = previous.NUBASE_ME - NUBASE_ME + 2 * n_ME;
+              ds_2n = errorQuadrature(previous.NUBASE_dME, NUBASE_dME, n_dME, n_dME);
 
               // |dV_pn(Z,N)| = 1/4*[S_2p(Z,N) - S_2p(Z,N-2)]
-              dV_pn  = fabs(0.25 * (s_2p - previous->s_2p));
-              ddV_pn = 0.25 * errorQuadrature(previous->ds_2p, ds_2p);
+              dV_pn  = fabs(0.25 * (s_2p - previous.s_2p));
+              ddV_pn = 0.25 * errorQuadrature(previous.ds_2p, ds_2p);
               numSeparationEnergiesRead++;
             }
         }
       // Once the difference in A is greater than 2 we wont get any more useful data
       // so set the 'exit variable' to the get out value.
-      else if (A - previous->A >= 3)
+      else if (A - previous.A >= 3)
         {
           numSeparationEnergiesRead = 4;
         }
@@ -296,9 +297,9 @@ void Nuclide::setIsomerData(std::vector<Nuclide>& nuc, const int state) const
   // Loop from the penultimate isotope towards the beginning.
   // Original order is ground state followed by ascending states,
   // theoretically we could just modify nuc.back(), but that's not safe
-  for (auto previous = nuc.rbegin(); previous != nuc.rend(); ++previous)
+  for (auto& previous : std::ranges::reverse_view(nuc))
     {
-      if (A == previous->A && Z == previous->Z)
+      if (A == previous.A && Z == previous.Z)
         {
           double energy{ 0.0 };
           double error{ 0.0 };
@@ -313,7 +314,7 @@ void Nuclide::setIsomerData(std::vector<Nuclide>& nuc, const int state) const
 
           setIsomerEnergyError(error);
 
-          previous->energy_levels.emplace_back(State(state, energy, error));
+          previous.energy_levels.emplace_back(state, energy, error);
           break;
         }
     }