diff --git a/Manifest.toml b/Manifest.toml index 8df377db..6776d3cb 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -33,23 +33,19 @@ version = "1.0.0" deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +[[Distributed]] +deps = ["Random", "Serialization", "Sockets"] +uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" + [[Formatting]] deps = ["Printf"] git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" version = "0.4.2" -[[HoldemCards]] -deps = ["Random", "Test"] -git-tree-sha1 = "cfa7a18262ec565443cd3a64cf55aa49664a0b26" -repo-rev = "main" -repo-url = "https://github.com/charleskawczynski/HoldemCards.jl" -uuid = "ecfe714a-bcc2-4d11-ad00-25525ff8f984" -version = "0.1.0" - [[HoldemHandEvaluator]] -deps = ["BenchmarkTools", "Combinatorics", "HoldemCards", "Test"] -git-tree-sha1 = "a56db611c47e535a1cf13aa22dd06ce0a8dd354e" +deps = ["BenchmarkTools", "Combinatorics", "PlayingCards", "Test"] +git-tree-sha1 = "1f4c602625ac40811ff42678e2b439baf20d208e" repo-rev = "main" repo-url = "https://github.com/charleskawczynski/HoldemHandEvaluator.jl" uuid = "18ed25b1-892a-4a3b-b8fc-1036dc9a6a89" @@ -93,6 +89,14 @@ git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" version = "1.1.0" +[[PlayingCards]] +deps = ["Random", "Test"] +git-tree-sha1 = "850a44d12f6a4746c8e2183150495f393bb75a19" +repo-rev = "main" +repo-url = "https://github.com/charleskawczynski/PlayingCards.jl" +uuid = "ecfe714a-bcc2-4d11-ad00-25525ff8f984" +version = "0.1.0" + [[PrettyTables]] deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] git-tree-sha1 = "574a6b3ea95f04e8757c0280bb9c29f1a5e35138" @@ -118,6 +122,9 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +[[Sockets]] +uuid = "6462fe0b-24de-5631-8697-dd941f90decc" + [[SparseArrays]] deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" @@ -139,7 +146,7 @@ uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" version = "1.4.1" [[Test]] -deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] +deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[UUIDs]] diff --git a/Project.toml b/Project.toml index 0521c483..0c3dbec2 100644 --- a/Project.toml +++ b/Project.toml @@ -6,8 +6,8 @@ version = "0.1.0" [deps] BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" -HoldemCards = "ecfe714a-bcc2-4d11-ad00-25525ff8f984" HoldemHandEvaluator = "18ed25b1-892a-4a3b-b8fc-1036dc9a6a89" +PlayingCards = "ecfe714a-bcc2-4d11-ad00-25525ff8f984" PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index 38634f7a..66f846a4 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -1,23 +1,42 @@ # This file is machine-generated - editing it directly is not advised -[[ArgTools]] -uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" - -[[Artifacts]] -uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" - [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +[[BenchmarkTools]] +deps = ["JSON", "Logging", "Printf", "Statistics", "UUIDs"] +git-tree-sha1 = "8b8279aa9b15b4ee2d0e06bc5208f486a8ad65cc" +uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" +version = "0.6.0" + [[Combinatorics]] git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860" uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" version = "1.0.2" +[[Crayons]] +git-tree-sha1 = "3f71217b538d7aaee0b69ab47d9b7724ca8afa0d" +uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" +version = "4.0.4" + +[[DataAPI]] +git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" +uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" +version = "1.6.0" + +[[DataValueInterfaces]] +git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" +uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464" +version = "1.0.0" + [[Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +[[Distributed]] +deps = ["Random", "Serialization", "Sockets"] +uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" + [[DocStringExtensions]] deps = ["LibGit2", "Markdown", "Pkg", "Test"] git-tree-sha1 = "9d4f64f79012636741cf01133158a54b24924c32" @@ -30,16 +49,18 @@ git-tree-sha1 = "3ebb967819b284dc1e3c0422229b58a40a255649" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" version = "0.26.3" -[[Downloads]] -deps = ["ArgTools", "LibCURL", "NetworkOptions"] -uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" +[[Formatting]] +deps = ["Printf"] +git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" +uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" +version = "0.4.2" -[[HoldemCards]] -deps = ["Random", "Test"] -git-tree-sha1 = "fa87da35999bed73a9a48eb44cab90b921119129" +[[HoldemHandEvaluator]] +deps = ["BenchmarkTools", "Combinatorics", "PlayingCards", "Test"] +git-tree-sha1 = "1f4c602625ac40811ff42678e2b439baf20d208e" repo-rev = "main" -repo-url = "https://github.com/charleskawczynski/HoldemCards.jl" -uuid = "ecfe714a-bcc2-4d11-ad00-25525ff8f984" +repo-url = "https://github.com/charleskawczynski/HoldemHandEvaluator.jl" +uuid = "18ed25b1-892a-4a3b-b8fc-1036dc9a6a89" version = "0.1.0" [[IOCapture]] @@ -52,31 +73,28 @@ version = "0.1.1" deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +[[IteratorInterfaceExtensions]] +git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" +uuid = "82899510-4779-5014-852e-03e436cf321d" +version = "1.0.0" + [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.1" -[[LibCURL]] -deps = ["LibCURL_jll", "MozillaCACerts_jll"] -uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" - -[[LibCURL_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] -uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" - [[LibGit2]] -deps = ["Base64", "NetworkOptions", "Printf", "SHA"] +deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" -[[LibSSH2_jll]] -deps = ["Artifacts", "Libdl", "MbedTLS_jll"] -uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" - [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +[[LinearAlgebra]] +deps = ["Libdl"] +uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" + [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -84,21 +102,11 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" -[[MbedTLS_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" - [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" -[[MozillaCACerts_jll]] -uuid = "14a3606d-f60d-562e-9121-12d972cd8159" - -[[NetworkOptions]] -uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" - [[NoLimitHoldem]] -deps = ["Combinatorics", "HoldemCards", "Printf", "UnPack"] +deps = ["BenchmarkTools", "Combinatorics", "HoldemHandEvaluator", "PlayingCards", "PrettyTables", "Printf", "Test", "UnPack"] path = ".." uuid = "6cef90fc-eb55-4a2a-97d0-7ecce2b738fe" version = "0.1.0" @@ -110,21 +118,40 @@ uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" version = "1.1.0" [[Pkg]] -deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +[[PlayingCards]] +deps = ["Random", "Test"] +git-tree-sha1 = "850a44d12f6a4746c8e2183150495f393bb75a19" +repo-rev = "main" +repo-url = "https://github.com/charleskawczynski/PlayingCards.jl" +uuid = "ecfe714a-bcc2-4d11-ad00-25525ff8f984" +version = "0.1.0" + +[[PrettyTables]] +deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] +git-tree-sha1 = "574a6b3ea95f04e8757c0280bb9c29f1a5e35138" +uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" +version = "0.11.1" + [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] +deps = ["InteractiveUtils", "Markdown", "Sockets"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[Random]] deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +[[Reexport]] +git-tree-sha1 = "57d8440b0c7d98fc4f889e478e80f268d534c9d5" +uuid = "189a3867-3050-52da-a836-e630ba90ab69" +version = "1.0.0" + [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -134,16 +161,28 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" -[[TOML]] -deps = ["Dates"] -uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" +[[SparseArrays]] +deps = ["LinearAlgebra", "Random"] +uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + +[[Statistics]] +deps = ["LinearAlgebra", "SparseArrays"] +uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + +[[TableTraits]] +deps = ["IteratorInterfaceExtensions"] +git-tree-sha1 = "b1ad568ba658d8cbb3b892ed5380a6f3e781a81e" +uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" +version = "1.0.0" -[[Tar]] -deps = ["ArgTools", "SHA"] -uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" +[[Tables]] +deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] +git-tree-sha1 = "a9ff3dfec713c6677af435d6a6d65f9744feef67" +uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" +version = "1.4.1" [[Test]] -deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] +deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[UUIDs]] @@ -157,15 +196,3 @@ version = "1.0.2" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" - -[[Zlib_jll]] -deps = ["Libdl"] -uuid = "83775a58-1f1d-513f-b197-d71354ab007a" - -[[nghttp2_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" - -[[p7zip_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" diff --git a/docs/Project.toml b/docs/Project.toml index 3096e999..2a54d8d5 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,4 +1,5 @@ [deps] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -HoldemCards = "ecfe714a-bcc2-4d11-ad00-25525ff8f984" +HoldemHandEvaluator = "18ed25b1-892a-4a3b-b8fc-1036dc9a6a89" NoLimitHoldem = "6cef90fc-eb55-4a2a-97d0-7ecce2b738fe" +PlayingCards = "ecfe714a-bcc2-4d11-ad00-25525ff8f984" diff --git a/src/NoLimitHoldem.jl b/src/NoLimitHoldem.jl index 0d92866e..97ead433 100644 --- a/src/NoLimitHoldem.jl +++ b/src/NoLimitHoldem.jl @@ -1,6 +1,6 @@ module NoLimitHoldem -using HoldemCards +using PlayingCards using HoldemHandEvaluator using Combinatorics using UnPack diff --git a/test/Game.jl b/test/Game.jl index d3c62afc..a91c296e 100644 --- a/test/Game.jl +++ b/test/Game.jl @@ -1,7 +1,6 @@ using Test -using HoldemCards +using PlayingCards using NoLimitHoldem -using HoldemCards using PrettyTables const NLH = NoLimitHoldem diff --git a/test/Hand.jl b/test/Hand.jl index 2c97c773..cfad04ae 100644 --- a/test/Hand.jl +++ b/test/Hand.jl @@ -1,5 +1,5 @@ using Test -using HoldemCards +using PlayingCards using NoLimitHoldem const NLH = NoLimitHoldem