handle repeated indices

Author: lkdvos

src/operators/mpo.jl

@@ -422,3 +422,11 @@ function swap!(
     @plansor mpo[i + 1][-1 -2; -3 -4] := sqrtS[-1; 1] * Vᴴ[1; -3 -4 -2]
     return mpo
 end
+
+function multiply_neighbours!(mpo::FiniteMPO{<:MPOTensor}, i::Integer)
+    1 <= i < length(mpo) || throw(BoundsError(mpo, i))
+    O₁ = mpo[i]
+    O₂ = popat!(parent(mpo), i + 1)
+    @plansor mpo[i][-1 -2; -3 -4] := O₁[-1 -2; 1 2] * τ[1 2; 3 4] * O₂[3 4; -3 -4]
+    return mpo
+end

src/operators/mpohamiltonian.jl

@@ -309,16 +309,17 @@ function instantiate_operator(state::AbstractMPS, O::Pair)
     return instantiate_operator(physicalspace(state), O)
 end
 function instantiate_operator(lattice::AbstractArray{<:VectorSpace}, (inds′, O)::Pair)
-    inds = inds′ isa Int ? tuple(inds′) : inds′
-    mpo = O isa FiniteMPO ? O : FiniteMPO(O)
+    inds = inds′ isa Int ? [inds′] : inds′
+    mpo = O isa FiniteMPO ? copy(O) : FiniteMPO(O)
 
     # convert to linear index type
-    indices = map(inds) do I
-        return Base._to_linear_index(lattice, Tuple(I)...) # this should mean all inds are valid...
+    indices = Vector{Int}(undef, length(inds))
+    for i in eachindex(indices)
+        indices[i] = Base._to_linear_index(lattice, Tuple(inds[i])...) # this should mean all inds are valid...
     end
 
     # sort indices and deduplicate
-    indices, mpo = canonicalize_indices(indices, mpo)
+    indices, mpo = canonicalize_indices!(indices, mpo)
     operators = parent(mpo)
 
     @assert allunique(indices) && issorted(indices) "From here on we require unique and ascending indices\n$indices"
@@ -345,14 +346,23 @@ function instantiate_operator(lattice::AbstractArray{<:VectorSpace}, (inds′, O
     return sites => local_mpo
 end
 
-function canonicalize_indices(indices, mpo)
-    issorted(indices) && return indices, mpo
-    mpo = copy(mpo)
-    I = TensorKit.TupleTools.sortperm(indices)
-    for s in TensorKit.permutation2swaps(I)
-        swap!(mpo, s)
+function canonicalize_indices!(indices, mpo)
+    # swap non-sorted entries
+    for i in 2:length(indices)
+        for j in reverse(i:length(indices))
+            if indices[j] < indices[j - 1]
+                swap!(mpo, j - 1)
+                indices[j - 1], indices[j] = indices[j], indices[j - 1]
+            end
+        end
+    end
+    for i in length(indices):-1:2
+        if indices[i] == indices[i - 1]
+            multiply_neighbours!(mpo, i - 1)
+            popat!(indices, i)
+        end
     end
-    return TensorKit.TupleTools.getindices(indices, I), mpo
+    return indices, mpo
 end
 
 # yields the promoted tensortype of all tensors