diff --git a/Manifest.toml b/Manifest.toml index 39d3cc8..bbc87ae 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.12.1" manifest_format = "2.0" -project_hash = "8a1366f01fdc86b8cec7588b2642a428f8711411" +project_hash = "c7a2fd47754abe433f089d6232e90fcb82c87f85" [[deps.AliasTables]] deps = ["PtrArrays", "Random"] @@ -29,6 +29,12 @@ git-tree-sha1 = "deddd8725e5e1cc49ee205a1964256043720a6c3" uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" version = "0.10.15" +[[deps.CodeTracking]] +deps = ["InteractiveUtils", "UUIDs"] +git-tree-sha1 = "9ce926a33a8608421a4d45c012884165b3fcd3ee" +uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2" +version = "2.0.2" + [[deps.CodecBase]] deps = ["TranscodingStreams"] git-tree-sha1 = "40956acdbef3d8c7cc38cba42b56034af8f8581a" @@ -51,6 +57,11 @@ weakdeps = ["Dates", "LinearAlgebra"] [deps.Compat.extensions] CompatLinearAlgebraExt = "LinearAlgebra" +[[deps.Compiler]] +git-tree-sha1 = "382d79bfe72a406294faca39ef0c3cef6e6ce1f1" +uuid = "807dbc54-b67e-4c79-8afb-eafe4df6f2e1" +version = "0.1.1" + [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" @@ -123,6 +134,10 @@ version = "0.9.24" Mmap = "a63ad114-7e13-5084-954f-fe012c677804" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[deps.FileWatching]] +uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" +version = "1.11.0" + [[deps.FillArrays]] deps = ["LinearAlgebra"] git-tree-sha1 = "5bfcd42851cf2f1b303f51525a54dc5e98d408a3" @@ -220,6 +235,12 @@ version = "1.14.3" [deps.JSON3.weakdeps] ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd" +[[deps.JuliaInterpreter]] +deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"] +git-tree-sha1 = "b6c76964c65ebf8309460fb8f0f437b4a59d809b" +uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a" +version = "0.10.7" + [[deps.JuliaSyntaxHighlighting]] deps = ["StyledStrings"] uuid = "ac6e5ff7-fb65-4e79-a425-ec3bc9c03011" @@ -230,6 +251,21 @@ git-tree-sha1 = "dda21b8cbd6a6c40d9d02a73230f9d70fed6918c" uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" version = "1.4.0" +[[deps.LibGit2]] +deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"] +uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +version = "1.11.0" + +[[deps.LibGit2_jll]] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"] +uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" +version = "1.9.0+0" + +[[deps.LibSSH2_jll]] +deps = ["Artifacts", "Libdl", "OpenSSL_jll"] +uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" +version = "1.11.3+1" + [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" version = "1.11.0" @@ -259,6 +295,12 @@ version = "0.3.29" uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" version = "1.11.0" +[[deps.LoweredCodeUtils]] +deps = ["CodeTracking", "Compiler", "JuliaInterpreter"] +git-tree-sha1 = "e24491cb83551e44a69b9106c50666dea9d953ab" +uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b" +version = "3.4.4" + [[deps.Markdown]] deps = ["Base64", "JuliaSyntaxHighlighting", "StyledStrings"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" @@ -316,6 +358,11 @@ deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" version = "0.8.7+0" +[[deps.OpenSSL_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" +version = "3.5.1+0" + [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] git-tree-sha1 = "1346c9208249809840c91b26703912dff463d335" @@ -409,6 +456,24 @@ git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" uuid = "189a3867-3050-52da-a836-e630ba90ab69" version = "1.2.2" +[[deps.Requires]] +deps = ["UUIDs"] +git-tree-sha1 = "62389eeff14780bfe55195b7204c0d8738436d64" +uuid = "ae029012-a4dd-5104-9daa-d747884805df" +version = "1.3.1" + +[[deps.Revise]] +deps = ["CodeTracking", "FileWatching", "JuliaInterpreter", "LibGit2", "LoweredCodeUtils", "OrderedCollections", "REPL", "Requires", "UUIDs", "Unicode"] +git-tree-sha1 = "85d94c2be31f58728cd69d13f2e0bdd7ecf6dfe9" +uuid = "295af30f-e4ad-537b-8983-00126c2a3abe" +version = "3.12.1" + + [deps.Revise.extensions] + DistributedExt = "Distributed" + + [deps.Revise.weakdeps] + Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" + [[deps.Rmath]] deps = ["Random", "Rmath_jll"] git-tree-sha1 = "5b3d50eb374cea306873b371d3f8d3915a018f0b" diff --git a/Project.toml b/Project.toml index b8b5e5d..c25f415 100644 --- a/Project.toml +++ b/Project.toml @@ -13,9 +13,11 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" NATS = "55e73f9c-eeeb-467f-b4cc-a633fde63d2a" PrettyPrinting = "54e16d92-306c-5ea0-a30b-337be88ac337" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce" UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] JSON = "1.3.0" NATS = "0.1.0" +Revise = "3.12.1" diff --git a/src/interface.jl b/src/interface.jl index 2a41697..ba15b2f 100644 --- a/src/interface.jl +++ b/src/interface.jl @@ -187,23 +187,24 @@ end # ---------------------------------------------- 100 --------------------------------------------- # -""" Array_to_JSON3_str(data::AbstractArray) - encode Array to JSON3 String +""" Array_to_JSON_str(data::AbstractArray) + + encode Array to JSON String # Example a = [1.23 4.7889; 9987.1 -123.07; -0.0027 -6.75] - json3_str = Array_to_JSON3_str(a) - - json3_str = {"Array":[1.23,9987.1,-0.0027,4.7889,-123.07,-6.75],"size":[3,2]} + jsonStr = Array_to_JSON_str(a) + jsonStr = "{\"Array\":[[1.23,9987.1,-0.0027],[4.7889,-123.07,-6.75]],\"size\":[3,2]}" """ -function Array_to_JSON3_str(data::AbstractArray) - d = Dict("Array"=> data, "size"=>size(data)) - json3_str = JSON3.write(d) - return json3_str +function Array_to_JSON_str(data::AbstractArray) + d = Dict("Array"=> data, "size"=>size(data)) + jsonStr = JSON.json(d) + return jsonStr end + # ---------------------------------------------- 100 --------------------------------------------- # """ JSON3_str_to_Array(json3_str::String) @@ -223,6 +224,25 @@ function JSON3_str_to_Array(json3_str::String) return array end +#[WORKING] +""" JSON_str_to_Array(json_str::String) + + decode JSON String to Array + + # Example + + jsonStr = "{\"Array\":[[1.23,9987.1,-0.0027],[4.7889,-123.07,-6.75]],\"size\":[3,2]}" + a = JSON_str_to_Array(jsonStr) + +""" +function JSON_str_to_Array(jsonStr::String) + jsonObj = JSON.parse(jsonStr) + array = reshape(Array(jsonObj.Array), (jsonObj.size[1], jsonObj.size[2])) + return array +end + + + # ---------------------------------------------- 100 --------------------------------------------- # """ Convert JSON3.read object to OrderedDict