Merge branch 'marc_ritter/cleanup' into 'main'

some cleanup

See merge request tensors4fields/TensorCrossInterpolation.jl!79

Author: Marc Ritter

src/integration.jl

@@ -22,8 +22,9 @@ function integrate(
     f,
     a::Vector{ValueType},
     b::Vector{ValueType};
-    tolerance=1e-8,
-    GKorder::Int=15
+    GKorder::Int=15,
+    normalizeerror=false,
+    kwargs...
 ) where {ValueType}
     if iseven(GKorder)
         error("Gauss--Kronrod order must be odd, e.g. 15 or 61.")
@@ -50,7 +51,9 @@ function integrate(
         ValueType,
         F,
         localdims;
-        tolerance
+        nsearchglobalpivot=10,
+        normalizeerror,
+        kwargs...
     )
 
     return sum(tci2) / normalization

src/tensorci2.jl

@@ -684,14 +684,15 @@ function optimize!(
         end
 
         sweep2site!(
-            tci, f, 1;
+            tci, f, 2;
             iter1 = 1,
             abstol=abstol,
             maxbonddim=maxbonddim,
             pivotsearch=pivotsearch,
             strictlynested=strictlynested,
             verbosity=verbosity,
-            sweepstrategy=sweepstrategy
+            sweepstrategy=sweepstrategy,
+            fillsitetensors=true
             )
         if verbosity > 0 && length(globalpivots) > 0
             nrejections = length([p for p in globalpivots if abs(evaluate(tci, p) - f(p)) > abstol])

test/test_integration.jl

@@ -27,6 +27,8 @@ import Random
 end
 
 @testset "Integrate 10d function" begin
+    Random.seed!(1234)
+
     function f(x)
         return 1000 * cos(10 * sum(x .^ 2)) * exp(-sum(x)^4 / 1000)
     end

test/test_tensortrain.jl

@@ -3,8 +3,7 @@ using Random
 using Zygote
 using Optim
 
-@testset "tensor train" begin
-    g(v) = 1 / (sum(v .^ 2) + 1im)
+@testset "tensor train" for g in [v -> exp(exp(1im * sum(v))), v -> 1 / (sum(v .^ 2) + 1im)]
     localdims = (6, 6, 6, 6)
     tolerance = 1e-8
     allindices = CartesianIndices(localdims)