Simplification of icn opt

JuliaConstraints · Jul 17, 2021 · ca47a9a · ca47a9a
1 parent f0f5f11
commit ca47a9a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/src/icn.jl b/src/icn.jl
@@ -122,18 +122,13 @@ function _compose(icn::ICN)
         end
     end
 
-    l = length(funcs[1])
-
-    composition = (x; X=zeros(length(x), l), param=nothing, dom_size) -> if l == 1
-        x |> (y -> funcs[1][1](y; param)) |> funcs[3][1] |>
-        (y -> funcs[4][1](y; param, dom_size, nvars=length(x)))
-    else
-        fill!(@view(X[1:length(x), 1:l]), 0.0)
+    function composition(x; X=zeros(length(x), length(funcs[1])), param=nothing, dom_size)
         tr_in(Tuple(funcs[1]), X, x, param)
         for i in 1:length(x)
             X[i,1] = funcs[2][1](@view X[i,:])
         end
-        funcs[3][1](@view X[:, 1]) |> (y -> funcs[4][1](y; param, dom_size, nvars=length(x)))
+        funcs[3][1](@view X[:, 1]) |>
+        (y -> funcs[4][1](y; param, dom_size, nvars=length(x)))
     end
 
     return composition, symbols

diff --git a/src/learn.jl b/src/learn.jl
@@ -111,24 +111,16 @@ function compose_to_string(symbols, name)
     ag = reduce_symbols(symbols[3], ", ", false; prefix=CN * "ag_")
     co = reduce_symbols(symbols[4], ", ", false; prefix=CN * "co_")
 
-    return if tr_length == 1
-        """
-        function $name(x; X = zeros(length(x), $tr_length), param=nothing, dom_size)
-            x |> (y -> $tr[1](y; param)) |> $ag |> (y -> $co(y; param, dom_size, nvars=length(x)))
-        end
-        """
-    else
-        """
+    output = """
         function $name(x; X = zeros(length(x), $tr_length), param=nothing, dom_size)
-            fill!(@view(X[1:length(x), 1:$tr_length]), 0.0)
             $(CN)tr_in(Tuple($tr), X, x, param)
             for i in 1:length(x)
                 X[i,1] = $ar(@view X[i,:])
             end
             return $ag(@view X[:, 1]) |> (y -> $co(y; param, dom_size, nvars=length(x)))
         end
         """
-    end
+    return output
 end
 
 """

diff --git a/test/layers.jl b/test/layers.jl
@@ -164,7 +164,7 @@ funcs_param_dom = [
 for (f, results) in funcs_param_dom
     @info f
     for (key, vals) in enumerate(data)
-        @info "Updated" f(vals.first, param=vals.second[1], dom_size=vals.second[2]) results key
+        # @info "Updated" f(vals.first, param=vals.second[1], dom_size=vals.second[2]) results key
         @test f(vals.first, param=vals.second[1], dom_size=vals.second[2]) ≈ results[key]
     end
 end
@@ -176,7 +176,7 @@ funcs_dom = [
 for (f, results) in funcs_dom
     @info f
     for (key, vals) in enumerate(data)
-        @info "Updated" f(vals.first, dom_size=vals.second[2]) results key
+        # @info "Updated" f(vals.first, dom_size=vals.second[2]) results key
         @test f(vals.first, dom_size=vals.second[2]) ≈ results[key]
     end
 end