From 7d6d038262ff1cb5b2d7761f4472637adb77b7cb Mon Sep 17 00:00:00 2001 From: kalmarek Date: Tue, 23 Jun 2020 16:15:01 +0200 Subject: [PATCH] update deps --- Manifest.toml | 135 ++++++++++++++++++++------------------------- Project.toml | 4 +- src/1712.07167.jl | 2 +- src/orbitdata.jl | 2 +- src/sqadjop.jl | 8 +-- test/1712.07167.jl | 10 ++-- test/1812.03456.jl | 8 +-- 7 files changed, 78 insertions(+), 91 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 253ecfb..5ac6e5e 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,9 +2,9 @@ [[AbstractAlgebra]] deps = ["InteractiveUtils", "LinearAlgebra", "Markdown", "Random", "SparseArrays", "Test"] -git-tree-sha1 = "f9ec1c158c6d20c14d2e05b190c4377705aff8c4" +git-tree-sha1 = "a203c19175c8dfa8cd61356a06bb157e973baff0" uuid = "c3fe647b-3220-5bb0-a1ea-a7954cac585d" -version = "0.9.1" +version = "0.9.2" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -15,23 +15,17 @@ git-tree-sha1 = "9e62e66db34540a0c919d72172cc2f642ac71260" uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" version = "0.5.0" -[[BinDeps]] -deps = ["Libdl", "Pkg", "SHA", "URIParser", "Unicode"] -git-tree-sha1 = "46cf2c1668ad07aba5a9d331bdeea994a1f13856" -uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee" -version = "1.0.1" - -[[BinaryProvider]] -deps = ["Libdl", "SHA"] -git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c" -uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.8" - [[Blosc]] -deps = ["BinaryProvider", "CMakeWrapper", "Libdl"] -git-tree-sha1 = "9981f1795919b8f770dc064fe733ba09c2e7c7a9" +deps = ["Blosc_jll"] +git-tree-sha1 = "84cf7d0f8fd46ca6f1b3e0305b4b4a37afe50fd6" uuid = "a74b3585-a348-5f62-a45c-50e91977d574" -version = "0.6.0" +version = "0.7.0" + +[[Blosc_jll]] +deps = ["Libdl", "Lz4_jll", "Pkg", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "aa9ef39b54a168c3df1b2911e7797e4feee50fbe" +uuid = "0b7ba130-8d10-5ba8-a3d6-c5182647fed9" +version = "1.14.3+1" [[Bzip2_jll]] deps = ["Libdl", "Pkg"] @@ -39,18 +33,6 @@ git-tree-sha1 = "3663bfffede2ef41358b6fc2e1d8a6d50b3c3904" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" version = "1.0.6+2" -[[CMake]] -deps = ["BinDeps"] -git-tree-sha1 = "50a8b41d2c562fccd9ab841085fc7d1e2706da82" -uuid = "631607c0-34d2-5d66-819e-eb0f9aa2061a" -version = "1.2.0" - -[[CMakeWrapper]] -deps = ["BinDeps", "CMake", "Libdl", "Parameters", "Test"] -git-tree-sha1 = "16d4acb3d37dc05b714977ffefa8890843dc8985" -uuid = "d5fb7624-851a-54ee-a528-d3f3bac0b4a0" -version = "0.2.3" - [[CRlibm]] deps = ["Libdl"] git-tree-sha1 = "9d1c22cff9c04207f336b8e64840d0bd40d86e0e" @@ -65,9 +47,9 @@ version = "0.5.1" [[CodecBzip2]] deps = ["Bzip2_jll", "Libdl", "TranscodingStreams"] -git-tree-sha1 = "2fee975d68f9a8b22187ae86e33c0829b30cf231" +git-tree-sha1 = "2e62a725210ce3c3c2e1a3080190e7ca491f18d7" uuid = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd" -version = "0.7.1" +version = "0.7.2" [[CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] @@ -95,9 +77,9 @@ version = "0.3.3+0" [[DataStructures]] deps = ["InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "4dead20a1606a60292529023d6eac18a1ef6432e" +git-tree-sha1 = "be680f1ad03c0a03796aa3fda5a2180df7f83b46" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.17.12" +version = "0.17.18" [[Dates]] deps = ["Printf"] @@ -136,9 +118,9 @@ version = "0.2.0" [[FileIO]] deps = ["Pkg"] -git-tree-sha1 = "3d7cb2c4c850439f19c4d6d3fbe1dce6481cddb1" +git-tree-sha1 = "202335fd24c2776493e198d6c66a6d910400a895" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.2.4" +version = "1.3.0" [[ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] @@ -147,26 +129,26 @@ uuid = "f6369f11-7733-5829-9624-2563aa707210" version = "0.10.10" [[GroupRings]] -deps = ["AbstractAlgebra", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "0fb8bccca3155b26231347498bd4949fd49b65b3" +deps = ["AbstractAlgebra", "Groups", "LinearAlgebra", "SparseArrays"] +git-tree-sha1 = "76e662a5473866f4f02ed4df2e83af4d531b419c" repo-rev = "master" repo-url = "https://github.com/kalmarek/GroupRings.jl" uuid = "0befed6a-bd73-11e8-1e41-a1190947c2f5" -version = "0.3.1" +version = "0.3.2" [[Groups]] deps = ["AbstractAlgebra", "LinearAlgebra", "Markdown"] -git-tree-sha1 = "452c4abb02b4fc5237aca1eaa76c776dd56b2853" +git-tree-sha1 = "479214998d4769d31a8ff65d0f43152eb191850f" repo-rev = "master" repo-url = "https://github.com/kalmarek/Groups.jl" uuid = "5d8bd718-bd84-11e8-3b40-ad14f4a32557" -version = "0.4.0" +version = "0.4.2" [[HDF5]] deps = ["Blosc", "HDF5_jll", "Libdl", "Mmap", "Random"] -git-tree-sha1 = "cf80ef0b7333e03d78ab6516b56f31f4f7ffa4ae" +git-tree-sha1 = "7048678fa1970aaf867f3e99b90f3e85a9847124" uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" -version = "0.13.1" +version = "0.13.2" [[HDF5_jll]] deps = ["Libdl", "Pkg", "Zlib_jll"] @@ -176,9 +158,9 @@ version = "1.10.5+5" [[HTTP]] deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "fe31f4ff144392ad8176f5c7c03cca6ba320271c" +git-tree-sha1 = "ec87d5e2acbe1693789efbbe14f5ea7525758f71" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.14" +version = "0.8.15" [[IniFile]] deps = ["Test"] @@ -209,10 +191,10 @@ uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.0" [[JSONSchema]] -deps = ["BinaryProvider", "HTTP", "JSON"] -git-tree-sha1 = "b0a7f9328967df5213691d318a03cf70ea8c76b1" +deps = ["HTTP", "JSON", "ZipFile"] +git-tree-sha1 = "832a4d327d9dafdae55a6ecae04f9997c83615cc" uuid = "7d188eb4-7ad8-530c-ae41-71a32a6d4692" -version = "0.2.0" +version = "0.3.0" [[JuMP]] deps = ["Calculus", "DataStructures", "ForwardDiff", "LinearAlgebra", "MathOptInterface", "NaNMath", "Random", "SparseArrays", "Statistics"] @@ -240,15 +222,21 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +[[Lz4_jll]] +deps = ["Libdl", "Pkg"] +git-tree-sha1 = "e1a93171a400d4578193eaa39edd2d3f5db08fb6" +uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" +version = "1.9.2+0" + [[Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[MathOptInterface]] deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "JSON", "JSONSchema", "LinearAlgebra", "MutableArithmetics", "OrderedCollections", "SparseArrays", "Test", "Unicode"] -git-tree-sha1 = "27f2ef85879b8f1d144266ab44f076ba0dfbd8a1" +git-tree-sha1 = "cd2049c055c7d192a235670d50faa375361624ba" uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" -version = "0.9.13" +version = "0.9.14" [[MbedTLS]] deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"] @@ -267,9 +255,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "e1edd618a8f39d16f8595dd622a63b25f759cf8a" +git-tree-sha1 = "6cf09794783b9de2e662c4e8b60d743021e338d0" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "0.2.9" +version = "0.2.10" [[NaNMath]] git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f" @@ -283,22 +271,15 @@ uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" version = "0.5.3+3" [[OrderedCollections]] -deps = ["Random", "Serialization", "Test"] -git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1" +git-tree-sha1 = "12ce190210d278e12644bcadf5b21cbdcf225cd3" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.1.0" - -[[Parameters]] -deps = ["OrderedCollections"] -git-tree-sha1 = "b62b2558efb1eef1fa44e4be5ff58a515c287e38" -uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" -version = "0.12.0" +version = "1.2.0" [[Parsers]] deps = ["Dates", "Test"] -git-tree-sha1 = "f8f5d2d4b4b07342e5811d2b6428e45524e241df" +git-tree-sha1 = "eb3e09940c0d7ae01b01d9291ebad7b081c844d3" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.2" +version = "1.0.5" [[Pkg]] deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] @@ -346,15 +327,15 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] deps = ["OpenSpecFun_jll"] -git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c" +git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "0.10.0" +version = "0.10.3" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c" +git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.12.1" +version = "0.12.3" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -370,12 +351,6 @@ git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" version = "0.9.5" -[[URIParser]] -deps = ["Test", "Unicode"] -git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69" -uuid = "30578b45-9adc-5946-b283-645ec420af67" -version = "0.4.0" - [[UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" @@ -383,8 +358,20 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +[[ZipFile]] +deps = ["Libdl", "Printf", "Zlib_jll"] +git-tree-sha1 = "254975fef2fc526583bb9b7c9420fe66ffe09f2f" +uuid = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea" +version = "0.9.2" + [[Zlib_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "2f6c3e15e20e036ee0a0965879b31442b7ec50fa" +git-tree-sha1 = "4838361eb3ba796a57457bdc183e1a128639d0ec" uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+9" +version = "1.2.11+12" + +[[Zstd_jll]] +deps = ["Libdl", "Pkg"] +git-tree-sha1 = "b25b0fb10176c42e9a5a20e1f40d570ac0288d4e" +uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" +version = "1.4.5+0" diff --git a/Project.toml b/Project.toml index d5cb441..a71f396 100644 --- a/Project.toml +++ b/Project.toml @@ -16,8 +16,8 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [compat] AbstractAlgebra = "^0.9.0" -GroupRings = "^0.3.1" -Groups = "^0.4.0" +GroupRings = "^0.3.2" +Groups = "^0.4.2" IntervalArithmetic = "^0.16.0" JLD = "^0.9.0" JuMP = "^0.20.0" diff --git a/src/1712.07167.jl b/src/1712.07167.jl index 5145bf6..6e28349 100644 --- a/src/1712.07167.jl +++ b/src/1712.07167.jl @@ -130,7 +130,7 @@ function approximate_by_SOS(sett::Symmetrized, orbit_data catch ex @warn ex.msg - Grouprings.hasbasis(parent(orderunit)) || + GroupRings.hasbasis(parent(orderunit)) || throw("You need to define basis of Group Ring to compute orbit decomposition!") @info "Computing orbit and Wedderburn decomposition..." orbit_data = OrbitData(parent(orderunit), sett.autS) diff --git a/src/orbitdata.jl b/src/orbitdata.jl index 5e98f2a..151b82b 100644 --- a/src/orbitdata.jl +++ b/src/orbitdata.jl @@ -149,7 +149,7 @@ function perm_reps(G::Group, E::Vector, E_rdict=GroupRings.reverse_dict(E)) l = length(elts) preps = Vector{Generic.Perm}(undef, l) - permG = PermutationGroup(length(E)) + permG = SymmetricGroup(length(E)) Threads.@threads for i in 1:l preps[i] = permG(PropertyT.perm_repr(elts[i], E, E_rdict), false) diff --git a/src/sqadjop.jl b/src/sqadjop.jl index e51b2c0..310cf97 100644 --- a/src/sqadjop.jl +++ b/src/sqadjop.jl @@ -15,7 +15,7 @@ function Sq(RG::GroupRing, N::Integer) ℤ = Int64 Δ₂ = length(S₂)*one(RG, ℤ) - RG(S₂, ℤ); - Alt_N = [g for g in PermutationGroup(N) if parity(g) == 0] + Alt_N = [g for g in SymmetricGroup(N) if parity(g) == 0] sq = RG() for σ in Alt_N @@ -29,7 +29,7 @@ function Adj(RG::GroupRing, N::Integer) ℤ = Int64 Δ₂ = length(S₂)*one(RG, ℤ) - RG(S₂, ℤ); - Alt_N = [g for g in PermutationGroup(N) if parity(g) == 0] + Alt_N = [g for g in SymmetricGroup(N) if parity(g) == 0] Δ₂s = Dict(σ=>σ(Δ₂) for σ in Alt_N) adj = RG() @@ -51,7 +51,7 @@ function Op(RG::GroupRing, N::Integer) ℤ = Int64 Δ₂ = length(S₂)*one(RG, ℤ) - RG(S₂, ℤ); - Alt_N = [g for g in PermutationGroup(N) if parity(g) == 0] + Alt_N = [g for g in SymmetricGroup(N) if parity(g) == 0] Δ₂s = Dict(σ=>σ(Δ₂) for σ in Alt_N) op = RG() @@ -77,7 +77,7 @@ function SqAdjOp(RG::GroupRing, N::Integer) ℤ = Int64 Δ₂ = length(S₂)*one(RG, ℤ) - RG(S₂, ℤ); - Alt_N = [σ for σ in PermutationGroup(N) if parity(σ) == 0] + Alt_N = [σ for σ in SymmetricGroup(N) if parity(σ) == 0] sq, adj, op = RG(), RG(), RG() Δ₂s = Dict(σ=>σ(Δ₂) for σ in Alt_N) diff --git a/test/1712.07167.jl b/test/1712.07167.jl index 7c807f2..860cce1 100644 --- a/test/1712.07167.jl +++ b/test/1712.07167.jl @@ -4,7 +4,7 @@ N = 3 G = MatrixAlgebra(zz, N) S = PropertyT.generating_set(G) - autS = WreathProduct(PermGroup(2), PermGroup(N)) + autS = WreathProduct(SymmetricGroup(2), SymmetricGroup(N)) NAME = "SL($N,Z)_orbit" @@ -36,9 +36,9 @@ @test PropertyT.check_property_T(sett) == true ########## - # Symmetrizing by PermGroup(3): + # Symmetrizing by SymmetricGroup(3): - sett = PropertyT.Settings(NAME, G, S, PermGroup(N), with_SCS(4000, accel=20, warm_start=false); + sett = PropertyT.Settings(NAME, G, S, SymmetricGroup(N), with_SCS(4000, accel=20, warm_start=false); upper_bound=0.27, force_compute=true) @info sett @@ -52,7 +52,7 @@ N = 4 G = MatrixAlgebra(zz, N) S = PropertyT.generating_set(G) - autS = WreathProduct(PermGroup(2), PermGroup(N)) + autS = WreathProduct(SymmetricGroup(2), SymmetricGroup(N)) NAME = "SL($N,Z)_orbit" @@ -88,7 +88,7 @@ N = 3 G = SAut(FreeGroup(N)) S = PropertyT.generating_set(G) - autS = WreathProduct(PermGroup(2), PermGroup(N)) + autS = WreathProduct(SymmetricGroup(2), SymmetricGroup(N)) NAME = "SAut(F$N)_orbit" diff --git a/test/1812.03456.jl b/test/1812.03456.jl index f5f0211..aca1905 100644 --- a/test/1812.03456.jl +++ b/test/1812.03456.jl @@ -44,7 +44,7 @@ Δ = PropertyT.Laplacian(S, 2) RG = parent(Δ) - autS = WreathProduct(PermGroup(2), PermGroup(N)) + autS = WreathProduct(SymmetricGroup(2), SymmetricGroup(N)) orbits = PropertyT.orbit_decomposition(autS, RG.basis) @test PropertyT.Sq(RG) isa GroupRingElem @@ -123,7 +123,7 @@ end S = PropertyT.generating_set(M) Δ = PropertyT.Laplacian(S, halfradius) RG = parent(Δ) - orbit_data = PropertyT.OrbitData(RG, WreathProduct(PermGroup(2), PermGroup(N))) + orbit_data = PropertyT.OrbitData(RG, WreathProduct(SymmetricGroup(2), SymmetricGroup(N))) orbit_data = PropertyT.decimate(orbit_data); @testset "Sq₃ is SOS" begin @@ -170,7 +170,7 @@ end S = PropertyT.generating_set(M) Δ = PropertyT.Laplacian(S, halfradius) RG = parent(Δ) - orbit_data = PropertyT.OrbitData(RG, WreathProduct(PermGroup(2), PermGroup(N))) + orbit_data = PropertyT.OrbitData(RG, WreathProduct(SymmetricGroup(2), SymmetricGroup(N))) orbit_data = PropertyT.decimate(orbit_data); @testset "Sq₄ is SOS" begin @@ -228,7 +228,7 @@ end # S = PropertyT.generating_set(M) # Δ = PropertyT.Laplacian(S, halfradius) # RG = parent(Δ) - # orbit_data = PropertyT.OrbitData(RG, WreathProduct(PermGroup(2), PermGroup(N))) + # orbit_data = PropertyT.OrbitData(RG, WreathProduct(SymmetricGroup(2), SymmetricGroup(N))) # orbit_data = PropertyT.decimate(orbit_data); # # @time elt = PropertyT.Adj(RG) + 100PropertyT.Op(RG)