Make QuantumPropagators an indirect dependency

Author: goerz

Project.toml

@@ -6,10 +6,8 @@ version = "0.1.0+dev"
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 QuantumControlBase = "f10a33bc-5a64-497c-be7b-6f86b4f0c2aa"
-QuantumPropagators = "7bf12567-5742-4b91-a078-644e72a65fc1"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-QuantumPropagators = ">=0.3.1"
 QuantumControlBase = ">=0.7.0"
 julia = "1.6"

src/evaluate.jl

@@ -1,4 +1,4 @@
-import QuantumPropagators.Controls: evaluate, evaluate!
+import QuantumControlBase.QuantumPropagators.Controls: evaluate, evaluate!
 
 
 function evaluate(O::GradgenOperator, args...; kwargs...)

src/grad_generator.jl

@@ -1,6 +1,6 @@
-import QuantumPropagators
 using QuantumControlBase: get_control_derivs
-import QuantumPropagators.Controls: get_controls
+import QuantumControlBase.QuantumPropagators.Controls: get_controls
+import QuantumControlBase.QuantumPropagators: _exp_prop_convert_operator
 
 
 @doc raw"""Extended generator for the standard dynamic gradient.
@@ -50,4 +50,4 @@ function get_controls(gradgen::GradGenerator)
 end
 
 
-QuantumPropagators._exp_prop_convert_operator(::GradGenerator) = Matrix{ComplexF64}
+_exp_prop_convert_operator(::GradGenerator) = Matrix{ComplexF64}

src/grad_vector.jl

@@ -1,4 +1,4 @@
-import QuantumPropagators
+import QuantumControlBase.QuantumPropagators: _exp_prop_convert_state
 
 
 @doc raw"""Extended state-vector for the dynamic gradient.
@@ -75,4 +75,4 @@ function resetgradvec!(Ψ̃::GradVector{num_controls,T}, Ψ::T) where {num_contr
 end
 
 
-QuantumPropagators._exp_prop_convert_state(::GradVector) = Vector{ComplexF64}
+_exp_prop_convert_state(::GradVector) = Vector{ComplexF64}

src/gradgen_operator.jl

@@ -1,5 +1,6 @@
-import QuantumPropagators
-import QuantumPropagators.Controls: get_controls
+import QuantumControlBase.QuantumPropagators: has_real_eigvals, _exp_prop_convert_operator
+import QuantumControlBase.QuantumPropagators.Controls: get_controls
+import QuantumControlBase.QuantumPropagators.SpectralRange: random_state
 
 
 """Static generator for the dynamic gradient.
@@ -30,19 +31,15 @@ end
 # Upper triangular block matrices have eigenvalues only from the diagonal
 # blocks. This is an example for a matrix that has real eigenvalues despite not
 # being Hermitian
-QuantumPropagators.has_real_eigvals(G::GradgenOperator) =
-    QuantumPropagators.has_real_eigvals(G.G)
+has_real_eigvals(G::GradgenOperator) = has_real_eigvals(G.G)
 
 
-function QuantumPropagators.SpectralRange.random_state(H::GradgenOperator)
-    state = QuantumPropagators.SpectralRange.random_state(H.G)
+function random_state(H::GradgenOperator)
+    state = random_state(H.G)
     num_controls = length(H.control_deriv_ops)
-    grad_states = [
-        QuantumPropagators.SpectralRange.random_state(H.G) for
-        i ∈ eachindex(H.control_deriv_ops)
-    ]
+    grad_states = [random_state(H.G) for i ∈ eachindex(H.control_deriv_ops)]
     return GradVector{num_controls,typeof(state)}(state, grad_states)
 end
 
 
-QuantumPropagators._exp_prop_convert_operator(::GradgenOperator) = Matrix{ComplexF64}
+_exp_prop_convert_operator(::GradgenOperator) = Matrix{ComplexF64}