From 69d3d6235c216fafca30a492e36877d9535f206a Mon Sep 17 00:00:00 2001 From: Harrison Grodin Date: Thu, 3 Jan 2019 11:41:19 -0500 Subject: [PATCH] Revert #63 --- Manifest.toml | 10 +++------- Project.toml | 1 - src/rule.jl | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 4d2efe9..38c4bac 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,3 +1,5 @@ +# This file is machine-generated - editing it directly is not advised + [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -28,7 +30,7 @@ uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "0.0.7" [[Distributed]] -deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"] +deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[InteractiveUtils]] @@ -58,12 +60,6 @@ version = "0.4.4" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" -[[Memoize]] -deps = ["Test"] -git-tree-sha1 = "d9683969337ad20dc957122038bd2c0ead4b5209" -uuid = "c03570c3-d221-55d1-a50c-7939bbd78826" -version = "0.3.0" - [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" diff --git a/Project.toml b/Project.toml index ccbb503..c5d701c 100644 --- a/Project.toml +++ b/Project.toml @@ -6,7 +6,6 @@ version = "0.1.0" [deps] Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" DiffRules = "b552c78f-8df3-52c6-915a-8e097449b14b" -Memoize = "c03570c3-d221-55d1-a50c-7939bbd78826" MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" SpecialSets = "c6b63f46-9023-11e8-3b28-1f7d8c94880d" diff --git a/src/rule.jl b/src/rule.jl index 97a463f..507ccdd 100644 --- a/src/rule.jl +++ b/src/rule.jl @@ -1,4 +1,4 @@ -using DiffRules, Memoize +using DiffRules export Rules export normalize @@ -26,7 +26,7 @@ Base.vcat(rss::Rules...) = Rules([(rs.rules for rs ∈ rss)...;]) normalize(rs::Rules) = Base.Fix2(normalize, rs) -@memoize function normalize(t::Term, rs::Rules) +function normalize(t::Term, rs::Rules) while true t = map(normalize(rs), t) # FIXME: replace with `subexpressions` t′ = foldl(normalize, rs; init=t)