flattening equations solved it. multi-country-sector model parses

thorek1 · Nov 10, 2024 · d041cd7 · d041cd7
1 parent 4d492fd
commit d041cd7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/MacroModelling.jl b/src/MacroModelling.jl
@@ -1852,7 +1852,7 @@ end
 
 function write_out_for_loops(arg::Expr)
     postwalk(x -> begin
-                    x = unblock(x)
+                    x = flatten(unblock(x))
                     x isa Expr ?
                         x.head == :for ?
                             x.args[2] isa Array ?
@@ -1887,11 +1887,11 @@ function write_out_for_loops(arg::Expr)
                                                 # end 
                                                 # : # for loop part of equation
                             # begin println(x); 
-                                (replace_indices_inside_for_loop(unblock(x.args[2]), 
+                                replace_indices_inside_for_loop(unblock(x.args[2]), 
                                                 Symbol(x.args[1].args[1]), 
                                                 (x.args[1].args[2]),
                                                 false,
-                                                :+)) :
+                                                :+) :
                                                 # println(out); 
                                                 # return out end 
                                                 # :
@@ -1970,7 +1970,7 @@ function parse_for_loops(equations_block)
 
         end
     end
-    return Expr(:block,eqs...)
+    return Expr(:block,eqs...) |> flatten
 end
 
 

diff --git a/src/macros.jl b/src/macros.jl
@@ -1,5 +1,5 @@
 
-import MacroTools: unblock, postwalk, @capture
+import MacroTools: unblock, postwalk, @capture, flatten
 
 const all_available_algorithms = [:linear_time_iteration, :riccati, :first_order, :first_order_doubling, :quadratic_iteration, :binder_pesaran, :second_order, :pruned_second_order, :third_order, :pruned_third_order]
 
@@ -303,7 +303,7 @@ macro model(𝓂,ex...)
                     x :
                 x,
             model_ex.args[i])
-            push!(ss_equations,unblock(eqs))
+            push!(ss_equations,flatten(unblock(eqs)))
 
             # write down ss equations including nonnegativity auxilliary variables
             # find nonegative variables, parameters, or terms