remove keyword argument f in QobjEvo

Author: ytdHuang

src/qobj/quantum_object_evo.jl

@@ -157,10 +157,9 @@ end
 function QuantumObjectEvolution(
     op_func_list::Tuple,
     α::Union{Nothing,Number} = nothing;
-    type::Union{Nothing,QuantumObjectType} = nothing,
-    f::Function = identity,
+    type::Union{Nothing,QuantumObjectType} = nothing
 )
-    op, data = _QobjEvo_generate_data(op_func_list, α; f = f)
+    op, data = _QobjEvo_generate_data(op_func_list, α)
     dims = op.dims
     if type isa Nothing
         type = op.type
@@ -176,22 +175,19 @@ end
 function QuantumObjectEvolution(
     op::QuantumObject,
     α::Union{Nothing,Number} = nothing;
-    type::Union{Nothing,QuantumObjectType} = nothing,
-    f::Function = identity,
+    type::Union{Nothing,QuantumObjectType} = nothing
 )
     if type isa Nothing
         type = op.type
     end
-    return QuantumObjectEvolution(_make_SciMLOperator(op, α, f = f), type, op.dims)
+    return QuantumObjectEvolution(_make_SciMLOperator(op, α), type, op.dims)
 end
 
 function QuantumObjectEvolution(
     op::QuantumObjectEvolution,
     α::Union{Nothing,Number} = nothing;
-    type::Union{Nothing,QuantumObjectType} = nothing,
-    f::Function = identity,
+    type::Union{Nothing,QuantumObjectType} = nothing
 )
-    f !== identity && throw(ArgumentError("The function `f` is not supported for QuantumObjectEvolution inputs."))
     if type isa Nothing
         type = op.type
     elseif type != op.type
@@ -217,7 +213,7 @@ Parse the `op_func_list` and generate the data for the `QuantumObjectEvolution`
 - `α`: A scalar to pre-multiply the operators.
 - `f::Function=identity`: A function to pre-apply to the operators.
 =#
-@generated function _QobjEvo_generate_data(op_func_list::Tuple, α; f::Function = identity)
+@generated function _QobjEvo_generate_data(op_func_list::Tuple, α)
     op_func_list_types = op_func_list.parameters
     N = length(op_func_list_types)
 
@@ -242,9 +238,9 @@ Parse the `op_func_list` and generate the data for the `QuantumObjectEvolution`
             data_type = op_type.parameters[1]
             dims_expr = (dims_expr..., :($op.dims))
             if i == 1
-                first_op = :(f($op))
+                first_op = :($op)
             end
-            data_expr = :($data_expr + _make_SciMLOperator(op_func_list[$i], α, f = f))
+            data_expr = :($data_expr + _make_SciMLOperator(op_func_list[$i], α))
         else
             op_type = op_func_type
             (isoper(op_type) || issuper(op_type)) ||
@@ -255,7 +251,7 @@ Parse the `op_func_list` and generate the data for the `QuantumObjectEvolution`
             if i == 1
                 first_op = :(op_func_list[$i])
             end
-            qobj_expr_const = :($qobj_expr_const + f(op_func_list[$i]))
+            qobj_expr_const = :($qobj_expr_const + op_func_list[$i])
         end
     end
 
@@ -272,20 +268,20 @@ Parse the `op_func_list` and generate the data for the `QuantumObjectEvolution`
     end
 end
 
-function _make_SciMLOperator(op_func::Tuple, α; f::Function = identity)
+function _make_SciMLOperator(op_func::Tuple, α)
     T = eltype(op_func[1])
     update_func = (a, u, p, t) -> op_func[2](p, t)
     if α isa Nothing
-        return ScalarOperator(zero(T), update_func) * MatrixOperator(f(op_func[1]).data)
+        return ScalarOperator(zero(T), update_func) * MatrixOperator(op_func[1].data)
     end
-    return ScalarOperator(zero(T), update_func) * MatrixOperator(α * f(op_func[1]).data)
+    return ScalarOperator(zero(T), update_func) * MatrixOperator(α * op_func[1].data)
 end
 
-function _make_SciMLOperator(op::QuantumObject, α; f::Function = identity)
+function _make_SciMLOperator(op::QuantumObject, α)
     if α isa Nothing
-        return MatrixOperator(f(op).data)
+        return MatrixOperator(op.data)
     end
-    return MatrixOperator(α * f(op.data))
+    return MatrixOperator(α * op.data)
 end
 
 @doc raw"""

src/qobj/synonyms.jl

@@ -18,7 +18,7 @@ Note that this functions is same as `QuantumObject(A; type=type, dims=dims)`.
 Qobj(A; kwargs...) = QuantumObject(A; kwargs...)
 
 @doc raw"""
-    QobjEvo(op_func_list::Union{Tuple,AbstractQuantumObject}, α::Union{Nothing,Number}=nothing; type::Union{Nothing, QuantumObjectType}=nothing, f::Function=identity)
+    QobjEvo(op_func_list::Union{Tuple,AbstractQuantumObject}, α::Union{Nothing,Number}=nothing; type::Union{Nothing, QuantumObjectType}=nothing)
 
 Generate [`QuantumObjectEvolution`](@ref).
 
@@ -27,7 +27,6 @@ Note that this functions is same as `QuantumObjectEvolution(op_func_list)`. If `
 # Arguments
 - `op_func_list::Union{Tuple,AbstractQuantumObject}`: A tuple of tuples or operators.
 - `α::Union{Nothing,Number}=nothing`: A scalar to pre-multiply the operators.
-- `f::Function=identity`: A function to pre-apply to the operators.
 
 !!! warning "Beware of type-stability!"
     Please note that, unlike QuTiP, this function doesn't support `op_func_list` as `Vector` type. This is related to the type-stability issue. See the Section [The Importance of Type-Stability](@ref doc:Type-Stability) for more details.
@@ -104,9 +103,8 @@ Quantum Object:   type=Operator   dims=[10, 2]   size=(20, 20)   ishermitian=fal
 QobjEvo(
     op_func_list::Union{Tuple,AbstractQuantumObject},
     α::Union{Nothing,Number} = nothing;
-    type::Union{Nothing,QuantumObjectType} = nothing,
-    f::Function = identity,
-) = QuantumObjectEvolution(op_func_list, α; type = type, f = f)
+    type::Union{Nothing,QuantumObjectType} = nothing
+) = QuantumObjectEvolution(op_func_list, α; type = type)
 
 QobjEvo(data::AbstractSciMLOperator, type::QuantumObjectType, dims::Integer) =
     QuantumObjectEvolution(data, type, SVector{1,Int}(dims))