Refactor indexing

Project.toml

@@ -14,6 +14,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 TermInterface = "8ea1fca8-c5ef-4a55-8b96-4e9afe9c9a3c"
+UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 Combinatorics = "1"
@@ -27,6 +28,7 @@ SciMLBase = "1, 2"
 SymbolicUtils = "3.6.0"
 Symbolics = "6"
 TermInterface = "2"
+UUIDs = "1"
 julia = "1.6"
 
 [extras]

src/QuantumCumulants.jl

@@ -2,6 +2,7 @@ module QuantumCumulants
 
 import SymbolicUtils
 import SymbolicUtils: substitute, BasicSymbolic
+using SymbolicUtils: @rule
 
 import Symbolics
 import TermInterface
@@ -15,6 +16,8 @@ const MTK = ModelingToolkit
 using Combinatorics: partitions, combinations, levicivita
 using LinearAlgebra
 
+using UUIDs
+
 using QuantumOpticsBase
 import QuantumOpticsBase: ⊗, tensor
 
@@ -33,13 +36,14 @@ export HilbertSpace, ProductSpace, ⊗, tensor,
         ClusterSpace,
         scale,
         transition_superscript,
-        Index, reorder, IndexedOperator, SingleSum, IndexedVariable, DoubleIndexedVariable,
-        DoubleSum, indexed_complete, IndexedCorrelationFunction, scale_term,
-        scaleME, evalME, indexed_complete!, indexed_meanfield, subst_reds, AvgSums, plotME,
-        IndexedAverageSum, IndexedAverageDoubleSum, SpecialIndexedTerm, find_missing_sums, Σ, ∑,
-        evaluate, value_map, NumberedOperator, change_index, order_by_index, split_sums, insert_index, eval_term,
-        MeanfieldNoiseEquations, 
-        IndexedMeanfieldNoiseEquations#, indexed_arithmetic, indexed_noise, simplified_indexed_complete!
+        Index, reorder, IndexedOperator, IndexedVariable, DoubleIndexedVariable, IndexedParameter,
+        Sum, Σ, ∑, change_index, has_index, evaluate,
+        # DoubleSum, indexed_complete, IndexedCorrelationFunction, scale_term,
+        # scaleME, evalME, indexed_complete!, indexed_meanfield, subst_reds, AvgSums, plotME,
+        # IndexedAverageSum, IndexedAverageDoubleSum, SpecialIndexedTerm, find_missing_sums, Σ, ∑,
+        # evaluate, value_map, NumberedOperator, change_index, order_by_index, split_sums, insert_index, eval_term,
+        MeanfieldNoiseEquations
+        # IndexedMeanfieldNoiseEquations#, indexed_arithmetic, indexed_noise, simplified_indexed_complete!
 
 
 const NO_METADATA = SymbolicUtils.NO_METADATA
@@ -64,14 +68,16 @@ include("scale.jl")
 include("measurement_backaction.jl")
 include("measurement_backaction_indices.jl")
 include("latexify_recipes.jl")
-include("printing.jl")
 include("indexing.jl")
-include("index_double_sums.jl")
-include("index_average.jl")
-include("index_meanfield.jl")
-include("index_scale.jl")
-include("index_correlation.jl")
-include("index_utils.jl")
+include("indexing_sums.jl")
+include("indexing_utils.jl")
+include("printing.jl")
+# include("index_double_sums.jl")
+# include("index_average.jl")
+# include("index_meanfield.jl")
+# include("index_scale.jl")
+# include("index_correlation.jl")
+# include("index_utils.jl")
 
 
 @deprecate heisenberg(args...; kwargs...) meanfield(args...; kwargs...)

src/average.jl

@@ -147,8 +147,6 @@ function cumulant_expansion(x::SymbolicUtils.Symbolic,order::Integer;simplify=tr
             cumulants = [cumulant_expansion(arg,order;kwargs...) for arg in args]
             return f(cumulants...)
         end
-    elseif x isa AvgSums
-        return _cumulant_expansion(x,order;simplify,kwargs...) # basically just another cumulant_expansion dispatch
     else
         return x
     end