Change expect property names

Author: albertomercurio

src/time_evolution/mcsolve.jl

@@ -413,6 +413,7 @@ function mcsolve(
         ens_prob_mc.times,
         states,
         expvals,
+        expvals, # This is average_expect
         expvals_all,
         col_times,
         col_which,

src/time_evolution/smesolve.jl

@@ -373,6 +373,7 @@ function smesolve(
         ens_prob.times,
         states,
         expvals,
+        expvals, # This is average_expect
         expvals_all,
         sol.converged,
         _sol_1.alg,

src/time_evolution/ssesolve.jl

@@ -374,6 +374,7 @@ function ssesolve(
         ens_prob.times,
         states,
         expvals,
+        expvals, # This is average_expect
         expvals_all,
         sol.converged,
         _sol_1.alg,

src/time_evolution/time_evolution.jl

@@ -99,7 +99,8 @@ A structure storing the results and some information from solving quantum trajec
 - `times::AbstractVector`: The time list of the evolution.
 - `states::Vector{Vector{QuantumObject}}`: The list of result states in each trajectory.
 - `expect::Union{AbstractMatrix,Nothing}`: The expectation values (averaging all trajectories) corresponding to each time point in `times`.
-- `expect_all::Union{AbstractMatrix,Nothing}`: The expectation values corresponding to each trajectory and each time point in `times`
+- `average_expect::Union{AbstractMatrix,Nothing}`: The expectation values (averaging all trajectories) corresponding to each time point in `times`.
+- `runs_expect::Union{AbstractArray,Nothing}`: The expectation values corresponding to each trajectory and each time point in `times`
 - `col_times::Vector{Vector{Real}}`: The time records of every quantum jump occurred in each trajectory.
 - `col_which::Vector{Vector{Int}}`: The indices of which collapse operator was responsible for each quantum jump in `col_times`.
 - `converged::Bool`: Whether the solution is converged or not.
@@ -122,7 +123,8 @@ struct TimeEvolutionMCSol{
     times::TT
     states::TS
     expect::TE
-    expect_all::TEA
+    average_expect::TE # Currently just a synonym for `expect`
+    runs_expect::TEA
     col_times::TJT
     col_which::TJW
     converged::Bool
@@ -140,7 +142,7 @@ function Base.show(io::IO, sol::TimeEvolutionMCSol)
     if sol.expect isa Nothing
         print(io, "num_expect = 0\n")
     else
-        print(io, "num_expect = $(size(sol.expect, 1))\n")
+        print(io, "num_expect = $(size(sol.average_expect, 1))\n")
     end
     print(io, "ODE alg.: $(sol.alg)\n")
     print(io, "abstol = $(sol.abstol)\n")
@@ -159,7 +161,8 @@ A structure storing the results and some information from solving trajectories o
 - `times::AbstractVector`: The time list of the evolution.
 - `states::Vector{Vector{QuantumObject}}`: The list of result states in each trajectory.
 - `expect::Union{AbstractMatrix,Nothing}`: The expectation values (averaging all trajectories) corresponding to each time point in `times`.
-- `expect_all::Union{AbstractArray,Nothing}`: The expectation values corresponding to each trajectory and each time point in `times`
+- `average_expect::Union{AbstractMatrix,Nothing}`: The expectation values (averaging all trajectories) corresponding to each time point in `times`.
+- `runs_expect::Union{AbstractArray,Nothing}`: The expectation values corresponding to each trajectory and each time point in `times`
 - `converged::Bool`: Whether the solution is converged or not.
 - `alg`: The algorithm which is used during the solving process.
 - `abstol::Real`: The absolute tolerance which is used during the solving process.
@@ -178,7 +181,8 @@ struct TimeEvolutionStochasticSol{
     times::TT
     states::TS
     expect::TE
-    expect_all::TEA
+    average_expect::TE # Currently just a synonym for `expect`
+    runs_expect::TEA
     converged::Bool
     alg::AlgT
     abstol::AT
@@ -194,7 +198,7 @@ function Base.show(io::IO, sol::TimeEvolutionStochasticSol)
     if sol.expect isa Nothing
         print(io, "num_expect = 0\n")
     else
-        print(io, "num_expect = $(size(sol.expect, 1))\n")
+        print(io, "num_expect = $(size(sol.average_expect, 1))\n")
     end
     print(io, "SDE alg.: $(sol.alg)\n")
     print(io, "abstol = $(sol.abstol)\n")

test/core-test/time_evolution.jl

@@ -660,21 +660,21 @@
             )
 
             @test sol_mc1.expect ≈ sol_mc2.expect atol = 1e-10
-            @test sol_mc1.expect_all ≈ sol_mc2.expect_all atol = 1e-10
+            @test sol_mc1.runs_expect ≈ sol_mc2.runs_expect atol = 1e-10
             @test sol_mc1.col_times ≈ sol_mc2.col_times atol = 1e-10
             @test sol_mc1.col_which ≈ sol_mc2.col_which atol = 1e-10
 
-            @test sol_mc1.expect_all ≈ sol_mc3.expect_all[:, 1:500, :] atol = 1e-10
+            @test sol_mc1.runs_expect ≈ sol_mc3.runs_expect[:, 1:500, :] atol = 1e-10
 
             @test sol_sse1.expect ≈ sol_sse2.expect atol = 1e-10
-            @test sol_sse1.expect_all ≈ sol_sse2.expect_all atol = 1e-10
+            @test sol_sse1.runs_expect ≈ sol_sse2.runs_expect atol = 1e-10
 
-            @test sol_sse1.expect_all ≈ sol_sse3.expect_all[:, 1:50, :] atol = 1e-10
+            @test sol_sse1.runs_expect ≈ sol_sse3.runs_expect[:, 1:50, :] atol = 1e-10
 
             @test sol_sme1.expect ≈ sol_sme2.expect atol = 1e-10
-            @test sol_sme1.expect_all ≈ sol_sme2.expect_all atol = 1e-10
+            @test sol_sme1.runs_expect ≈ sol_sme2.runs_expect atol = 1e-10
 
-            @test sol_sme1.expect_all ≈ sol_sme3.expect_all[:, 1:50, :] atol = 1e-10
+            @test sol_sme1.runs_expect ≈ sol_sme3.runs_expect[:, 1:50, :] atol = 1e-10
         end
     end