From ced0f631390bafc54494cc1b9a0fa50e9b3be6ab Mon Sep 17 00:00:00 2001 From: azzaare Date: Wed, 13 Jan 2021 20:08:54 +0900 Subject: [PATCH 1/6] temp save --- src/learn.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/learn.jl b/src/learn.jl index 0f006b9..cb7c714 100644 --- a/src/learn.jl +++ b/src/learn.jl @@ -72,7 +72,8 @@ function _compose_to_string(symbols, name) co = _reduce_symbols(symbols[4], ", ", false; prefix=CN * "_co_") julia_string = """ - $name = x -> fill(x, $tr_length) .|> $tr |> $ar |> $ag |> $co + function $name(x; param=nothing, dom_size) + fill(x, $tr_length) .|> map(f -> (y -> f(y; param=$param)), $tr) |> $ar |> $ag |> (y -> $co(y; param=$param, dom_size=$dom_size, nvars=$(length(x)))) """ return julia_string From 234be34ebe99ae3c6249c36a2303477480bf576d Mon Sep 17 00:00:00 2001 From: Azzaare Date: Thu, 14 Jan 2021 11:50:50 +0900 Subject: [PATCH 2/6] Typo in string evaluation --- src/learn.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/learn.jl b/src/learn.jl index cb7c714..9a18cd5 100644 --- a/src/learn.jl +++ b/src/learn.jl @@ -73,7 +73,7 @@ function _compose_to_string(symbols, name) julia_string = """ function $name(x; param=nothing, dom_size) - fill(x, $tr_length) .|> map(f -> (y -> f(y; param=$param)), $tr) |> $ar |> $ag |> (y -> $co(y; param=$param, dom_size=$dom_size, nvars=$(length(x)))) + fill(x, $tr_length) .|> map(f -> (y -> f(y; param=$param)), $tr) |> $ar |> $ag |> (y -> $co(y; param=$param, dom_size=$dom_size, nvars=length(x))) """ return julia_string From d19ba1ed6b23100a09934b5e883ee5c73bf9a4a8 Mon Sep 17 00:00:00 2001 From: Azzaare Date: Thu, 14 Jan 2021 11:53:15 +0900 Subject: [PATCH 3/6] Typo in string evaluation 2/? --- src/learn.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/learn.jl b/src/learn.jl index 9a18cd5..c0d5b19 100644 --- a/src/learn.jl +++ b/src/learn.jl @@ -73,7 +73,7 @@ function _compose_to_string(symbols, name) julia_string = """ function $name(x; param=nothing, dom_size) - fill(x, $tr_length) .|> map(f -> (y -> f(y; param=$param)), $tr) |> $ar |> $ag |> (y -> $co(y; param=$param, dom_size=$dom_size, nvars=length(x))) + fill(x, $tr_length) .|> map(f -> (y -> f(y; param=param)), $tr) |> $ar |> $ag |> (y -> $co(y; param=param, dom_size=$dom_size, nvars=length(x))) """ return julia_string From 19606f34d8bd492161acb8dc3283ce44d2152124 Mon Sep 17 00:00:00 2001 From: Azzaare Date: Thu, 14 Jan 2021 11:54:19 +0900 Subject: [PATCH 4/6] Typo in string evaluation 3/? --- src/learn.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/learn.jl b/src/learn.jl index c0d5b19..249384d 100644 --- a/src/learn.jl +++ b/src/learn.jl @@ -73,7 +73,7 @@ function _compose_to_string(symbols, name) julia_string = """ function $name(x; param=nothing, dom_size) - fill(x, $tr_length) .|> map(f -> (y -> f(y; param=param)), $tr) |> $ar |> $ag |> (y -> $co(y; param=param, dom_size=$dom_size, nvars=length(x))) + fill(x, $tr_length) .|> map(f -> (y -> f(y; param=param)), $tr) |> $ar |> $ag |> (y -> $co(y; param=param, dom_size=dom_size, nvars=length(x))) """ return julia_string From 2298b203e1baff52ef2e0d18803e095252bc538a Mon Sep 17 00:00:00 2001 From: Azzaare Date: Thu, 14 Jan 2021 11:59:58 +0900 Subject: [PATCH 5/6] Typo in string evaluation 4/? --- src/learn.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/learn.jl b/src/learn.jl index 249384d..9634297 100644 --- a/src/learn.jl +++ b/src/learn.jl @@ -74,6 +74,7 @@ function _compose_to_string(symbols, name) julia_string = """ function $name(x; param=nothing, dom_size) fill(x, $tr_length) .|> map(f -> (y -> f(y; param=param)), $tr) |> $ar |> $ag |> (y -> $co(y; param=param, dom_size=dom_size, nvars=length(x))) + end """ return julia_string From 7f12bc5ead9e95e9cb83f6c35317635826cb954b Mon Sep 17 00:00:00 2001 From: Azzaare Date: Thu, 14 Jan 2021 13:01:29 +0900 Subject: [PATCH 6/6] Typo in string evaluation 5/? --- Project.toml | 2 +- src/learn.jl | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Project.toml b/Project.toml index 87295f3..3fa760b 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "CompositionalNetworks" uuid = "4b67e4b5-442d-4ef5-b760-3f5df3a57537" authors = ["Jean-François Baffier"] -version = "0.1.1" +version = "0.1.2" [deps] ConstraintDomains = "5800fd60-8556-4464-8d61-84ebf7a0bedb" diff --git a/src/learn.jl b/src/learn.jl index 9634297..4fc540a 100644 --- a/src/learn.jl +++ b/src/learn.jl @@ -1,17 +1,17 @@ -function _partial_search_space(domains, concept; sol_number=100) +function _partial_search_space(domains, concept, param=nothing; sol_number=100) solutions = Set{Vector{Int}}() non_sltns = Set{Vector{Int}}() while length(solutions) < 100 || length(non_sltns) < 100 config = map(_draw, domains) - c = concept(config) + c = concept(config; param = param) c && length(solutions) < 100 && push!(solutions, config) !c && length(non_sltns) < 100 && push!(non_sltns, config) end return solutions, non_sltns end -function _complete_search_space(domains, concept) +function _complete_search_space(domains, concept, param=nothing) solutions = Set{Vector{Int}}() non_sltns = Set{Vector{Int}}() @@ -24,8 +24,10 @@ function _complete_search_space(domains, concept) @warn message space_size end + f = isnothing(param) ? ((x; param = p) -> concept(x)) : concept + configurations = product(map(d -> _get_domain(d), domains)...) - foreach(c -> (cv = collect(c); push!(concept(cv) ? solutions : non_sltns, cv)), configurations) + foreach(c -> (cv = collect(c); push!(f(cv; param=param) ? solutions : non_sltns, cv)), configurations) return solutions, non_sltns end @@ -54,7 +56,7 @@ function explore_learn_compose(concept; domains, param=nothing, ) dom_size = maximum(_length, domains) if search == :complete - X_sols, X = _complete_search_space(domains, concept) + X_sols, X = _complete_search_space(domains, concept, param) union!(X, X_sols) return learn_compose(X, X_sols, dom_size, param; local_iter=local_iter, global_iter=global_iter, action=action)