update for new NT

Project.toml

@@ -28,7 +28,7 @@ Interpolations = "0.15"
 JLD2 = "0.5"
 LinearAlgebra = "1.10, 1.11"
 NamedTrajectories = "0.3"
-PiccoloQuantumObjects = "0.4"
+PiccoloQuantumObjects = "0.5"
 Random = "1.10, 1.11"
 Reexport = "1.2"
 SparseArrays = "1.10, 1.11"

src/problem_templates/unitary_variational_problem.jl

@@ -87,6 +87,8 @@ function UnitaryVariationalProblem(
     constraints::Vector{<:AbstractConstraint}=AbstractConstraint[],
     piccolo_options::PiccoloOptions=PiccoloOptions(),
 )
+    @assert true "Broken by NT refactor"
+
     if piccolo_options.verbose
         println("    constructing UnitaryVariationalProblem...")
         println("\tusing integrator: $(typeof(variational_integrator))")
@@ -126,6 +128,7 @@ function UnitaryVariationalProblem(
         Symbol(string(variational_state_name) * "$(i)") for i in eachindex(system.G_vars)
     ]
 
+    # TODO: Must refactor
     for (name, scale, Ũ⃗_v) in zip(variational_state_names, variational_scales, Ũ⃗_vars)
         add_component!(traj, name, Ũ⃗_v / scale; type=:state)
         traj.initial = merge(traj.initial, (name => Ũ⃗_v[:, 1] / scale,))

src/trajectory_initialization.jl

@@ -6,6 +6,7 @@ export unitary_linear_interpolation
 export initialize_trajectory
 
 using NamedTrajectories
+import NamedTrajectories: ScalarBound, VectorBound
 using PiccoloQuantumObjects
 
 using Distributions
@@ -140,9 +141,6 @@ end
 
 # ============================================================================= #
 
-const VectorBound = Union{AbstractVector{R}, Tuple{AbstractVector{R}, AbstractVector{R}}} where R <: Real
-const ScalarBound = Union{R, Tuple{R, R}} where R <: Real
-
 function initialize_unitary_trajectory(
     U_init::AbstractMatrix{<:Number},
     U_goal::AbstractPiccoloOperator,