Remove unused "include" directives and "using" statements (#1569)

CQCL · Sep 9, 2024 · 0e9122f · 0e9122f
1 parent 3107488
commit 0e9122f
Show file tree

Hide file tree

Showing 132 changed files with 19 additions and 224 deletions.
diff --git a/pytket/conanfile.py b/pytket/conanfile.py
@@ -32,7 +32,7 @@ def package(self):
         cmake.install()
 
     def requirements(self):
-        self.requires("tket/1.3.23@tket/stable")
+        self.requires("tket/1.3.24@tket/stable")
         self.requires("tklog/0.3.3@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
         self.requires("tkassert/0.3.4@tket/stable")

diff --git a/tket/conanfile.py b/tket/conanfile.py
@@ -23,7 +23,7 @@
 
 class TketConan(ConanFile):
     name = "tket"
-    version = "1.3.23"
+    version = "1.3.24"
     package_type = "library"
     license = "Apache 2"
     homepage = "https://github.com/CQCL/tket"

diff --git a/tket/proptest/src/ComparisonFunctions.cpp b/tket/proptest/src/ComparisonFunctions.cpp
@@ -17,6 +17,8 @@
 #include <sstream>
 #include <stdexcept>
 
+#include "tket/Utils/MatrixAnalysis.hpp"
+
 // NOTE: this is an identical copy of a file in tket-tests, in the Simulation
 // folder. This is deliberate! Please keep both in sync!
 // See the tket-tests file for a mathematical discussion.

diff --git a/tket/proptest/src/ComparisonFunctions.hpp b/tket/proptest/src/ComparisonFunctions.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "tket/Utils/MatrixAnalysis.hpp"
+#include "tket/Utils/EigenConfig.hpp"
 
 namespace tket {
 namespace tket_sim {

diff --git a/tket/src/Architecture/Architecture.cpp b/tket/src/Architecture/Architecture.cpp
@@ -16,11 +16,9 @@
 
 #include <boost/graph/biconnected_components.hpp>
 #include <tkassert/Assert.hpp>
-#include <unordered_set>
 #include <vector>
 
 #include "tket/Graphs/ArticulationPoints.hpp"
-#include "tket/Utils/Json.hpp"
 #include "tket/Utils/UnitID.hpp"
 
 namespace tket {

diff --git a/tket/src/Architecture/ArchitectureMapping.cpp b/tket/src/Architecture/ArchitectureMapping.cpp
@@ -14,8 +14,6 @@
 
 #include "tket/Architecture/ArchitectureMapping.hpp"
 
-#include <sstream>
-#include <stdexcept>
 #include <tkassert/Assert.hpp>
 
 namespace tket {

diff --git a/tket/src/Architecture/DistancesFromArchitecture.cpp b/tket/src/Architecture/DistancesFromArchitecture.cpp
@@ -14,9 +14,6 @@
 
 #include "tket/Architecture/DistancesFromArchitecture.hpp"
 
-#include <sstream>
-#include <stdexcept>
-
 namespace tket {
 
 DistancesFromArchitecture::DistancesFromArchitecture(

diff --git a/tket/src/Architecture/NeighboursFromArchitecture.cpp b/tket/src/Architecture/NeighboursFromArchitecture.cpp
@@ -15,8 +15,6 @@
 #include "tket/Architecture/NeighboursFromArchitecture.hpp"
 
 #include <algorithm>
-#include <sstream>
-#include <stdexcept>
 
 namespace tket {
 

diff --git a/tket/src/Circuit/AssertionSynthesis.cpp b/tket/src/Circuit/AssertionSynthesis.cpp
@@ -16,17 +16,12 @@
 
 #include <array>
 #include <cmath>
-#include <complex>
-#include <optional>
 #include <stdexcept>
 #include <tkassert/Assert.hpp>
 
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Utils/Constants.hpp"
-#include "tket/Utils/CosSinDecomposition.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 #include "tket/Utils/UnitID.hpp"
 

diff --git a/tket/src/Circuit/Boxes.cpp b/tket/src/Circuit/Boxes.cpp
@@ -29,10 +29,8 @@
 #include "tket/OpType/OpTypeInfo.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/Expression.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 #include "tket/Utils/PauliTensor.hpp"
 
 namespace tket {

diff --git a/tket/src/Circuit/CircPool.cpp b/tket/src/Circuit/CircPool.cpp
@@ -18,11 +18,9 @@
 
 #include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
-#include "tket/Gate/Rotation.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Transformations/BasicOptimisation.hpp"
 #include "tket/Utils/Expression.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/CircUtils.cpp b/tket/src/Circuit/CircUtils.cpp
@@ -27,8 +27,6 @@
 #include "tket/Gate/GateUnitaryMatrixImplementations.hpp"
 #include "tket/Gate/Rotation.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/Ops/Op.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/Expression.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 #include "tket/Utils/UnitID.hpp"

diff --git a/tket/src/Circuit/Circuit.cpp b/tket/src/Circuit/Circuit.cpp
@@ -17,7 +17,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <fstream>
-#include <numeric>
 #include <optional>
 #include <set>
 #include <string>
@@ -32,7 +31,6 @@
 #include "tket/OpType/OpType.hpp"
 #include "tket/OpType/OpTypeFunctions.hpp"
 #include "tket/Utils/Expression.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
 
 namespace tket {

diff --git a/tket/src/Circuit/CircuitJson.cpp b/tket/src/Circuit/CircuitJson.cpp
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "tket/Circuit/Circuit.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/ConjugationBox.cpp b/tket/src/Circuit/ConjugationBox.cpp
@@ -20,8 +20,6 @@
 #include "Utils/Expression.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
-#include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/ControlledGates.cpp b/tket/src/Circuit/ControlledGates.cpp
@@ -23,7 +23,6 @@
 #include "tket/Gate/GatePtr.hpp"
 #include "tket/Gate/Rotation.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
 
 namespace tket {

diff --git a/tket/src/Circuit/DAGProperties.cpp b/tket/src/Circuit/DAGProperties.cpp
@@ -15,11 +15,10 @@
 #include "DAGProperties.hpp"
 
 #include <algorithm>
+#include <tkassert/Assert.hpp>
 #include <tklog/TketLog.hpp>
 
-#include "tket/Circuit/Circuit.hpp"
 #include "tket/OpType/EdgeType.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/DiagonalBox.cpp b/tket/src/Circuit/DiagonalBox.cpp
@@ -16,10 +16,8 @@
 
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Multiplexor.hpp"
-#include "tket/Gate/Rotation.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/Multiplexor.cpp b/tket/src/Circuit/Multiplexor.cpp
@@ -24,7 +24,6 @@
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Utils/Constants.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/OpJson.cpp b/tket/src/Circuit/OpJson.cpp
@@ -19,7 +19,6 @@
 #include "tket/OpType/OpTypeFunctions.hpp"
 #include "tket/Ops/BarrierOp.hpp"
 #include "tket/Ops/ClassicalOps.hpp"
-#include "tket/Ops/MetaOp.hpp"
 #include "tket/Ops/OpPtr.hpp"
 #include "tket/Utils/Json.hpp"
 

diff --git a/tket/src/Circuit/PauliExpBoxes.cpp b/tket/src/Circuit/PauliExpBoxes.cpp
@@ -14,8 +14,6 @@
 
 #include "tket/Circuit/PauliExpBoxes.hpp"
 
-#include <iostream>
-
 #include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/ConjugationBox.hpp"
 #include "tket/Converters/PhasePoly.hpp"

diff --git a/tket/src/Circuit/ResourceData.cpp b/tket/src/Circuit/ResourceData.cpp
@@ -14,8 +14,6 @@
 
 #include "tket/Circuit/ResourceData.hpp"
 
-#include "tket/Utils/Json.hpp"
-
 namespace tket {
 
 bool ResourceData::operator==(const ResourceData& other) const {

diff --git a/tket/src/Circuit/Simulation/BitOperations.cpp b/tket/src/Circuit/Simulation/BitOperations.cpp
@@ -14,7 +14,6 @@
 
 #include "BitOperations.hpp"
 
-#include <stdexcept>
 #include <tkassert/Assert.hpp>
 
 namespace tket {

diff --git a/tket/src/Circuit/Simulation/DecomposeCircuit.cpp b/tket/src/Circuit/Simulation/DecomposeCircuit.cpp
@@ -20,8 +20,6 @@
 #include "GateNodesBuffer.hpp"
 #include "tket/Circuit/Boxes.hpp"
 #include "tket/Circuit/Circuit.hpp"
-#include "tket/Circuit/PauliExpBoxes.hpp"
-#include "tket/Circuit/Simulation/PauliExpBoxUnitaryCalculator.hpp"
 #include "tket/Gate/Gate.hpp"
 #include "tket/Gate/GateUnitaryMatrix.hpp"
 #include "tket/Gate/GateUnitaryMatrixError.hpp"

diff --git a/tket/src/Circuit/Simulation/DecomposeCircuit.hpp b/tket/src/Circuit/Simulation/DecomposeCircuit.hpp
@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "tket/Utils/MatrixAnalysis.hpp"
-
 namespace tket {
 class Circuit;
 namespace tket_sim {

diff --git a/tket/src/Circuit/Simulation/GateNodesBuffer.hpp b/tket/src/Circuit/Simulation/GateNodesBuffer.hpp
@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "GateNode.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
 namespace tket_sim {

diff --git a/tket/src/Circuit/StatePreparation.cpp b/tket/src/Circuit/StatePreparation.cpp
@@ -22,7 +22,6 @@
 #include "tket/Gate/Rotation.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/SubcircuitFinder.cpp b/tket/src/Circuit/SubcircuitFinder.cpp
@@ -16,7 +16,6 @@
 #include <boost/graph/transitive_closure.hpp>
 #include <cstddef>
 #include <iterator>
-#include <memory>
 #include <optional>
 #include <tkassert/Assert.hpp>
 #include <vector>

diff --git a/tket/src/Circuit/ThreeQubitConversion.cpp b/tket/src/Circuit/ThreeQubitConversion.cpp
@@ -30,8 +30,6 @@
 #include "tket/OpType/OpType.hpp"
 #include "tket/Utils/Constants.hpp"
 #include "tket/Utils/CosSinDecomposition.hpp"
-#include "tket/Utils/EigenConfig.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 #include "tket/Utils/UnitID.hpp"
 
 namespace tket {

diff --git a/tket/src/Circuit/ToffoliBox.cpp b/tket/src/Circuit/ToffoliBox.cpp
@@ -20,10 +20,8 @@
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/DiagonalBox.hpp"
 #include "tket/Circuit/Multiplexor.hpp"
-#include "tket/Gate/Rotation.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/macro_circ_info.cpp b/tket/src/Circuit/macro_circ_info.cpp
@@ -23,7 +23,6 @@
 #include "tket/OpType/EdgeType.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Circuit/setters_and_getters.cpp b/tket/src/Circuit/setters_and_getters.cpp
@@ -26,7 +26,6 @@
 #include "tket/OpType/OpDesc.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Converters/PauliGraphConverters.cpp b/tket/src/Converters/PauliGraphConverters.cpp
@@ -15,8 +15,6 @@
 #include "tket/Circuit/Boxes.hpp"
 #include "tket/Circuit/PauliExpBoxes.hpp"
 #include "tket/Converters/Converters.hpp"
-#include "tket/Converters/PhasePoly.hpp"
-#include "tket/Diagonalisation/Diagonalisation.hpp"
 #include "tket/Gate/Gate.hpp"
 
 namespace tket {

diff --git a/tket/src/Converters/PhasePoly.cpp b/tket/src/Converters/PhasePoly.cpp
@@ -26,8 +26,6 @@
 #include "tket/OpType/OpType.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Converters/ZXConverters.cpp b/tket/src/Converters/ZXConverters.cpp
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tket/Circuit/CircPool.hpp"
 #include "tket/Converters/Converters.hpp"
 #include "tket/ZX/Flow.hpp"
 #include "tket/ZX/ZXDiagram.hpp"

diff --git a/tket/src/Diagonalisation/Diagonalisation.cpp b/tket/src/Diagonalisation/Diagonalisation.cpp
@@ -16,7 +16,6 @@
 
 #include <tkassert/Assert.hpp>
 
-#include "tket/Ops/Op.hpp"
 #include "tket/PauliGraph/ConjugatePauliFunctions.hpp"
 #include "tket/Utils/UnitID.hpp"
 

diff --git a/tket/src/Diagonalisation/PauliPartition.cpp b/tket/src/Diagonalisation/PauliPartition.cpp
@@ -19,7 +19,6 @@
 
 #include "tket/Graphs/AdjacencyData.hpp"
 #include "tket/Graphs/GraphColouring.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Gate/GateUnitaryMatrixVariableQubits.hpp b/tket/src/Gate/GateUnitaryMatrixVariableQubits.hpp
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "tket/OpType/OpType.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
+#include "tket/Utils/EigenConfig.hpp"
 
 namespace tket {
 namespace internal {

diff --git a/tket/src/Gate/Rotation.cpp b/tket/src/Gate/Rotation.cpp
@@ -21,7 +21,6 @@
 #include "tket/OpType/OpDesc.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Utils/Expression.hpp"
-#include "tket/Utils/Symbols.hpp"
 
 namespace tket {
 

diff --git a/tket/src/Graphs/AdjacencyData.cpp b/tket/src/Graphs/AdjacencyData.cpp
@@ -17,12 +17,9 @@
 #include <algorithm>
 #include <set>
 #include <sstream>
-#include <stdexcept>
 #include <tkassert/Assert.hpp>
 
-using std::exception;
 using std::map;
-using std::runtime_error;
 using std::set;
 using std::string;
 using std::stringstream;

diff --git a/tket/src/Graphs/ArticulationPoints.cpp b/tket/src/Graphs/ArticulationPoints.cpp
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include "tket/Graphs/Utils.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket::graphs {
 

diff --git a/tket/src/Graphs/BruteForceColouring.cpp b/tket/src/Graphs/BruteForceColouring.cpp
@@ -15,7 +15,6 @@
 #include "BruteForceColouring.hpp"
 
 #include <set>
-#include <sstream>
 #include <stdexcept>
 #include <tkassert/Assert.hpp>