generating_set now returns both S and ID

This commit is contained in:
kalmar 2017-03-26 16:21:47 +02:00
parent a3779fb50a
commit 58217aaaf6
1 changed files with 5 additions and 4 deletions

View File

@ -46,9 +46,10 @@ function ΔandSDPconstraints(name::String)
return Δ, sdp_constraints return Δ, sdp_constraints
end end
function ΔandSDPconstraints(name::String, ID, generating_func::Function) function ΔandSDPconstraints(name::String, generating_set::Function)
pm_fname, Δ_fname = pmΔfilenames(name) pm_fname, Δ_fname = pmΔfilenames(name)
Δ, sdp_constraints = Main.ΔandSDPconstraints(ID, generating_func()) S, ID = generating_set()
Δ, sdp_constraints = Main.ΔandSDPconstraints(ID, S)
save(pm_fname, "pm", Δ.product_matrix) save(pm_fname, "pm", Δ.product_matrix)
save(Δ_fname, "Δ", Δ.coefficients) save(Δ_fname, "Δ", Δ.coefficients)
return Δ, sdp_constraints return Δ, sdp_constraints
@ -110,7 +111,7 @@ function κandA(name::String, sdp_constraints, Δ::GroupAlgebraElement, solver::
return κ, A return κ, A
end end
function check_property_T(name::String, ID, generate_B₄::Function, function check_property_T(name::String, generating_set::Function,
solver, upper_bound, tol=1e-6) solver, upper_bound, tol=1e-6)
if !isdir(name) if !isdir(name)
@ -127,7 +128,7 @@ function check_property_T(name::String, ID, generate_B₄::Function,
ΔandSDPconstraints(name) ΔandSDPconstraints(name)
catch err catch err
if isa(err, ArgumentError) if isa(err, ArgumentError)
ΔandSDPconstraints(name, ID, generate_B₄) ΔandSDPconstraints(name, generating_set)
else else
error(logger, err) error(logger, err)
end end