Remove QuantumControlBase

JuliaQuantumControl · Sep 2, 2024 · a6695be · a6695be
1 parent b866b53
commit a6695be
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 21 deletions.
diff --git a/Project.toml b/Project.toml
@@ -7,7 +7,7 @@ version = "0.1.1+dev"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-QuantumControlBase = "f10a33bc-5a64-497c-be7b-6f86b4f0c2aa"
+QuantumControl = "8a270532-f23f-47a8-83a9-b33d10cad486"
 QuantumGradientGenerators = "a563f35e-61db-434d-8c01-8b9e3ccdfd85"
 
 [weakdeps]
@@ -19,6 +19,6 @@ ParameterizedQuantumControlOptimizationExt = "Optimization"
 [compat]
 LinearAlgebra = "1"
 Optimization = "3"
-QuantumControlBase = ">=0.9.0"
+QuantumControl = ">=0.10.0"
 QuantumGradientGenerators = ">=0.1.4"
 julia = "1.9"
diff --git a/docs/example/3wavemixing.jl b/docs/example/3wavemixing.jl
@@ -2,7 +2,7 @@
 using QuantumControl.Interfaces: check_generator
 using ComponentArrays: ComponentVector, Axis
 using QuantumControl.Controls: get_parameters
-using QuantumControlBase.QuantumPropagators: propagate
+using QuantumControl.QuantumPropagators: propagate
 import OrdinaryDiffEq
 using UnPack: @unpack
 

diff --git a/docs/make.jl b/docs/make.jl
@@ -6,7 +6,7 @@ if DOCUMENTER_VERSION <= v"1.3.0"
     Pkg.develop("Documenter")
 end
 
-using QuantumControlBase
+using QuantumControl
 using QuantumPropagators
 using ParameterizedQuantumControl
 using Documenter
@@ -31,7 +31,7 @@ end
 
 links = InterLinks(
     "Julia" => "https://docs.julialang.org/en/v1/",
-    "QuantumControlBase" => "https://juliaquantumcontrol.github.io/QuantumControlBase.jl/$DEV_OR_STABLE",
+    "QuantumControl" => "https://juliaquantumcontrol.github.io/QuantumControl.jl/$DEV_OR_STABLE",
     "QuantumPropagators" => "https://juliaquantumcontrol.github.io/QuantumPropagators.jl/$DEV_OR_STABLE",
     "QuantumGradientGenerators" => "https://juliaquantumcontrol.github.io/QuantumGradientGenerators.jl/$DEV_OR_STABLE",
     "QuantumControl" => "https://juliaquantumcontrol.github.io/QuantumControl.jl/$DEV_OR_STABLE",
@@ -44,16 +44,11 @@ links = InterLinks(
 )
 
 fallbacks = ExternalFallbacks(
-    "QuantumControlBase.ControlProblem" => "@extref QuantumControl :jl:type:`QuantumControlBase.ControlProblem`",
-    "QuantumControl.ControlProblem" => "@extref QuantumControl :jl:type:`QuantumControlBase.ControlProblem`",
-    "ControlProblem" => "@extref QuantumControl :jl:type:`QuantumControlBase.ControlProblem`",
-    "Trajectory" => "@extref QuantumControl :jl:type:`QuantumControlBase.Trajectory`",
     "get_parameters" => "@extref QuantumControl :jl:function:`QuantumPropagators.Controls.get_parameters`",
     "QuantumControl.Generators.Generator" => "@extref QuantumControl :jl:type:`QuantumPropagators.Generators.Generator`",
     "QuantumControl.hamiltonian" => "@extref QuantumControl :jl:function:`QuantumPropagators.Generators.hamiltonian`",
     "QuantumControl.liouvillian" => "@extref QuantumControl :jl:function:`QuantumPropagators.Generators.liouvillian`",
     "QuantumControl.Controls.ParameterizedFunction" => "@extref QuantumControl :jl:type:`QuantumPropagators.Controls.ParameterizedFunction`",
-    "QuantumControl.propagate_trajectories" => "@extref QuantumControl :jl:function:`QuantumControlBase.propagate_trajectories`",
     "QuantumControl.init_prop" => "@extref QuantumControl :jl:function:`QuantumPropagators.init_prop`",
     "QuantumControl.prop_step!" => "@extref QuantumControl :jl:function:`QuantumPropagators.prop_step!`",
 )

diff --git a/docs/src/index.md b/docs/src/index.md
@@ -35,7 +35,7 @@ pkg> add ParameterizedQuantumControl
 
 * Define a [`QuantumControl.ControlProblem`](@ref) that contains parameterized generators or control fields: [`get_parameters(problem)`](@ref get_parameters) must return a vector of control parameters.
 
-* Call [`QuantumControl.optimize`](@extref QuantumControl `QuantumControlBase.optimize`) using `method=ParameterizedQuantumControl`, and give an appropriate backend and optimizer, e.g.,
+* Call [`QuantumControl.optimize`](@extref) using `method=ParameterizedQuantumControl`, and give an appropriate backend and optimizer, e.g.,
 
   ```
   optimize(

diff --git a/src/optimize.jl b/src/optimize.jl
@@ -1,9 +1,9 @@
-import QuantumControlBase: optimize
+import QuantumControl: optimize
 
 using LinearAlgebra
-using QuantumControlBase: @threadsif
-using QuantumControlBase: set_atexit_save_optimization
-using QuantumControlBase: propagate_trajectories
+using QuantumControl: @threadsif
+using QuantumControl: set_atexit_save_optimization
+using QuantumControl: propagate_trajectories
 
 
 @doc raw"""
@@ -12,7 +12,7 @@ using ParameterizedQuantumControl
 result = optimize(problem; method=ParameterizedQuantumControl, kwargs...)
 ```
 
-optimizes the given control [`problem`](@ref QuantumControlBase.ControlProblem)
+optimizes the given control [`problem`](@ref QuantumControl.ControlProblem)
 by varying a set of control parameters in order to minimize the functional
 
 ```math

diff --git a/src/result.jl b/src/result.jl
@@ -1,4 +1,4 @@
-using QuantumControlBase.QuantumPropagators.Controls: get_parameters
+using QuantumControl.QuantumPropagators.Controls: get_parameters
 using Printf
 using Dates
 

diff --git a/src/workspace.jl b/src/workspace.jl
@@ -1,5 +1,5 @@
-import QuantumControlBase
-using QuantumControlBase.QuantumPropagators.Controls: get_parameters
+import QuantumControl
+using QuantumControl.QuantumPropagators.Controls: get_parameters
 
 
 """Parameterized Optimization Workspace."""
@@ -38,7 +38,7 @@ mutable struct ParameterizedOptWrk{O}
 
 end
 
-function ParameterizedOptWrk(problem::QuantumControlBase.ControlProblem; verbose=false)
+function ParameterizedOptWrk(problem::QuantumControl.ControlProblem; verbose=false)
     use_threads = get(problem.kwargs, :use_threads, false)
     kwargs = Dict(problem.kwargs)  # creates a shallow copy; ok to modify
     trajectories = [traj for traj in problem.trajectories]

diff --git a/test/Project.toml b/test/Project.toml
@@ -16,7 +16,6 @@ ParameterizedQuantumControl = "409be4c9-afa4-4246-894e-472b92a1ed06"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 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"