Merge branch 'main' of https://github.com/kmsherbertvt/ADAPT.jl

.gitignore

@@ -2,4 +2,4 @@
 *.jl.cov
 *.jl.mem
 /docs/Manifest.toml
-/docs/build/
+/docs/build/

docs/src/index.md

@@ -22,6 +22,7 @@ Modules = [
     ADAPT.Basics,
     ADAPT.Basics.Callbacks,
     ADAPT.Basics.Operators,
+    ADAPT.Basics.Pools,
 ]
 ```
 
@@ -30,6 +31,8 @@ Modules = [
 Modules = [
     ADAPT.OptimizationFreeADAPT,
     ADAPT.OverlapADAPT,
+    ADAPT.Degenerate_ADAPT,
+    ADAPT.Hamiltonians,
 ]
 ```
 

src/ADAPT.jl

@@ -76,13 +76,18 @@ module ADAPT
         # A suite of common operators, especially useful for constructing operator pools.
         include("base/Operators.jl")
         export Operators
+
+        # A suite of common operator pools.
+        include("base/pools.jl")
+        export Pools
     end
     using .Basics
     export Ansatz
     export VANILLA
     export OptimOptimizer
     export Callbacks
     export Operators
+    export Pools
 
     module OptimizationFreeADAPT
         include("optimizationfree/OptimizationFree.jl")
@@ -94,12 +99,21 @@ module ADAPT
         include("overlap/OverlapADAPT.jl")
         export Infidelity
     end
+
+    module Degenerate_ADAPT
+        include("degenerateADAPT/DegenerateADAPT.jl")
+        export DEG_ADAPT
+    end
+
+    module Hamiltonians
+        # A suite of common lattice Hamiltonians.
+        include("hamiltonians/latticemodels.jl")
+    end
 end
 
 #=
 
 TODO:
-- Some pools. Grab from Diksha's code.
 - Lie rank calculation, in pauli-dedicated code.
 
 =#

src/base/__paulioperators.jl

@@ -264,11 +264,29 @@ function measure_commutator(
     return expectation_value(commutator, Ψ)
 end
 
+function Base.:≈(spv1::Vector{ScaledPauli{N}}, spv2::Vector{ScaledPauli{N}}) where {N}
+    if length(spv1) != length(spv2) return false end
+    for (sp1,sp2) in zip(spv1, spv2)
+        if !(sp1≈sp2)
+            return false
+        end
+    end
+    return true
+end
+
+function otimes(sp::ScaledPauli{N}, p::Pauli{M}) where {N,M}
+    out_pauli = sp.pauli ⊗ p.pauli
+    out_coeff = sp.coeff * get_phase(p)
+    out = ScaledPauli{N+M}(out_coeff, out_pauli)
+    return out 
+end
 
-
-
-
-
+function otimes(p::Pauli{M}, sp::ScaledPauli{N}) where {M,N}
+    out_pauli = p.pauli ⊗ sp.pauli
+    out_coeff = sp.coeff * get_phase(p)
+    out = ScaledPauli{N+M}(out_coeff, out_pauli)
+    return out 
+end
 
 #= TODO: Calculate DLA