Working contract

Author: JoeyT1994

src/contractnetwork.jl

@@ -1,5 +1,6 @@
 using BackendSelection: @Algorithm_str, Algorithm
-using ITensorNetworksNext.LazyNamedDimsArrays: LazyNamedDimsArray, nested_array_to_lazy_multiply, substitute_lazy, materialize
+using ITensorNetworksNext.LazyNamedDimsArrays: nested_array_to_lazy_multiply, substitute_lazy, materialize, lazy,
+    symnameddims
 
 default_contract_alg = nothing
 
@@ -20,11 +21,8 @@ end
 
 function contractnetwork(alg::Algorithm"exact", tn::Vector{<:AbstractArray})
     contract_sequence = isa(alg.sequence, String) ? contraction_sequence(tn; alg = alg.sequence) : sequence
-    @show contract_sequence
-    @show materialize(contract_sequence)
-    contract_sequence = substitute_lazy(contract_sequence, Dict(i => lazy(tn[i]) for i in 1:length(tn)))
-    @show contract_sequence
-    #return materialize(substitute_lazy(contract_sequence, Dict(i => tn[i] for i in 1:length(tn))))
+    contract_sequence = substitute_lazy(contract_sequence, Dict(symnameddims(i) => lazy(tn[i]) for i in 1:length(tn)))
+    return materialize(contract_sequence)
 end
 
 function contractnetwork(alg::Algorithm"exact", tn::AbstractTensorNetwork)

src/lazynameddimsarrays.jl

@@ -294,7 +294,7 @@ TermInterface.operation(m::Mul) = *
     union::Union{A, Mul{LazyNamedDimsArray{T, A}}}
 end
 function LazyNamedDimsArray(a::AbstractNamedDimsArray)
-    return LazyNamedDimsArray{eltype(a), typeof(a)}(a)
+    return LazyNamedDimsArray{eltype(typeof(a)), typeof(a)}(a)
 end
 function LazyNamedDimsArray(a::Mul{LazyNamedDimsArray{T, A}}) where {T, A}
     return LazyNamedDimsArray{T, A}(a)

test/test_contractnetwork.jl

@@ -3,7 +3,7 @@ using NamedGraphs.GraphsExtensions: arranged_edges, incident_edges
 using NamedGraphs.NamedGraphGenerators: named_grid
 using ITensorBase: Index, ITensor
 using ITensorNetworksNext:
-    TensorNetwork, linkinds, siteinds, contractnetwork, contraction_sequence, symnameddims, lazy
+    TensorNetwork, linkinds, siteinds, contractnetwork, contraction_sequence, symnameddims, lazy, substitute_lazy, materialize
 using TensorOperations: TensorOperations
 using Test: @test, @testset
 
@@ -15,14 +15,10 @@ using Test: @test, @testset
         C = ITensor([5.0, 1.0], j)
         D = ITensor([-2.0, 3.0, 4.0, 5.0, 1.0], k)
 
-        #@show s1 * s2
-        #seq = contraction_sequence([A, B, C, D]; alg = "optimal")
-        #@show seq
+        ABCD_1 = contractnetwork([A, B, C, D]; alg = "exact", sequence = "leftassociative")
+        ABCD_2 = contractnetwork([A, B, C, D]; alg = "exact", sequence = "optimal")
 
-        #ABCD_1 = contractnetwork([A, B, C, D]; alg = "exact", sequence = "leftassociative")
-        # ABCD_2 = contractnetwork([A, B, C, D]; alg = "exact", sequence = "optimal")
-
-        # @test ABCD_1 == ABCD_2
+        @test ABCD_1 == ABCD_2
     end
 
     @testset "Contract One Dimensional Network" begin