🚨 clang-tidy

Signed-off-by: burgholzer <burgholzer@me.com>

include/EquivalenceCheckingManager.hpp

@@ -9,8 +9,12 @@
 #include "EquivalenceCriterion.hpp"
 #include "QuantumComputation.hpp"
 #include "ThreadSafeQueue.hpp"
+#include "checker/EquivalenceChecker.hpp"
 #include "checker/dd/DDSimulationChecker.hpp"
+#include "checker/dd/applicationscheme/ApplicationScheme.hpp"
+#include "checker/dd/applicationscheme/GateCostApplicationScheme.hpp"
 #include "checker/dd/simulation/StateGenerator.hpp"
+#include "checker/dd/simulation/StateType.hpp"
 #include "dd/ComplexNumbers.hpp"
 #include "dd/DDDefinitions.hpp"
 

include/EquivalenceCriterion.hpp

@@ -5,11 +5,12 @@
 
 #pragma once
 
-#include <exception>
+#include <cstdint>
 #include <iostream>
+#include <string>
 
 namespace ec {
-enum class EquivalenceCriterion {
+enum class EquivalenceCriterion : std::uint8_t {
   NotEquivalent = 0,
   Equivalent = 1,
   NoInformation = 2,

include/checker/dd/DDAlternatingChecker.hpp

@@ -5,11 +5,16 @@
 
 #pragma once
 
+#include "Configuration.hpp"
 #include "DDEquivalenceChecker.hpp"
 #include "DDPackageConfigs.hpp"
+#include "EquivalenceCriterion.hpp"
+#include "QuantumComputation.hpp"
 #include "applicationscheme/LookaheadApplicationScheme.hpp"
+#include "dd/Package_fwd.hpp"
 
 #include <nlohmann/json_fwd.hpp>
+#include <utility>
 
 namespace ec {
 class DDAlternatingChecker final

include/checker/dd/DDSimulationChecker.hpp

@@ -38,7 +38,7 @@ class DDSimulationChecker final
     return taskManager2.getInternalState().getVector();
   }
 
-  void json(nlohmann::json& j) const noexcept override;
+  void json(nlohmann::basic_json<>& j) const noexcept override;
 
 private:
   // the initial state used for simulation. defaults to the all-zero state

include/checker/dd/applicationscheme/ApplicationScheme.hpp

@@ -5,15 +5,17 @@
 
 #pragma once
 
-#include "QuantumComputation.hpp"
 #include "checker/dd/TaskManager.hpp"
 
+#include <cstddef>
+#include <cstdint>
 #include <iostream>
-#include <stdexcept>
+#include <string>
+#include <utility>
 
 namespace ec {
 // A list of application schemes that implement the below interface
-enum class ApplicationSchemeType {
+enum class ApplicationSchemeType : std::uint8_t {
   Sequential = 0,
   OneToOne = 1,
   Lookahead = 2,

include/checker/dd/applicationscheme/LookaheadApplicationScheme.hpp

@@ -6,6 +6,13 @@
 #pragma once
 
 #include "ApplicationScheme.hpp"
+#include "checker/dd/TaskManager.hpp"
+#include "dd/Package.hpp"
+#include "dd/Package_fwd.hpp"
+
+#include <cassert>
+#include <cstddef>
+#include <utility>
 
 namespace ec {
 template <class Config>

include/checker/dd/applicationscheme/OneToOneApplicationScheme.hpp

@@ -6,6 +6,10 @@
 #pragma once
 
 #include "ApplicationScheme.hpp"
+#include "checker/dd/TaskManager.hpp"
+
+#include <cstddef>
+#include <utility>
 
 namespace ec {
 template <class DDType, class Config>

include/checker/dd/applicationscheme/SequentialApplicationScheme.hpp

@@ -6,6 +6,10 @@
 #pragma once
 
 #include "ApplicationScheme.hpp"
+#include "checker/dd/TaskManager.hpp"
+
+#include <cstddef>
+#include <utility>
 
 namespace ec {
 template <class DDType, class Config>
@@ -23,7 +27,7 @@ class SequentialApplicationScheme final
   }
 
 private:
-  const std::size_t gates1;
-  const std::size_t gates2;
+  std::size_t gates1;
+  std::size_t gates2;
 };
 } // namespace ec

include/checker/dd/simulation/StateGenerator.hpp

@@ -7,12 +7,22 @@
 
 #include "StateType.hpp"
 #include "algorithms/RandomCliffordCircuit.hpp"
-#include "checker/dd/TaskManager.hpp"
+#include "dd/DDDefinitions.hpp"
+#include "dd/DDpackageConfig.hpp"
 #include "dd/Package.hpp"
-#include "dd/Simulation.hpp"
-
-#include <functional>
+#include "dd/Package_fwd.hpp"
+#include "dd/Simulation.hpp" // IWYU pragma: keep
+
+#include <array>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <limits>
 #include <random>
+#include <tuple>
+#include <unordered_set>
+#include <vector>
 
 namespace ec {
 class StateGenerator {
@@ -168,7 +178,7 @@ class StateGenerator {
   std::size_t seed = 0U;
   std::mt19937_64 mt;
 
-  std::unordered_set<std::size_t> generatedComputationalBasisStates{};
+  std::unordered_set<std::size_t> generatedComputationalBasisStates;
   constexpr static std::size_t ONE_QUBIT_BASE_ELEMENTS = 6U;
   // this generator produces random bases from the set { |0>, |1>, |+>, |->,
   // |L>, |R> }

include/checker/dd/simulation/StateType.hpp

@@ -5,10 +5,12 @@
 
 #pragma once
 
+#include <cstdint>
 #include <iostream>
+#include <string>
 
 namespace ec {
-enum class StateType {
+enum class StateType : std::uint8_t {
   ComputationalBasis = 0,
   Random1QBasis = 1,
   Stabilizer = 2

include/checker/zx/ZXChecker.hpp

@@ -6,14 +6,17 @@
 #pragma once
 
 #include "Configuration.hpp"
-#include "Definitions.hpp"
 #include "EquivalenceCriterion.hpp"
+#include "Permutation.hpp"
 #include "QuantumComputation.hpp"
 #include "checker/EquivalenceChecker.hpp"
-#include "nlohmann/json.hpp"
-#include "zx/Simplify.hpp"
+#include "zx/Rules.hpp"
+#include "zx/ZXDefinitions.hpp"
 #include "zx/ZXDiagram.hpp"
 
+#include <cstddef>
+#include <nlohmann/json.hpp>
+
 namespace ec {
 class ZXEquivalenceChecker : public EquivalenceChecker {
 public:
@@ -23,7 +26,7 @@ class ZXEquivalenceChecker : public EquivalenceChecker {
 
   EquivalenceCriterion run() override;
 
-  void json(nlohmann::json& j) const noexcept override {
+  void json(nlohmann::basic_json<>& j) const noexcept override {
     EquivalenceChecker::json(j);
     j["checker"] = "zx";
   }

src/Configuration.cpp

@@ -6,6 +6,9 @@
 
 #include "Configuration.hpp"
 
+#include "checker/dd/applicationscheme/ApplicationScheme.hpp"
+#include "checker/dd/simulation/StateType.hpp"
+
 #include <nlohmann/json.hpp>
 
 namespace ec {
@@ -47,8 +50,8 @@ bool Configuration::onlySimulationCheckerConfigured() const noexcept {
          !execution.runAlternatingChecker && !execution.runZXChecker;
 }
 
-nlohmann::json Configuration::json() const {
-  nlohmann::json config{};
+nlohmann::basic_json<> Configuration::json() const {
+  nlohmann::basic_json<> config{};
   auto& exe = config["execution"];
   exe["tolerance"] = execution.numericalTolerance;
   exe["parallel"] = execution.parallel;

src/EquivalenceCheckingManager.cpp

@@ -10,6 +10,7 @@
 #include "EquivalenceCriterion.hpp"
 #include "Permutation.hpp"
 #include "QuantumComputation.hpp"
+#include "ThreadSafeQueue.hpp"
 #include "checker/dd/DDAlternatingChecker.hpp"
 #include "checker/dd/DDConstructionChecker.hpp"
 #include "checker/dd/DDSimulationChecker.hpp"
@@ -21,11 +22,13 @@
 #include <cassert>
 #include <chrono>
 #include <cstddef>
+#include <future>
 #include <iostream>
 #include <memory>
 #include <mutex>
+#include <nlohmann/json.hpp>
 #include <optional>
-#include <string>
+#include <stdexcept>
 #include <thread>
 #include <utility>
 #include <vector>
@@ -336,7 +339,7 @@ void EquivalenceCheckingManager::run() {
   }
 
   for (const auto& checker : checkers) {
-    nlohmann::json j{};
+    nlohmann::basic_json j{};
     checker->json(j);
     results.checkerResults.emplace_back(j);
   }
@@ -881,7 +884,7 @@ void EquivalenceCheckingManager::checkSymbolic() {
       std::clog << "Checking symbolic circuits requires transformation "
                    "to ZX-diagram but one of the circuits contains "
                    "operations not supported by this checker! Exiting!"
-                << std::endl;
+                << '\n';
       checkers.clear();
       results.equivalence = EquivalenceCriterion::NoInformation;
       return;

src/checker/EquivalenceChecker.cpp

@@ -5,10 +5,14 @@
 
 #include "checker/EquivalenceChecker.hpp"
 
+#include "EquivalenceCriterion.hpp"
+
+#include <nlohmann/json.hpp>
+
 // this function is mainly placed here in order to have an out-of-line
 // virtual method definition which avoids emitting the classe's vtable in
 // every translation unit.
-void ec::EquivalenceChecker::json(nlohmann::json& j) const noexcept {
+void ec::EquivalenceChecker::json(nlohmann::basic_json<>& j) const noexcept {
   j["equivalence"] = toString(equivalence);
   j["runtime"] = getRuntime();
 }

src/checker/dd/DDAlternatingChecker.cpp

@@ -162,7 +162,7 @@ bool DDAlternatingChecker::canHandle(const qc::QuantumComputation& qc1,
   return true;
 }
 
-void DDAlternatingChecker::json(nlohmann::json& j) const noexcept {
+void DDAlternatingChecker::json(nlohmann::basic_json<>& j) const noexcept {
   DDEquivalenceChecker::json(j);
   j["checker"] = "decision_diagram_alternating";
 }

src/checker/dd/DDConstructionChecker.cpp

@@ -12,7 +12,7 @@
 // this function is mainly placed here in order to have an out-of-line
 // virtual method definition which avoids emitting the classes' vtable in
 // every translation unit.
-void ec::DDConstructionChecker::json(nlohmann::json& j) const noexcept {
+void ec::DDConstructionChecker::json(nlohmann::basic_json<>& j) const noexcept {
   DDEquivalenceChecker::json(j);
   j["checker"] = "decision_diagram_construction";
 }

src/checker/dd/DDEquivalenceChecker.cpp

@@ -270,7 +270,7 @@ void DDEquivalenceChecker<DDType, Config>::initializeApplicationScheme(
 
 template <class DDType, class Config>
 void DDEquivalenceChecker<DDType, Config>::json(
-    nlohmann::json& j) const noexcept {
+    nlohmann::basic_json<>& j) const noexcept {
   EquivalenceChecker::json(j);
   j["max_nodes"] = maxActiveNodes;
 }

src/checker/dd/DDSimulationChecker.cpp

@@ -50,7 +50,7 @@ void DDSimulationChecker::setRandomInitialState(StateGenerator& generator) {
       generator.generateRandomState(*dd, nqubits, nancillary, stateType);
 }
 
-void DDSimulationChecker::json(nlohmann::json& j) const noexcept {
+void DDSimulationChecker::json(nlohmann::basic_json<>& j) const noexcept {
   DDEquivalenceChecker::json(j);
   j["checker"] = "decision_diagram_simulation";
 }

src/checker/dd/applicationscheme/GateCostApplicationScheme.cpp

@@ -5,6 +5,10 @@
 
 #include "checker/dd/applicationscheme/GateCostApplicationScheme.hpp"
 
+#include "operations/OpType.hpp"
+
+#include <cstddef>
+
 namespace ec {
 [[nodiscard]] std::size_t
 legacyCostFunction(const GateCostLookupTableKeyType& key) noexcept {

src/checker/dd/simulation/StateGenerator.cpp

@@ -5,6 +5,12 @@
 
 #include "checker/dd/simulation/StateGenerator.hpp"
 
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <functional>
+#include <random>
+
 namespace ec {
 
 void StateGenerator::seedGenerator(const std::size_t s) {

src/checker/zx/ZXChecker.cpp

@@ -5,17 +5,21 @@
 
 #include "checker/zx/ZXChecker.hpp"
 
+#include "Configuration.hpp"
 #include "Definitions.hpp"
+#include "EquivalenceCriterion.hpp"
 #include "QuantumComputation.hpp"
+#include "checker/EquivalenceChecker.hpp"
 #include "zx/FunctionalityConstruction.hpp"
-#include "zx/Simplify.hpp"
+#include "zx/Rules.hpp"
+#include "zx/ZXDefinitions.hpp"
 #include "zx/ZXDiagram.hpp"
 
 #include <cassert>
 #include <chrono>
 #include <cstddef>
-#include <optional>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 namespace ec {

test/legacy/test_compilationflow.cpp

@@ -3,10 +3,15 @@
 // See README.md or go to https://github.com/cda-tum/qcec for more information.
 //
 
+#include "Configuration.hpp"
 #include "EquivalenceCheckingManager.hpp"
+#include "QuantumComputation.hpp"
+#include "checker/dd/applicationscheme/ApplicationScheme.hpp"
+#include "checker/dd/applicationscheme/GateCostApplicationScheme.hpp"
 
-#include "gtest/gtest.h"
-#include <functional>
+#include <algorithm>
+#include <gtest/gtest.h>
+#include <iostream>
 #include <string>
 
 class CompilationFlowTest : public testing::TestWithParam<std::string> {