refactor simplify upvalues

sw1sh · Feb 5, 2024 · 66668f6 · 66668f6
1 parent 0f5aa9d
commit 66668f6
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 45 deletions.
diff --git a/QuantumFramework/Kernel/MIC.m b/QuantumFramework/Kernel/MIC.m
@@ -45,7 +45,7 @@
 ]
 
 
-Options[QuantumWignerMICBasis] = Options[QuantumWignerMICPOVM]
+Options[QuantumWignerMICBasis] := Options[QuantumWignerMICPOVM]
 
 QuantumWignerMICBasis[d : _Integer ? Positive : 2, opts : OptionsPattern[]] := Block[{povm = QuantumWignerMICPOVM[d, opts], G, dual},
     G = Simplify @ Outer[Tr @* Dot, povm, povm, 1];

diff --git a/QuantumFramework/Kernel/QuantumBasis/QuantumBasis.m b/QuantumFramework/Kernel/QuantumBasis/QuantumBasis.m
@@ -205,8 +205,7 @@
 
 (* simplify *)
 
-Simplify[qb_QuantumBasis] ^:= qb["Simplify"]
-
-FullSimplify[qb_QuantumBasis] ^:= qb["FullSimplify"]
-
-Chop[qb_QuantumBasis] ^:= qb["Chop"]
+Scan[
+    (Symbol[#][qb_QuantumBasis, args___] ^:= qs[#, args]) &,
+    {"Simplify", "FullSimplify", "Chop", "ComplexExpand"}
+]
diff --git a/QuantumFramework/Kernel/QuantumChannel/QuantumChannel.m b/QuantumFramework/Kernel/QuantumChannel/QuantumChannel.m
@@ -62,11 +62,10 @@
 
 (* simplify *)
 
-Simplify[qc_QuantumChannel, args___] ^:= qc["Simplify", args]
-
-FullSimplify[qc_QuantumChannel, args___] ^:= qc["FullSimplify", args]
-
-Chop[qc_QuantumChannel, args___] ^:= qc["Chop", args]
+Scan[
+    (Symbol[#][qc_QuantumChannel, args___] ^:= qc[#, args]) &,
+    {"Simplify", "FullSimplify", "Chop", "ComplexExpand"}
+]
 
 
 (* parameterization *)

diff --git a/QuantumFramework/Kernel/QuantumCircuitOperator/Properties.m b/QuantumFramework/Kernel/QuantumCircuitOperator/Properties.m
@@ -296,7 +296,7 @@
 QuantumCircuitOperatorProp[qco_, prop : "Conjugate" | "Dual" | "Double"] :=
     QuantumCircuitOperator[If[BarrierQ[#], #, #[prop]] & /@ qco["Elements"], Switch[prop, "Double", Style[#, Bold] &, _, SuperStar][qco["Label"]]]
 
-QuantumCircuitOperatorProp[qco_, prop : "Simplify" | "FullSimplify" | "Computational", args___] :=
+QuantumCircuitOperatorProp[qco_, prop : "Computational" | "Simplify" | "FullSimplify" | "Chop" | "ComplexExpand", args___] :=
     QuantumCircuitOperator[If[BarrierQ[#], #, #[prop, args]] & /@ qco["Elements"], qco["Label"]]
 
 

diff --git a/QuantumFramework/Kernel/QuantumCircuitOperator/QuantumCircuitOperator.m b/QuantumFramework/Kernel/QuantumCircuitOperator/QuantumCircuitOperator.m
@@ -182,11 +182,10 @@
 
 (* simplify *)
 
-Simplify[qco_QuantumCircuitOperator, args___] ^:= qco["Simplify", args]
-
-FullSimplify[qco_QuantumCircuitOperator, args___] ^:= qco["FullSimplify", args]
-
-Chop[qco_QuantumCircuitOperator, args___] ^:= qco["Chop", args]
+Scan[
+    (Symbol[#][qco_QuantumCircuitOperator, args___] ^:= qco[#, args]) &,
+    {"Simplify", "FullSimplify", "Chop", "ComplexExpand"}
+]
 
 
 (* parameterization *)

diff --git a/QuantumFramework/Kernel/QuantumMeasurement.m b/QuantumFramework/Kernel/QuantumMeasurement.m
@@ -233,7 +233,7 @@
 
 QuantumMeasurementProp[qm_, "MeanState"] := Total @ KeyValueMap[Times, qm["StateAssociation"]]
 
-QuantumMeasurementProp[qm_, prop : "Simplify" | "FullSimplify" | "Chop", args___] := QuantumMeasurement[qm["QuantumOperator"][prop, args]]
+QuantumMeasurementProp[qm_, prop : "Simplify" | "FullSimplify" | "Chop" | "ComplexExpand", args___] := QuantumMeasurement[qm["QuantumOperator"][prop, args]]
 
 
 (* qmo properties *)
@@ -250,11 +250,10 @@
 
 (* simplify *)
 
-Simplify[qm_QuantumMeasurement, args___] ^:= qm["Simplify", args]
-
-FullSimplify[qm_QuantumMeasurement, args___] ^:= qm["FullSimplify", args]
-
-Chop[qm_QuantumMeasurement, args___] ^:= qm["Chop", args]
+Scan[
+    (Symbol[#][qm_QuantumMeasurement, args___] ^:= qs[#, args]) &,
+    {"Simplify", "FullSimplify", "Chop", "ComplexExpand"}
+]
 
 
 (* parameterization *)

diff --git a/QuantumFramework/Kernel/QuantumMeasurementOperator/Properties.m b/QuantumFramework/Kernel/QuantumMeasurementOperator/Properties.m
@@ -296,7 +296,7 @@
 
 (* operator properties *)
 
-QuantumMeasurementOperatorProp[qmo_, prop : "Ordered" | "Sort" | "SortOutput" | "SortInput" | "Computational" | "Simplify" | "FullSimplify" | "Chop", args___] :=
+QuantumMeasurementOperatorProp[qmo_, prop : "Ordered" | "Sort" | "SortOutput" | "SortInput" | "Computational" | "Simplify" | "FullSimplify" | "Chop" | "ComplexExpand", args___] :=
     QuantumMeasurementOperator[qmo["QuantumOperator"][prop, args], qmo["Target"]]
 
 QuantumMeasurementOperatorProp[qmo_, prop : "Dagger", args___] :=

diff --git a/QuantumFramework/Kernel/QuantumMeasurementOperator/QuantumMeasurementOperator.m b/QuantumFramework/Kernel/QuantumMeasurementOperator/QuantumMeasurementOperator.m
@@ -273,11 +273,10 @@
 
 (* simplify *)
 
-Simplify[qmo_QuantumMeasurementOperator, args___] ^:= qmo["Simplify", args]
-
-FullSimplify[qmo_QuantumMeasurementOperator, args___] ^:= qmo["FullSimplify", args]
-
-Chop[qmo_QuantumMeasurementOperator, args___] ^:= qmo["Chop", args]
+Scan[
+    (Symbol[#][qmo_QuantumMeasurementOperator, args___] ^:= qmo[#, args]) &,
+    {"Simplify", "FullSimplify", "Chop", "ComplexExpand"}
+]
 
 
 (* parameterization *)

diff --git a/QuantumFramework/Kernel/QuantumOperator/Properties.m b/QuantumFramework/Kernel/QuantumOperator/Properties.m
@@ -30,7 +30,7 @@
     "PauliDecompose",
     "CircuitDiagram",
     "OrderedFormula",
-    "Simplify", "FullSimplify", "Chop"
+    "Simplify", "FullSimplify", "Chop", "ComplexExpand"
 };
 
 QuantumOperator["Properties"] := Union @ Join[$QuantumOperatorProperties, Complement[QuantumState["Properties"], {
@@ -550,7 +550,7 @@
     ]
 ]
 
-QuantumOperatorProp[qo_, prop : "Simplify" | "FullSimplify" | "Chop", args___] := QuantumOperator[qo["State"][prop, args], qo["Order"]]
+QuantumOperatorProp[qo_, prop : "Simplify" | "FullSimplify" | "Chop" | "ComplexExpand", args___] := QuantumOperator[qo["State"][prop, args], qo["Order"]]
 
 
 (* evolution *)

diff --git a/QuantumFramework/Kernel/QuantumOperator/QuantumOperator.m b/QuantumFramework/Kernel/QuantumOperator/QuantumOperator.m
@@ -517,11 +517,10 @@
 
 (* simplify *)
 
-Simplify[qo_QuantumOperator, args___] ^:= qo["Simplify", args]
-
-FullSimplify[qo_QuantumOperator, args___] ^:= qo["FullSimplify", args]
-
-Chop[qo_QuantumOperator, args___] ^:= qo["Chop", args]
+Scan[
+    (Symbol[#][qo_QuantumOperator, args___] ^:= qo[#, args]) &,
+    {"Simplify", "FullSimplify", "Chop", "ComplexExpand"}
+]
 
 
 (* join *)

diff --git a/QuantumFramework/Kernel/QuantumState/Properties.m b/QuantumFramework/Kernel/QuantumState/Properties.m
@@ -312,7 +312,11 @@
     ]
 ]
 
-QuantumStateProp[qs_, prop : "Simplify" | "FullSimplify" | "Chop", args___] := QuantumState[Map[Symbol[prop][#, args] &, qs["State"], {If[qs["VectorQ"], 1, 2]}], qs["Basis"]]
+QuantumStateProp[qs_, prop : "Simplify" | "FullSimplify" | "Chop" | "ComplexExpand", args___] :=
+    QuantumState[Map[Symbol[prop][#, args] &, qs["State"], {If[qs["VectorQ"], 1, 2]}], qs["Basis"][prop]]
+
+(* these work on SparseArrays directly *)
+QuantumStateProp[qs_, prop : "Chop" | "ComplexExpand", args___] := QuantumState[Symbol[prop][qs["State"], args], qs["Basis"][prop]]
 
 
 (* normalization *)

diff --git a/QuantumFramework/Kernel/QuantumState/QuantumState.m b/QuantumFramework/Kernel/QuantumState/QuantumState.m
@@ -242,11 +242,10 @@
 
 (* simplify *)
 
-Simplify[qs_QuantumState, args___] ^:= qs["Simplify", args]
-
-FullSimplify[qs_QuantumState, args___] ^:= qs["FullSimplify", args]
-
-Chop[qs_QuantumState, args___] ^:= qs["Chop", args]
+Scan[
+    (Symbol[#][qs_QuantumState, args___] ^:= qs[#, args]) &,
+    {"Simplify", "FullSimplify", "Chop", "ComplexExpand"}
+]
 
 
 (* join *)

diff --git a/QuantumFramework/Kernel/QuditBasis/Properties.m b/QuantumFramework/Kernel/QuditBasis/Properties.m
@@ -328,4 +328,6 @@
 QuditBasisProp[qb_, prop : "DimensionSplit" | "DimensionSplitDual", splits : {_Integer ? Positive ..}] := qb[prop, Thread[{Range[Length[splits]], splits}]]
 
 
-QuditBasisProp[qb_, prop : "Simplify" | "FullSimplify" | "Chop", args___] := QuditBasis @ Map[Symbol[prop][#, args] &, qb["Representations"]]
+QuditBasisProp[qb_, prop : "Simplify" | "FullSimplify", args___] := QuditBasis @ Map[Map[Symbol[prop][#, args] &, #, {-1}] &, qb["Representations"]]
+
+QuditBasisProp[qb_, prop : "Chop" | "ComplexExpand", args___] := QuditBasis @ Map[Symbol[prop][#, args] &, qb["Representations"]]
diff --git a/QuantumFramework/ResourceDefinition.nb b/QuantumFramework/ResourceDefinition.nb