Error

mivanic · Jan 31, 2025 · 3507dd8 · 3507dd8
1 parent f880036
commit 3507dd8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/build_model!.jl b/src/build_model!.jl
@@ -1,11 +1,11 @@
 function build_model!(mc; max_iter=50, constr_viol_tol=1e-8, bound_push=1e-15)
 
     # Structural parameters (some CES/CET options are not happening)
-    δ_evfp = .!isnan.(mc.data["α_qfe"])
-    δ_maks = .!isnan.(mc.data["α_qca"])
-    δ_vtwr = .!isnan.(mc.data["α_qtmfsd"])
-    δ_vtwr_sum = NamedArray(.!mapslices(all, isnan.(mc.data["α_qtmfsd"]), dims=1)[1, :, :, :], names(mc.data["vtwr"])[[2, 3, 4]])
-    δ_qxs = .!isnan.(mc.data["α_qxs"])
+    δ_evfp = .!isnan.(mc.data["α_qfe"]) .&& mc.data["α_qfe"] .!= 0
+    δ_maks = .!isnan.(mc.data["α_qca"]) .&& mc.data["α_qca"] .!= 0
+    δ_vtwr = .!isnan.(mc.data["α_qtmfsd"]) .&& mc.data["α_qtmfsd"] .!= 0
+    δ_vtwr_sum = NamedArray(.!mapslices(all, isnan.(mc.data["α_qtmfsd"]) .|| mc.data["α_qtmfsd"] .== 0, dims=1)[1, :, :, :], names(mc.data["vtwr"])[[2, 3, 4]])
+    δ_qxs = .!isnan.(mc.data["α_qxs"]) .&& mc.data["α_qxs"] .!= 0
 
     # Read  sets
     (; reg, comm, marg, acts, endw, endwc, endws, endwm, endwms, endwf) = NamedTuple(Dict(Symbol(k) => mc.sets[k] for k ∈ keys(mc.sets)))