From 914a75f178896dea9240970f87af9599af035c65 Mon Sep 17 00:00:00 2001 From: Fredrik Bagge Carlson Date: Mon, 8 Apr 2019 16:42:59 +0200 Subject: [PATCH] Switch to Project.toml * switch from require to project.toml * add to project.toml * set random seed in tests --- Manifest.toml | 60 ++++++++++++++++----------------------------- Project.toml | 18 ++++++++++++++ README.md | 3 --- REQUIRE | 4 --- test/test_readme.jl | 3 ++- 5 files changed, 41 insertions(+), 47 deletions(-) create mode 100644 Project.toml delete mode 100644 REQUIRE diff --git a/Manifest.toml b/Manifest.toml index 92315e1..256450d 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,35 +1,22 @@ +# This file is machine-generated - editing it directly is not advised + [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[DataStructures]] -deps = ["InteractiveUtils", "OrderedCollections", "REPL", "Random", "Serialization", "Test"] -git-tree-sha1 = "8fc6e166e24fda04b2b648d4260cdad241788c54" +deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"] +git-tree-sha1 = "ca971f03e146cf144a9e2f2ce59674f5bf0e8038" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.14.0" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +version = "0.15.0" [[Distributed]] -deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"] +deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[InteractiveUtils]] -deps = ["LinearAlgebra", "Markdown"] +deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -[[LinearTimeVaryingModelsBase]] -deps = ["Parameters"] -git-tree-sha1 = "4623f37a512b7e2a495ba1993c521e49188b545a" -repo-rev = "master" -repo-url = "https://github.com/baggepinnen/LinearTimeVaryingModelsBase.jl/" -uuid = "52bd5b67-3fca-59a1-821b-f5f08aa0287b" -version = "0.0.0" - -[[LibGit2]] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -37,6 +24,12 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +[[LinearTimeVaryingModelsBase]] +deps = ["LinearAlgebra", "Parameters", "Statistics", "Test"] +git-tree-sha1 = "3cae15eaf6a162c475ec2a624e20f1502b028991" +uuid = "5e7a79f3-ee03-5374-bd42-db9a52b6e959" +version = "0.2.1" + [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -45,20 +38,16 @@ deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[OrderedCollections]] -deps = ["Pkg", "Random", "Serialization", "Test"] +deps = ["Random", "Serialization", "Test"] git-tree-sha1 = "85619a3f3e17bb4761fe1b1fd47f0e979f964d5b" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.0.2" [[Parameters]] -deps = ["Markdown", "OrderedCollections", "Pkg", "REPL", "Test"] -git-tree-sha1 = "40f540ec96e50c0b2b9efdb11b5e4d0c63f90923" +deps = ["Markdown", "OrderedCollections", "REPL", "Test"] +git-tree-sha1 = "70bdbfb2bceabb15345c0b54be4544813b3444e4" uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" -version = "0.10.1" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +version = "0.10.3" [[Printf]] deps = ["Unicode"] @@ -73,7 +62,7 @@ deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[RecipesBase]] -deps = ["Pkg", "Random", "Test"] +deps = ["Random", "Test"] git-tree-sha1 = "0b3cb370ee4dc00f47f1193101600949f3dcf884" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" version = "0.6.0" @@ -84,9 +73,6 @@ git-tree-sha1 = "f6fbf4ba64d295e146e49e021207993b6b48c7d1" uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "0.5.2" -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -105,15 +91,11 @@ 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" [[ValueHistories]] -deps = ["DataStructures", "Pkg", "Random", "RecipesBase", "Test"] -git-tree-sha1 = "6d698a23adf7d802b222c18428ee8e58de649de0" +deps = ["DataStructures", "Random", "RecipesBase", "Test"] +git-tree-sha1 = "37f692be32132346b7e867ac7565a01b7a1592be" uuid = "98cad3c8-aec3-5f06-8e41-884608649ab7" -version = "0.5.0" +version = "0.5.1" diff --git a/Project.toml b/Project.toml new file mode 100644 index 0000000..52dda97 --- /dev/null +++ b/Project.toml @@ -0,0 +1,18 @@ +name = "DifferentialDynamicProgramming" +uuid = "9cd584b6-1a68-5b24-b787-24af5fbbf48b" +author = ["Fredrik Bagge Carlson "] +repo = "https://github.com/baggepinnen/DifferentialDynamicProgramming.jl.git" +version = "0.4.0" + +[deps] +LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +LinearTimeVaryingModelsBase = "5e7a79f3-ee03-5374-bd42-db9a52b6e959" +Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +Requires = "ae029012-a4dd-5104-9daa-d747884805df" +Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +ValueHistories = "98cad3c8-aec3-5f06-8e41-884608649ab7" + +[compat] +julia = "1.1" diff --git a/README.md b/README.md index 6a1ecef..dd6c033 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ # DifferentialDynamicProgramming -[![DifferentialDynamicProgramming](http://pkg.julialang.org/badges/DifferentialDynamicProgramming_0.4.svg)](http://pkg.julialang.org/?pkg=DifferentialDynamicProgramming) -[![DifferentialDynamicProgramming](http://pkg.julialang.org/badges/DifferentialDynamicProgramming_0.5.svg)](http://pkg.julialang.org/?pkg=DifferentialDynamicProgramming) -[![DifferentialDynamicProgramming](http://pkg.julialang.org/badges/DifferentialDynamicProgramming_0.6.svg)](http://pkg.julialang.org/?pkg=DifferentialDynamicProgramming) [![Build Status](https://travis-ci.org/baggepinnen/DifferentialDynamicProgramming.jl.svg?branch=master)](https://travis-ci.org/baggepinnen/DifferentialDynamicProgramming.jl) [![Coverage Status](https://coveralls.io/repos/github/baggepinnen/DifferentialDynamicProgramming.jl/badge.png?branch=master)](https://coveralls.io/github/baggepinnen/DifferentialDynamicProgramming.jl?branch=master) diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index c8de139..0000000 --- a/REQUIRE +++ /dev/null @@ -1,4 +0,0 @@ -julia 1.1 -LinearTimeVaryingModelsBase -Requires -ValueHistories diff --git a/test/test_readme.jl b/test/test_readme.jl index 3fb427a..439c3bb 100644 --- a/test/test_readme.jl +++ b/test/test_readme.jl @@ -1,5 +1,6 @@ -using Test, Statistics, LinearAlgebra +using Test, Statistics, LinearAlgebra, Random # make stable linear dynamics +Random.seed!(0) eye = DifferentialDynamicProgramming.eye costs = map(1:10) do MCiteration h = .01 # time step