rebase to ScaledOperator in time-independent mcsolve

Author: ytdHuang

src/time_evolution/mcsolve.jl

@@ -119,16 +119,15 @@ function _mcsolve_generate_statistics(sol, i, states, expvals_all, jump_times, j
     return jump_which[i] = sol_i.prob.p.jump_which
 end
 
-function _mcsolve_make_H_eff(H::QuantumObject, c_ops)
-    # this will be convert to QobjEvo in sesolveProblem (avoid extra ScalarOperator)
-    c_ops isa Nothing && return H
-    return H - 1im * mapreduce(op -> op' * op, +, c_ops) / 2
+function _mcsolve_make_Heff_QobjEvo(H::QuantumObject, c_ops)
+    c_ops isa Nothing && return QobjEvo(H)
+    return QobjEvo(H - 1im * mapreduce(op -> op' * op, +, c_ops) / 2)
 end
-function _mcsolve_make_H_eff(H::Tuple, c_ops)
+function _mcsolve_make_Heff_QobjEvo(H::Tuple, c_ops)
     c_ops isa Nothing && return QobjEvo(H)
     return QobjEvo((H..., -1im * mapreduce(op -> op' * op, +, c_ops) / 2))
 end
-function _mcsolve_make_H_eff(H::QuantumObjectEvolution, c_ops)
+function _mcsolve_make_Heff_QobjEvo(H::QuantumObjectEvolution, c_ops)
     c_ops isa Nothing && return H
     return H + QobjEvo(mapreduce(op -> op' * op, +, c_ops), -1im / 2)
 end
@@ -222,7 +221,7 @@ function mcsolveProblem(
 
     tlist = convert(Vector{_FType(ψ0)}, tlist) # Convert it to support GPUs and avoid type instabilities for OrdinaryDiffEq.jl
 
-    H_eff = _mcsolve_make_H_eff(H, c_ops)
+    H_eff_evo = _mcsolve_make_Heff_QobjEvo(H, c_ops)
 
     if e_ops isa Nothing
         expvals = Array{ComplexF64}(undef, 0, length(tlist))
@@ -268,11 +267,11 @@ function mcsolveProblem(
         params...,
     )
 
-    return mcsolveProblem(H_eff, ψ0, tlist, params2, jump_callback; kwargs2...)
+    return mcsolveProblem(H_eff_evo, ψ0, tlist, params2, jump_callback; kwargs2...)
 end
 
 function mcsolveProblem(
-    H_eff::AbstractQuantumObject{DT1,OperatorQuantumObject},
+    H_eff_evo::QuantumObjectEvolution{DT1,OperatorQuantumObject},
     ψ0::QuantumObject{DT2,KetQuantumObject},
     tlist::AbstractVector,
     params::NamedTuple,
@@ -286,11 +285,11 @@ function mcsolveProblem(
         haskey(kwargs2, :callback) ? merge(kwargs2, (callback = CallbackSet(cb1, cb2, kwargs2.callback),)) :
         merge(kwargs2, (callback = CallbackSet(cb1, cb2),))
 
-    return sesolveProblem(H_eff, ψ0, tlist; params = params, kwargs2...)
+    return sesolveProblem(H_eff_evo, ψ0, tlist; params = params, kwargs2...)
 end
 
 function mcsolveProblem(
-    H_eff::AbstractQuantumObject{DT1,OperatorQuantumObject},
+    H_eff_evo::QuantumObjectEvolution{DT1,OperatorQuantumObject},
     ψ0::QuantumObject{DT2,KetQuantumObject},
     tlist::AbstractVector,
     params::NamedTuple,
@@ -310,7 +309,7 @@ function mcsolveProblem(
         haskey(kwargs2, :callback) ? merge(kwargs2, (callback = CallbackSet(cb1, cb2, kwargs2.callback),)) :
         merge(kwargs2, (callback = CallbackSet(cb1, cb2),))
 
-    return sesolveProblem(H_eff, ψ0, tlist; params = params, kwargs2...)
+    return sesolveProblem(H_eff_evo, ψ0, tlist; params = params, kwargs2...)
 end
 
 @doc raw"""

test/core-test/time_evolution.jl

@@ -98,7 +98,7 @@
         sol_mc_string = sprint((t, s) -> show(t, "text/plain", s), sol_mc)
         sol_sse_string = sprint((t, s) -> show(t, "text/plain", s), sol_sse)
         @test prob_me.f.f isa MatrixOperator
-        @test prob_mc.f.f isa MatrixOperator
+        @test prob_mc.f.f isa ScaledOperator # TODO: can be optimized as MatrixOperator
         @test sum(abs.(sol_mc.expect .- sol_me.expect)) / length(t_l) < 0.1
         @test sum(abs.(sol_mc2.expect .- sol_me.expect)) / length(t_l) < 0.1
         @test sum(abs.(vec(expect_mc_states_mean) .- vec(sol_me.expect))) / length(t_l) < 0.1