Merge pull request #62 from JinraeKim/hotfix/maxabsnormalizer

Hotfix for NormalisedApproximator

Project.toml

@@ -1,7 +1,7 @@
 name = "ParametrisedConvexApproximators"
 uuid = "668502ff-1e8f-42bf-95c7-24f1e819f537"
 authors = ["JinraeKim <[email protected]> and contributors"]
-version = "0.2.1"
+version = "0.2.2"
 
 [deps]
 Convex = "f65535da-76fb-5f13-bab9-19810c17039a"

src/approximators/normalized_approximators.jl

@@ -28,34 +28,37 @@ function MaxAbsNormalisedApproximator(
     dataset::DecisionMakingDataset,
 )
     (; conditions, decisions, costs) = dataset
-    condition_max_abs = maximum(abs.(hcat(conditions...)), dims=length(size(conditions)))
-    decision_max_abs = maximum(abs.(hcat(decisions...)), dims=length(size(decisions)))
-    cost_max_abs = maximum(abs.(hcat(costs...)), dims=length(size(costs)))
+    c = hcat(conditions...)
+    d = hcat(decisions...)
+    J = hcat(costs...)
+    condition_max_abs = maximum(abs.(c), dims=length(size(c)))
+    decision_max_abs = maximum(abs.(d), dims=length(size(d)))
+    cost_max_abs = maximum(abs.(J), dims=length(size(J)))
     MaxAbsNormalisedApproximator(network, condition_max_abs, decision_max_abs, cost_max_abs)
 end
 
 
 function (nn::NormalisedApproximator)(x, u)
     (; network, condition_max_abs, decision_max_abs, cost_max_abs) = nn
-    x = normalise(nn, x, :condition)
-    u = normalise(nn, u, :decision)
-    f = network(x, u)
-    f = unnormalise(nn, f, :cost)
-    return f
+    x_new = normalise(nn, x, :condition)
+    u_new = normalise(nn, u, :decision)
+    f = network(x_new, u_new)
+    f_new = unnormalise(nn, f, :cost)
+    return f_new
 end
 
 
 function normalise(nn::MaxAbsNormalisedApproximator, z, which::Symbol)
     @assert which in (:condition, :decision, :cost)
     factor = getproperty(nn, Symbol(String(which) * "_max_abs"))
-    z = factor != nothing ? z ./ factor : z
-    return z
+    z_new = factor != nothing ? z ./ factor : z
+    return z_new
 end
 
 
 function unnormalise(nn::MaxAbsNormalisedApproximator, z, which::Symbol)
     @assert which in (:condition, :decision, :cost)
     factor = getproperty(nn, Symbol(String(which) * "_max_abs"))
-    z = factor != nothing ? z .* factor : z
-    return z
+    z_new = factor != nothing ? z .* factor : z
+    return z_new
 end