Merge pull request #26 from tensor4all/25-bug-in-threadbatchevaluator

Fix bug in ThreadBatchEvaluator

Author: shinaoka

src/batcheval.jl

@@ -95,6 +95,9 @@ struct ThreadedBatchEvaluator{T} <: BatchEvaluator{T}
     end
 end
 
+function (obj::ThreadedBatchEvaluator{T})(indexset::Vector{Int})::T where {T}
+    return obj.f(indexset)
+end
 
 # Batch evaluation (loop over all index sets)
 function (obj::ThreadedBatchEvaluator{T})(leftindexset::Vector{Vector{Int}}, rightindexset::Vector{Vector{Int}}, ::Val{M})::Array{T,M + 2} where {T,M}

test/test_batcheval.jl

@@ -65,4 +65,21 @@ end
 
         @test result ≈ ref
     end
-end
+
+    @testset "ThreadedBatchEvaluator (from Matsuura)" begin
+        function f(x)
+            sleep(1e-3)
+            return sum(x)
+        end
+
+        L = 20
+        localdims = fill(2, L)
+        parf = TCI.ThreadedBatchEvaluator{Float64}(f, localdims)
+
+        tci, ranks, errors = TCI.crossinterpolate2(Float64, parf, localdims)
+
+        tci_ref, ranks_ref, errors_ref = TCI.crossinterpolate2(Float64, f, localdims)
+
+        @test TCI.fulltensor(TCI.TensorTrain(tci)) ≈ TCI.fulltensor(TCI.TensorTrain(tci_ref))
+    end
+end