From 56dbbcc7e4b61ca381e4bb1b69ea921f94834f3f Mon Sep 17 00:00:00 2001 From: Christian Peel <6899870+christianpeel@users.noreply.github.com> Date: Mon, 1 Apr 2019 11:17:55 -0700 Subject: [PATCH] Inserted correct UUID and version in Manifest.toml --- LICENSE.md | 6 ++- Manifest.toml | 106 ++++-------------------------------------- Project.toml | 5 +- README.md | 3 +- benchmark/lrtest.jl | 3 -- benchmark/perftest.jl | 1 - 6 files changed, 17 insertions(+), 107 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index a16628b..256c561 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,8 @@ -The LLLplus.jl package is licensed under the MIT "Expat" License: +The LLLplus.jl package is licensed under the MIT License. The package +consists of the contents of the /src and other files in this +repository. -> Copyright (c) 2015: Chris Peel. +> Copyright (c) 2019: Christian Peel > > Permission is hereby granted, free of charge, to any person obtaining > a copy of this software and associated documentation files (the diff --git a/Manifest.toml b/Manifest.toml index 881221c..12eadbe 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,35 +1,13 @@ +# This file is machine-generated - editing it directly is not advised + [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[BenchmarkTools]] -deps = ["JSON", "Pkg", "Printf", "Statistics", "Test"] -git-tree-sha1 = "623941d5eb10e440eb12c97183f96f2f0191d0ca" +deps = ["JSON", "Printf", "Statistics", "Test"] +git-tree-sha1 = "5d1dd8577643ba9014574cd40d9c028cd5e4b85a" uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" -version = "0.4.0" - -[[ColorTypes]] -deps = ["FixedPointNumbers", "Random", "Test"] -git-tree-sha1 = "0e3209ba7418aed732e5c3818076b4400ee36c08" -uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.7.4" - -[[Colors]] -deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Pkg", "Printf", "Reexport", "Test"] -git-tree-sha1 = "26f24e97782dd19d52cf97073c316897ac4d0e30" -uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.9.3" - -[[Compat]] -deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "277d3807440d9793421354b6680911fc95d91a84" -uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "1.0.1" - -[[Conda]] -deps = ["Compat", "JSON", "VersionParsing"] -git-tree-sha1 = "a47f9a2c7b80095e6a935536795635522fe27f5d" -uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d" -version = "1.0.1" +version = "0.4.2" [[Dates]] deps = ["Printf"] @@ -40,33 +18,18 @@ deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" [[Distributed]] -deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"] +deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" -[[FixedPointNumbers]] -deps = ["Pkg", "Test"] -git-tree-sha1 = "31cbf24d537a217475b37274df05de09882b53f1" -uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" -version = "0.5.2" - [[InteractiveUtils]] -deps = ["LinearAlgebra", "Markdown"] +deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[JSON]] -deps = ["Dates", "Distributed", "Mmap", "Pkg", "Sockets", "Test", "Unicode"] -git-tree-sha1 = "fec8e4d433072731466d37ed0061b3ba7f70eeb9" +deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"] +git-tree-sha1 = "1f7a25b53ec67f5e9422f1f551ee216503f4a0fa" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.19.0" - -[[LaTeXStrings]] -deps = ["Compat"] -git-tree-sha1 = "7ab9b8788cfab2bdde22adf9004bda7ad9954b6c" -uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" -version = "1.0.2" - -[[LibGit2]] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +version = "0.20.0" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -78,12 +41,6 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" -[[MacroTools]] -deps = ["Compat"] -git-tree-sha1 = "c443e1c8d58a4e9f61b708ad0a88286c7042145b" -uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.4.4" - [[Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" @@ -91,50 +48,17 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" -[[Pkg]] -deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" -[[PyCall]] -deps = ["Compat", "Conda", "MacroTools", "Statistics", "VersionParsing"] -git-tree-sha1 = "993d80a2cfd0fc4b2acc698370a4f9761b27cd9e" -uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" -version = "1.18.2" - -[[PyPlot]] -deps = ["Base64", "Colors", "Compat", "LaTeXStrings", "PyCall", "VersionParsing"] -git-tree-sha1 = "1cc673ec375f6fa0e3652e23ba435195f8175387" -uuid = "d330b81b-6aea-500a-939a-2ce795aea3ee" -version = "2.6.1" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - [[Random]] deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -[[Reexport]] -deps = ["Pkg"] -git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" -uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "0.2.0" - -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -[[SharedArrays]] -deps = ["Distributed", "Mmap", "Random", "Serialization"] -uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" - [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -150,15 +74,5 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -[[UUIDs]] -deps = ["Random"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" - -[[VersionParsing]] -deps = ["Compat"] -git-tree-sha1 = "c9d5aa108588b978bd859554660c8a5c4f2f7669" -uuid = "81def892-9a0e-5fdd-b105-ffc91e053289" -version = "1.1.2" diff --git a/Project.toml b/Project.toml index e45a58c..014e460 100644 --- a/Project.toml +++ b/Project.toml @@ -1,14 +1,13 @@ name = "LLLplus" -uuid = "debe38fc-a976-11e8-3c3c-550d720deef8" +uuid = "142c1900-a1c3-58ae-a66d-b187f9ca6423" keywords = ["lattice reduction", "LLL", "Seysen", "closest vector problem"] authors = ["Christian Peel "] -version = "0.7.0" +version = "1.1.0" [deps] BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" -PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/README.md b/README.md index d2506b6..fc4dff3 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,7 @@ constellations. We also include code to do a [Vertical-Bell Laboratories Layered Space-Time](https://en.wikipedia.org/wiki/Bell_Laboratories_Layered_Space-Time) (V-BLAST) [5] matrix decomposition which is used in digital -communications. In digital communications (see -[MUMIMO.jl](https://github.com/christianpeel/MUMIMO.jl)) the LLL, +communications. The LLL, Seysen, V-BLAST, and CVP functions are used to solve (exactly or approximately) CVP problems in encoding and decoding multi-terminal signals. diff --git a/benchmark/lrtest.jl b/benchmark/lrtest.jl index 91f7c05..d763ff4 100644 --- a/benchmark/lrtest.jl +++ b/benchmark/lrtest.jl @@ -17,9 +17,6 @@ function lrtest(Ns::Int,N::Array{Int,1},L::Array{Int,1}, dataType::Array{DataType,1},distType) -# Packages that need to be loaded for lrtest to work include PyPlot and -# BenchmarkTools - #lrAlgs = [lll, lllrecursive,seysen] lrAlgs = [lll, seysen] diff --git a/benchmark/perftest.jl b/benchmark/perftest.jl index 9ab0643..bc1bb87 100644 --- a/benchmark/perftest.jl +++ b/benchmark/perftest.jl @@ -1,5 +1,4 @@ using Plots -using BenchmarkTools using LLLplus using Printf using Random