kalmar
/
PropertyT.jl
mirror of https://github.com/kalmarek/PropertyT.jl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix names and tests

This commit is contained in:
kalmarek 2019-11-20 13:49:16 +01:00
parent 3712aadbf7
commit ff8fcb5dd3
No known key found for this signature in database
GPG Key ID: 8BF1A3855328FC15
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Manifest.toml
View File

@ -124,7 +124,7 @@ version = "0.10.6"
[[GroupRings]] [[GroupRings]]
deps = ["AbstractAlgebra", "LinearAlgebra", "Markdown", "SparseArrays"] deps = ["AbstractAlgebra", "LinearAlgebra", "Markdown", "SparseArrays"]
git-tree-sha1 = "0953bbaa3ccd0b7e12585e705011f01ac8672c7c" git-tree-sha1 = "8a9541783cff6911e35840770d0f004c0d2a13dd"
repo-rev = "master" repo-rev = "master"
repo-url = "https://github.com/kalmarek/GroupRings.jl" repo-url = "https://github.com/kalmarek/GroupRings.jl"
uuid = "0befed6a-bd73-11e8-1e41-a1190947c2f5" uuid = "0befed6a-bd73-11e8-1e41-a1190947c2f5"
@ -230,9 +230,9 @@ version = "0.12.0"
[[Parsers]] [[Parsers]]
deps = ["Dates", "Test"] deps = ["Dates", "Test"]
git-tree-sha1 = "c56ecb484f286639f161e712b8311f5ab77e8d32" git-tree-sha1 = "a23968e107c0544aca91bfab6f7dd34de1206a54"
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
version = "0.3.8" version = "0.3.9"
[[Pkg]] [[Pkg]]
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]

4
src/1712.07167.jl
View File

@ -43,10 +43,8 @@ function Settings(name::String,
return Symmetrized(name, G, S, autS, halfradius, upper_bound, solver, force_compute) return Symmetrized(name, G, S, autS, halfradius, upper_bound, solver, force_compute)
end end
prefix(s::Naive) = ""
prefix(s::Symmetrized) = "o"
suffix(s::Settings) = "$(s.upper_bound)" suffix(s::Settings) = "$(s.upper_bound)"
prepath(s::Settings) = prefix(s)*s.name prepath(s::Settings) = s.name
fullpath(s::Settings) = joinpath(prepath(s), suffix(s)) fullpath(s::Settings) = joinpath(prepath(s), suffix(s))
filename(sett::Settings, s::Symbol; kwargs...) = filename(sett, Val{s}; kwargs...) filename(sett::Settings, s::Symbol; kwargs...) = filename(sett, Val{s}; kwargs...)

28
test/1712.07167.jl
View File

@ -1,13 +1,15 @@
@testset "1712.07167 Examples" begin @testset "1712.07167 Examples" begin
@testset "oSL(3,Z)" begin @testset "SL(3,Z)" begin
N = 3 N = 3
G = MatrixAlgebra(zz, N) G = MatrixAlgebra(zz, N)
S = PropertyT.generating_set(G) S = PropertyT.generating_set(G)
autS = WreathProduct(PermGroup(2), PermGroup(N)) autS = WreathProduct(PermGroup(2), PermGroup(N))
rm("oSL($N,Z)", recursive=true, force=true) NAME = "SL($N,Z)_orbit"
sett = PropertyT.Settings("SL($N,Z)", G, S, autS, with_SCS(1000, accel=20);
rm(NAME, recursive=true, force=true)
sett = PropertyT.Settings(NAME, G, S, autS, with_SCS(1000, accel=20);
upper_bound=0.27, force_compute=false) upper_bound=0.27, force_compute=false)
@info sett @info sett
@ -20,7 +22,7 @@
@test λ == PropertyT.spectral_gap(sett) @test λ == PropertyT.spectral_gap(sett)
@test PropertyT.check_property_T(sett) == false @test PropertyT.check_property_T(sett) == false
sett = PropertyT.Settings("SL($N,Z)", G, S, autS, with_SCS(4000, accel=20); sett = PropertyT.Settings(NAME, G, S, autS, with_SCS(4000, accel=20);
upper_bound=0.27, force_compute=true) upper_bound=0.27, force_compute=true)
@info sett @info sett
@ -36,7 +38,7 @@
########## ##########
# Symmetrizing by PermGroup(3): # Symmetrizing by PermGroup(3):
sett = PropertyT.Settings("SL($N,Z)", G, S, PermGroup(N), with_SCS(4000, accel=20, warm_start=false); sett = PropertyT.Settings(NAME, G, S, PermGroup(N), with_SCS(4000, accel=20, warm_start=false);
upper_bound=0.27, force_compute=true) upper_bound=0.27, force_compute=true)
@info sett @info sett
@ -46,14 +48,16 @@
@test PropertyT.interpret_results(sett, λ) == true @test PropertyT.interpret_results(sett, λ) == true
end end
@testset "oSL(4,Z)" begin @testset "SL(4,Z)" begin
N = 4 N = 4
G = MatrixAlgebra(zz, N) G = MatrixAlgebra(zz, N)
S = PropertyT.generating_set(G) S = PropertyT.generating_set(G)
autS = WreathProduct(PermGroup(2), PermGroup(N)) autS = WreathProduct(PermGroup(2), PermGroup(N))
rm("oSL($N,Z)", recursive=true, force=true) NAME = "SL($N,Z)_orbit"
sett = PropertyT.Settings("SL($N,Z)", G, S, autS, with_SCS(2000, accel=20);
rm(NAME, recursive=true, force=true)
sett = PropertyT.Settings(NAME, G, S, autS, with_SCS(2000, accel=20);
upper_bound=1.3, force_compute=false) upper_bound=1.3, force_compute=false)
@info sett @info sett
@ -66,7 +70,7 @@
@test λ == PropertyT.spectral_gap(sett) @test λ == PropertyT.spectral_gap(sett)
@test PropertyT.check_property_T(sett) == false @test PropertyT.check_property_T(sett) == false
sett = PropertyT.Settings("SL($N,Z)", G, S, autS, with_SCS(15000, accel=20, warm_start=true); sett = PropertyT.Settings(NAME, G, S, autS, with_SCS(15000, accel=20, warm_start=true);
upper_bound=1.3, force_compute=true) upper_bound=1.3, force_compute=true)
@info sett @info sett
@ -86,9 +90,11 @@
S = PropertyT.generating_set(G) S = PropertyT.generating_set(G)
autS = WreathProduct(PermGroup(2), PermGroup(N)) autS = WreathProduct(PermGroup(2), PermGroup(N))
rm("oSAut(F$N)", recursive=true, force=true) NAME = "SAut(F$N)_orbit"
sett = PropertyT.Settings("SAut(F$N)", G, S, autS, with_SCS(1000); rm(NAME, recursive=true, force=true)
sett = PropertyT.Settings(NAME, G, S, autS, with_SCS(1000);
upper_bound=0.15) upper_bound=0.15)
@info sett @info sett

6
test/SOS_correctness.jl
View File

@ -27,7 +27,7 @@
@info "$NAME:\nDifference in l₁-norm between square and hpc sos decompositions:" norm(eoi-sos_sqr,1) norm(eoi-sos_hpc,1) norm(sos_sqr - sos_hpc, 1) @info "$NAME:\nDifference in l₁-norm between square and hpc sos decompositions:" norm(eoi-sos_sqr,1) norm(eoi-sos_hpc,1) norm(sos_sqr - sos_hpc, 1)
######################################################### #########################################################
NAME = "oSL(3,Z)" NAME = "SL(3,Z)_orbit"
eoi, pm, Q = prepare(NAME, 0.27, 3*2*2) eoi, pm, Q = prepare(NAME, 0.27, 3*2*2)
@time sos_sqr = PropertyT.compute_SOS_square(pm, Q) @time sos_sqr = PropertyT.compute_SOS_square(pm, Q)
@ -37,7 +37,7 @@
@info "$NAME:\nDifference in l₁-norm between square and hpc sos decompositions:" norm(eoi-sos_sqr,1) norm(eoi-sos_hpc,1) norm(sos_sqr - sos_hpc, 1) @info "$NAME:\nDifference in l₁-norm between square and hpc sos decompositions:" norm(eoi-sos_sqr,1) norm(eoi-sos_hpc,1) norm(sos_sqr - sos_hpc, 1)
######################################################### #########################################################
NAME = "oSL(4,Z)" NAME = "SL(4,Z)_orbit"
eoi, pm, Q = prepare(NAME, 1.3, 4*3*2) eoi, pm, Q = prepare(NAME, 1.3, 4*3*2)
@time sos_sqr = PropertyT.compute_SOS_square(pm, Q) @time sos_sqr = PropertyT.compute_SOS_square(pm, Q)
@ -47,7 +47,7 @@
@info "$NAME:\nDifference in l₁-norm between square and hpc sos decompositions:" norm(eoi-sos_sqr,1) norm(eoi-sos_hpc,1) norm(sos_sqr - sos_hpc, 1) @info "$NAME:\nDifference in l₁-norm between square and hpc sos decompositions:" norm(eoi-sos_sqr,1) norm(eoi-sos_hpc,1) norm(sos_sqr - sos_hpc, 1)
######################################################### #########################################################
NAME = "oSAut(F3)" NAME = "SAut(F3)_orbit"
eoi, pm, Q = prepare(NAME, 0.15, 4*3*2*2) eoi, pm, Q = prepare(NAME, 0.15, 4*3*2*2)
@time sos_sqr = PropertyT.compute_SOS_square(pm, Q) @time sos_sqr = PropertyT.compute_SOS_square(pm, Q)