Merge branch 'main' of https://github.com/ZIB-IOL/EntanglementDetection.jl

Author: Ye-Chao-Liu

Project.toml

@@ -18,11 +18,11 @@ Tullio = "bc48ee85-29a4-5162-ae0b-a64e1601d4bc"
 EntanglementDetectionTullio = "Tullio"
 
 [compat]
-FrankWolfe = "0.4.3"
-Ket = "0.5"
+FrankWolfe = "0.4.1 - 0.5"
+Ket = "0.5.1 - 0.6"
 Printf = "1.11.0"
 Random = "1.11.0"
-Roots = "2.2.6"
+Roots = "2.2"
 Tullio = "0.3.8"
 
 [extras]

src/callback.jl

@@ -117,7 +117,7 @@ function build_callback(trajectory_arr, epsilon, max_active, shortcut, shortcut_
             return false
         end
 
-        if noise_mixture 
+        if noise_mixture
             if rp[] > 1 # stop if the noise is fully added
                 # verbose > 0 && @info "noise is fully added"
                 return false
@@ -152,10 +152,10 @@ function build_callback(trajectory_arr, epsilon, max_active, shortcut, shortcut_
         end
 
         if state.primal < epsilon # stop if the primal is small enough (main stopping criterion)
-            # verbose > 0 &&  @info "primal is small enough"
+            # verbose > 0 && @info "primal is small enough"
             return false
         end
-        
+
         return true # control when to stop
     end
     return callback

src/types.jl

@@ -25,7 +25,7 @@ function Workspace{T, N}(dims::NTuple{N, Int}) where {T <: Real, N}
     return Workspace{T, N}(pure_kets, pure_tensors, reduced_setdiffs, reduced_tensors, reduced_matrices, blas_workspaces)
 end
 
-struct Fwdata 
+struct Fwdata
     fw_iter::Vector{Int}
     fw_time::Vector{Float64}
     lmo_counts::Vector{Int}

test/instances.jl

@@ -5,7 +5,7 @@
             fw_algorithm = FrankWolfe.blended_pairwise_conditional_gradient,
             epsilon = 1e-6,
             lazy = true,
-            lazy_tolerance = 2.0,
+            sparsity_control = 2.0,
             max_iteration = 10^5,
             verbose = false)
         @test res.ent
@@ -22,7 +22,7 @@ end
             fw_algorithm = FrankWolfe.blended_pairwise_conditional_gradient,
             epsilon = 1e-6,
             lazy = true,
-            lazy_tolerance = 2.0,
+            sparsity_control = 2.0,
             max_iteration = 10^4,
             verbose = 0)
         @test res.ent

test/unit.jl

@@ -108,7 +108,7 @@ end
                   FrankWolfe.blended_pairwise_conditional_gradient,
                   FrankWolfe.frank_wolfe,
                   FrankWolfe.away_frank_wolfe,
-                  FrankWolfe.lazified_conditional_gradient, # FrankWolfe.VectorCacheLMO
+                  # FrankWolfe.lazified_conditional_gradient, # FrankWolfe.VectorCacheLMO ruins the game
                  ]
     for T in [Float64, Double64]
         CT = Complex{T}