From aa14531c0cdb17564ab0b55901b0c77e3c625657 Mon Sep 17 00:00:00 2001
From: Michael Goerz <mail@michaelgoerz.net>
Date: Mon, 2 Sep 2024 14:58:34 -0400
Subject: [PATCH] Remove QuantumControlBase

---
 Project.toml            | 4 ++--
 src/evaluate.jl         | 2 +-
 src/grad_generator.jl   | 8 ++++----
 src/grad_vector.jl      | 4 ++--
 src/gradgen_operator.jl | 8 ++++----
 test/Project.toml       | 1 -
 test/test_interface.jl  | 2 +-
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Project.toml b/Project.toml
index 4af22d5..48ddae4 100644
--- a/Project.toml
+++ b/Project.toml
@@ -5,13 +5,13 @@ version = "0.1.7+dev"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-QuantumControlBase = "f10a33bc-5a64-497c-be7b-6f86b4f0c2aa"
+QuantumControl = "8a270532-f23f-47a8-83a9-b33d10cad486"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
 LinearAlgebra = "1"
-QuantumControlBase = ">=0.10.0"
+QuantumControl = ">=0.10.0"
 Random = "1"
 SparseArrays = "1"
 julia = "1.9"
diff --git a/src/evaluate.jl b/src/evaluate.jl
index 9397cd9..1d9c270 100644
--- a/src/evaluate.jl
+++ b/src/evaluate.jl
@@ -1,4 +1,4 @@
-import QuantumControlBase.QuantumPropagators.Controls: evaluate, evaluate!
+import QuantumControl.QuantumPropagators.Controls: evaluate, evaluate!
 
 
 function evaluate(O::GradgenOperator, args...; kwargs...)
diff --git a/src/grad_generator.jl b/src/grad_generator.jl
index 0a5cdc7..ff6ca2b 100644
--- a/src/grad_generator.jl
+++ b/src/grad_generator.jl
@@ -1,7 +1,7 @@
-using QuantumControlBase: get_control_derivs
-import QuantumControlBase.QuantumPropagators.Controls: get_controls
-import QuantumControlBase.QuantumPropagators.Controls: get_parameters
-import QuantumControlBase.QuantumPropagators: _exp_prop_convert_operator
+using QuantumControl.Controls: get_control_derivs
+import QuantumControl.QuantumPropagators.Controls: get_controls
+import QuantumControl.QuantumPropagators.Controls: get_parameters
+import QuantumControl.QuantumPropagators: _exp_prop_convert_operator
 
 
 @doc raw"""Extended generator for the standard dynamic gradient.
diff --git a/src/grad_vector.jl b/src/grad_vector.jl
index b923069..f93e0c4 100644
--- a/src/grad_vector.jl
+++ b/src/grad_vector.jl
@@ -1,5 +1,5 @@
-import QuantumControlBase.QuantumPropagators: _exp_prop_convert_state
-import QuantumControlBase.QuantumPropagators.Interfaces: supports_inplace
+import QuantumControl.QuantumPropagators: _exp_prop_convert_state
+import QuantumControl.QuantumPropagators.Interfaces: supports_inplace
 
 
 @doc raw"""Extended state-vector for the dynamic gradient.
diff --git a/src/gradgen_operator.jl b/src/gradgen_operator.jl
index 8bbdfdc..447e62c 100644
--- a/src/gradgen_operator.jl
+++ b/src/gradgen_operator.jl
@@ -1,8 +1,8 @@
 using Random: GLOBAL_RNG
-import QuantumControlBase.QuantumPropagators: _exp_prop_convert_operator
-import QuantumControlBase.QuantumPropagators.Controls: get_controls
-import QuantumControlBase.QuantumPropagators.SpectralRange: random_state
-import QuantumControlBase.QuantumPropagators.Interfaces: supports_inplace
+import QuantumControl.QuantumPropagators: _exp_prop_convert_operator
+import QuantumControl.QuantumPropagators.Controls: get_controls
+import QuantumControl.QuantumPropagators.SpectralRange: random_state
+import QuantumControl.QuantumPropagators.Interfaces: supports_inplace
 
 
 """Static generator for the dynamic gradient.
diff --git a/test/Project.toml b/test/Project.toml
index 153d099..fb721d0 100644
--- a/test/Project.toml
+++ b/test/Project.toml
@@ -16,7 +16,6 @@ LocalCoverage = "5f6e1e16-694c-5876-87ef-16b5274f298e"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 QuantumControl = "8a270532-f23f-47a8-83a9-b33d10cad486"
-QuantumControlBase = "f10a33bc-5a64-497c-be7b-6f86b4f0c2aa"
 QuantumControlTestUtils = "d3fd27c9-1dfb-4e67-b0c0-90d0d87a1e48"
 QuantumGradientGenerators = "a563f35e-61db-434d-8c01-8b9e3ccdfd85"
 QuantumPropagators = "7bf12567-5742-4b91-a078-644e72a65fc1"
diff --git a/test/test_interface.jl b/test/test_interface.jl
index da7fc91..7f8977a 100644
--- a/test/test_interface.jl
+++ b/test/test_interface.jl
@@ -2,7 +2,7 @@ using Test
 using QuantumPropagators.Generators: hamiltonian
 using QuantumPropagators.Controls: get_controls
 using QuantumControlTestUtils.RandomObjects: random_matrix, random_state_vector
-using QuantumControlBase: check_generator
+using QuantumControl.Interfaces: check_generator
 using QuantumPropagators.Interfaces: check_state
 using QuantumGradientGenerators: GradGenerator, GradVector
 using StaticArrays: SVector, SMatrix