diff --git a/Manifest.toml b/Manifest.toml index 665b895..6704090 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,8 +1,5 @@ # This file is machine-generated - editing it directly is not advised -[[Base64]] -uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" - [[Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" @@ -11,31 +8,20 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[JSON]] -deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e" -uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.0" - -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - -[[Markdown]] -deps = ["Base64"] -uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +[[JSON3]] +deps = ["Dates", "Mmap", "Parsers", "StructTypes", "UUIDs"] +git-tree-sha1 = "7d58534ffb62cd947950b3aa9b993e63307a6125" +uuid = "0f8b85d8-7281-11e9-16c2-39a750bddbf1" +version = "1.9.2" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[Parsers]] -deps = ["Dates", "Test"] -git-tree-sha1 = "0c16b3179190d3046c073440d94172cfc3bb0553" +deps = ["Dates"] +git-tree-sha1 = "ae4bbcadb2906ccc085cf52ac286dc1377dceccc" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "0.3.12" +version = "2.1.2" [[Printf]] deps = ["Unicode"] @@ -45,15 +31,24 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +[[SHA]] +uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" + [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[StructTypes]] +deps = ["Dates", "UUIDs"] +git-tree-sha1 = "d24a825a95a6d98c385001212dc9020d609f2d4f" +uuid = "856f2bd8-1eba-4b0a-8007-ebc267875bd4" +version = "1.8.1" + +[[UUIDs]] +deps = ["Random", "SHA"] +uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" diff --git a/Project.toml b/Project.toml index 99c7bb8..d43de6b 100644 --- a/Project.toml +++ b/Project.toml @@ -1,11 +1,11 @@ name = "SecretAnalysis" uuid = "8dfca4dd-ef31-4e42-8ec3-c12533c9aecd" authors = ["Matt Bauman"] -version = "0.1.5" +version = "0.1.6" [deps] Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" -JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" +JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" [compat] diff --git a/bin/main.jl b/bin/main.jl index 056588b..6db00fa 100644 --- a/bin/main.jl +++ b/bin/main.jl @@ -1,10 +1,15 @@ -using SecretAnalysis, JSON, Printf, Distributed +using SecretAnalysis, JSON3, Printf, Distributed -n = parse(Int64, replace(get(ENV, "n", "10_000_000_000"), '_'=>"")) +n = parse(Int64, replace(get(ENV, "n", "10_000_000_000"), '_' => "")) println("#### Estimating π with $n throws ####") t = @timed @show estimate_pi(n) out = Dict(:pi => t[1], :time => @sprintf("%.1fs", t[2]), :workers => nworkers()) -ENV["OUTPUTS"] = JSON.json(out) +open("results.json", "w") do io + JSON3.pretty(io, JSON3.write(out)) +end + +ENV["RESULTS"] = JSON3.write(out) +ENV["RESULTS_FILE"] = "results.json" \ No newline at end of file