From b75952697bbc5c36d6249ef738e440056fe7a0d5 Mon Sep 17 00:00:00 2001 From: Jun Tian Date: Wed, 19 Aug 2020 18:38:30 +0800 Subject: [PATCH] override RLBase.update!(model::AbstractEnvironmentModel, buffer::AbstractTrajectory) --- Project.toml | 2 +- notebooks/Manifest.toml | 62 +++++++++++----------- src/ReinforcementLearningAnIntroduction.jl | 7 +++ 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/Project.toml b/Project.toml index fcfc159..32f38ac 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ReinforcementLearningAnIntroduction" uuid = "02c1da58-b9a1-11e8-0212-f9611b8fe936" authors = ["TianJun "] -version = "0.2.1" +version = "0.2.2" [deps] DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" diff --git a/notebooks/Manifest.toml b/notebooks/Manifest.toml index b5970c1..2d14a52 100644 --- a/notebooks/Manifest.toml +++ b/notebooks/Manifest.toml @@ -76,9 +76,9 @@ version = "1.14.3+1" [[Bzip2_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "3663bfffede2ef41358b6fc2e1d8a6d50b3c3904" +git-tree-sha1 = "5ccb0770e3d1c185a52e6d36e3ffb830639ed3d2" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" -version = "1.0.6+2" +version = "1.0.6+3" [[CEnum]] git-tree-sha1 = "1b77a77c3b28e0b3f413f7567c9bb8dd9bdccd14" @@ -310,15 +310,15 @@ version = "0.10.10" [[FreeType2_jll]] deps = ["Bzip2_jll", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "7d900f32a3788d4eacac2bfa3bf5c770179c8afd" +git-tree-sha1 = "158698cb8b27eccc7a0de16b73ca7912e164d88b" uuid = "d7e528f0-a631-5988-bf34-fe36492bcfd7" -version = "2.10.1+2" +version = "2.10.1+3" [[FriBidi_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "2f56bee16bd0151de7b6a1eeea2ced190a2ad8d4" +git-tree-sha1 = "94e98e5597e745d9fb3094d89c7b0b754204c9dd" uuid = "559328eb-81f9-559d-9380-de523a88c83c" -version = "1.0.5+3" +version = "1.0.5+4" [[Future]] deps = ["Random"] @@ -437,9 +437,9 @@ version = "0.5.1" [[LAME_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "221cc8998b9060677448cbb6375f00032554c4fd" +git-tree-sha1 = "a7999edc634307964d5651265ebf7c2e14b4ef91" uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d" -version = "3.100.0+1" +version = "3.100.0+2" [[LLVM]] deps = ["CEnum", "Libdl", "Printf", "Unicode"] @@ -475,9 +475,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[Lz4_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "e1a93171a400d4578193eaa39edd2d3f5db08fb6" +git-tree-sha1 = "51b1db0732bbdcfabb60e36095cc3ed9c0016932" uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" -version = "1.9.2+0" +version = "1.9.2+2" [[MKL_jll]] deps = ["IntelOpenMP_jll", "Libdl", "Pkg"] @@ -561,21 +561,21 @@ version = "1.0.4" [[Ogg_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "59cf7a95bf5ac39feac80b796e0f39f9d69dc887" +git-tree-sha1 = "4c3275cda1ba99d1244d0b82a9d0ca871c3cf66b" uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051" -version = "1.3.4+0" +version = "1.3.4+1" [[OpenBLAS_jll]] deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"] -git-tree-sha1 = "1887096f6897306a4662f7c5af936da7d5d1a062" +git-tree-sha1 = "0c922fd9634e358622e333fc58de61f05a048492" uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.9+4" +version = "0.3.9+5" [[OpenSSL_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "d2a6f25262d568b5a7e454cf7ff5066a79d16c7d" +git-tree-sha1 = "997359379418d233767f926ea0c43f0e731735c0" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.1+2" +version = "1.1.1+5" [[OpenSpecFun_jll]] deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"] @@ -591,9 +591,9 @@ version = "0.21.0" [[Opus_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "002c18f222a542907e16c83c64a1338992da7e2c" +git-tree-sha1 = "cc90a125aa70dbb069adbda2b913b02cf2c5f6fe" uuid = "91d4177d-7536-5919-b921-800302f37372" -version = "1.3.1+1" +version = "1.3.1+2" [[OrderedCollections]] git-tree-sha1 = "12ce190210d278e12644bcadf5b21cbdcf225cd3" @@ -700,7 +700,7 @@ version = "0.2.0" deps = ["DataStructures", "Distributions", "Flux", "LinearAlgebra", "MacroTools", "Plots", "Random", "Reexport", "ReinforcementLearningBase", "ReinforcementLearningCore", "SparseArrays", "StatsBase", "StatsPlots"] path = ".." uuid = "02c1da58-b9a1-11e8-0212-f9611b8fe936" -version = "0.2.0" +version = "0.2.2" [[ReinforcementLearningBase]] deps = ["MacroTools", "Random"] @@ -728,9 +728,9 @@ version = "0.6.1" [[Rmath_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "1660f8fefbf5ab9c67560513131d4e933012fc4b" +git-tree-sha1 = "d76185aa1f421306dec73c057aa384bad74188f0" uuid = "f50d1b31-88e8-58de-be2c-1cc44531875f" -version = "0.2.2+0" +version = "0.2.2+1" [[Rotations]] deps = ["LinearAlgebra", "StaticArrays", "Statistics"] @@ -871,9 +871,9 @@ version = "0.9.1" [[Zlib_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "2f6c3e15e20e036ee0a0965879b31442b7ec50fa" +git-tree-sha1 = "d5bba6485811931e4b8958e2d7ca3738273ac468" uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+9" +version = "1.2.11+15" [[Zstd_jll]] deps = ["Libdl", "Pkg"] @@ -895,21 +895,21 @@ version = "0.2.0" [[libass_jll]] deps = ["Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "027a304b2a90de84f690949a21f94e5ae0f92c73" +git-tree-sha1 = "f02d0db58888592e98c5f4953cef620ce9274eee" uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0" -version = "0.14.0+2" +version = "0.14.0+3" [[libfdk_aac_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "480c7ed04f68ea3edd4c757f5db5b6a0a4e0bd99" +git-tree-sha1 = "e17b4513993b4413d31cffd1b36a63625ebbc3d3" uuid = "f638f0a6-7fb0-5443-88ba-1cc74229b280" -version = "0.1.6+2" +version = "0.1.6+3" [[libvorbis_jll]] deps = ["Libdl", "Ogg_jll", "Pkg"] -git-tree-sha1 = "6a66f65b5275dfa799036c8a3a26616a0a271c4a" +git-tree-sha1 = "8014e1c1033009edcfe820ec25877a9f1862ba4c" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" -version = "1.3.6+4" +version = "1.3.6+5" [[x264_jll]] deps = ["Libdl", "Pkg"] @@ -919,6 +919,6 @@ version = "2019.5.25+2" [[x265_jll]] deps = ["Libdl", "Pkg"] -git-tree-sha1 = "61324ad346b00a6e541896b94201c9426591e43a" +git-tree-sha1 = "ac7d44fa1639a780d0ae79ca1a5a7f4181131825" uuid = "dfaa095f-4041-5dcd-9319-2fabd8486b76" -version = "3.0.0+1" +version = "3.0.0+2" diff --git a/src/ReinforcementLearningAnIntroduction.jl b/src/ReinforcementLearningAnIntroduction.jl index 5374202..bd81369 100644 --- a/src/ReinforcementLearningAnIntroduction.jl +++ b/src/ReinforcementLearningAnIntroduction.jl @@ -8,6 +8,13 @@ export RLIntro @reexport using ReinforcementLearningBase @reexport using ReinforcementLearningCore +# !!! just a quick and dirty fix for +# https://github.com/JuliaReinforcementLearning/ReinforcementLearningAnIntroduction.jl/issues/17 +function RLBase.update!(model::AbstractEnvironmentModel, buffer::AbstractTrajectory) + transitions = extract_experience(buffer, model) + isnothing(transitions) || update!(model, transitions) +end + include("environments/environments.jl") include("extensions/extensions.jl")