Fix embed method for operators acting on different bases (#27)

* Fix embed method for operators acting on different bases

* Update Project.toml

Author: david-pl

Project.toml

@@ -1,6 +1,6 @@
 name = "QuantumOpticsBase"
 uuid = "4f57444f-1401-5e15-980d-4471b28d5678"
-version = "v0.2.10"
+version = "v0.2.11"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/operators.jl

@@ -139,13 +139,6 @@ function embed(basis_l::CompositeBasis, basis_r::CompositeBasis,
     # Create the operator.
     permuted_op = tensor(all_operators...)
 
-    # Create a copy to fill with correctly-ordered objects (basis and data).
-    unpermuted_op = copy(permuted_op)
-
-    # Create the correctly ordered basis.
-    unpermuted_op.basis_l = basis_l
-    unpermuted_op.basis_r = basis_r
-
     # Reorient the matrix to act in the correctly ordered basis.
     # Get the dimensions necessary for index permuting.
     dims_l = [b.shape[1] for b in basis_l.bases]
@@ -167,7 +160,9 @@ function embed(basis_l::CompositeBasis, basis_r::CompositeBasis,
          x -> permutedims(x, [perm_order_l; perm_order_r .+ length(dims_l)]) |>
          x -> sparse(reshape(x, (prod(dims_l), prod(dims_r)))))
 
-    unpermuted_op.data = M
+    # Create operator with proper data and bases
+    constructor = Base.typename(T)
+    unpermuted_op = constructor.wrapper(basis_l, basis_r, M)
 
     return unpermuted_op
 end

test/test_operators.jl

@@ -118,4 +118,13 @@ OP_cnot = embed(b8, [1,3], op_cnot)
 
 @test_throws ArgumentError conj!(op_test)
 
+bfock = FockBasis(2)
+bspin = SpinBasis(1//2)
+b = bfock⊗bspin⊗bspin
+
+op12 = destroy(bfock)⊗sigmap(bspin)
+
+@test embed(b, [1,2], op12) == destroy(bfock)⊗sigmap(bspin)⊗one(bspin)
+@test embed(b, [1,3], op12) == destroy(bfock)⊗one(bspin)⊗sigmap(bspin)
+
 end # testset