Fix instantiation of ParametrizedAmplitude w/o shape

Author: goerz

src/pulse_parametrizations.jl

@@ -10,7 +10,7 @@ export SquareParametrization,
 using QuantumPropagators.Controls: discretize_on_midpoints
 using QuantumPropagators.Amplitudes: ControlAmplitude, ShapedAmplitude
 
-import QuantumPropagators.Controls: evaluate
+import QuantumPropagators.Controls: evaluate, get_controls
 import QuantumControlBase: get_control_deriv
 
 
@@ -229,13 +229,13 @@ function ParametrizedAmplitude(
             return ParametrizedPulseAmplitude(control, parametrization)
         else
             try
-                S_t = shape(0.0)
+                ϵ_t = control(0.0)
             catch
                 error(
                     "A ParametrizedAmplitude control must either be a vector of values or a callable"
                 )
             end
-            return ParametrizedContinousAmplitude(control, parametrization)
+            return ParametrizedContinuousAmplitude(control, parametrization)
         end
     else
         if (control isa Vector{Float64}) && (shape isa Vector{Float64})
@@ -319,15 +319,15 @@ struct ShapedParametrizedContinuousAmplitude <: ShapedParametrizedAmplitude
 end
 
 
-function evaluate(ampl::ParametrizedAmplitude, tlist, n; vals_dict)
-    ϵ = evaluate(ampl.control, tlist, n; vals_dict)
+function evaluate(ampl::ParametrizedAmplitude, args...; kwargs...)
+    ϵ = evaluate(ampl.control, args...; kwargs...)
     return ampl.parametrization.a_of_epsilon(ϵ)
 end
 
 
-function evaluate(ampl::ShapedParametrizedAmplitude, args...; vals_dict=IdDict())
-    ϵ = evaluate(ampl.control, args...; vals_dict)
-    S = evaluate(ampl.shape, args...; vals_dict)
+function evaluate(ampl::ShapedParametrizedAmplitude, args...; kwargs...)
+    ϵ = evaluate(ampl.control, args...; kwargs...)
+    S = evaluate(ampl.shape, args...; kwargs...)
     return S * ampl.parametrization.a_of_epsilon(ϵ)
 end
 
@@ -337,6 +337,11 @@ function Base.Array(ampl::ShapedParametrizedPulseAmplitude)
 end
 
 
+function get_controls(ampl::ParametrizedAmplitude)
+    return (ampl.control,)
+end
+
+
 function get_control_deriv(ampl::ParametrizedAmplitude, control)
     if control ≡ ampl.control
         return ParametrizationDerivative(control, ampl.parametrization.da_deps_derivative)

test/runtests.jl

@@ -35,6 +35,11 @@ end
         include("test_optimize_or_load.jl")
     end
 
+    print("\n* Pulse Parametrizations (test_pulse_parametrizations.jl):")
+    @time @safetestset "Pulse Parametrizations" begin
+        include("test_pulse_parametrizations.jl")
+    end
+
     print("\n")
 
 end;

test/test_pulse_parametrizations.jl

@@ -0,0 +1,29 @@
+using Test
+using LinearAlgebra
+using QuantumControl: hamiltonian
+using QuantumControlTestUtils.RandomObjects: random_matrix
+using QuantumControl.PulseParametrizations: SquareParametrization, ParametrizedAmplitude
+using QuantumControl.Controls: get_controls, evaluate
+
+
+@testset "Instantiate ParametrizedAmplitude" begin
+
+    # See https://github.com/orgs/JuliaQuantumControl/discussions/42
+    # https://github.com/JuliaQuantumControl/QuantumControl.jl/issues/43
+
+    N = 10
+
+    H0 = random_matrix(N; hermitian=true)
+    H1 = random_matrix(N; hermitian=true)
+    H2 = random_matrix(N; hermitian=true)
+
+    ϵ(t) = 0.5
+    a = ParametrizedAmplitude(ϵ; parametrization=SquareParametrization())
+    @test get_controls(a) == (ϵ,)
+
+    H = hamiltonian(H0, (H1, ϵ), (H2, a); check=false)
+    @test get_controls(H) == (ϵ,)
+
+    @test norm(Array(evaluate(H, 0.0)) - (H0 + 0.5 * H1 + 0.5^2 * H2)) < 1e-12
+
+end