Let N only be part of parameters dict.

Author: SebKrantz

src/main/create_graph.jl

@@ -42,8 +42,7 @@ function create_graph(param, w = 11, h = 11; type = "map", kwargs...)
         graph = create_custom(options[:adjacency], options[:x], options[:y])
     end
 
-    graph[:N] = param[:N] # Ensure graph has all information
-    graph[:Zjn] = haskey(options, :Zjn) ? options[:Zjn] : ones(graph[:J], graph[:N])
+    graph[:Zjn] = haskey(options, :Zjn) ? options[:Zjn] : ones(graph[:J], param[:N])
     graph[:Hj] = haskey(options, :Hj) ? options[:Hj] : ones(graph[:J])
 
     if param[:mobility] == false

src/main/init_parameters.jl

@@ -107,8 +107,8 @@ end
 # Check if the parameters are consistent with the graph structure
 function check_graph_param(graph, param)
 
-    if haskey(param, :m) && length(param[:m]) != graph[:N]
-        @warn "m does not have the right length N = $(graph[:N])."
+    if haskey(param, :m) && length(param[:m]) != param[:N]
+        @warn "m does not have the right length N = $(param[:N])."
     end
 
     if haskey(param, :omegaj) && !haskey(graph, :omegaj)
@@ -142,8 +142,8 @@ function check_graph_param(graph, param)
     if haskey(param, :Zjn) && !haskey(graph, :Zjn)
         graph[:Zjn] = param[:Zjn]
     end
-    if haskey(graph, :Zjn) && size(graph[:Zjn]) != (graph[:J], graph[:N])
-        @warn "Zjn does not have the right size J ($(graph[:J])) x N ($(graph[:N]))."
+    if haskey(graph, :Zjn) && size(graph[:Zjn]) != (graph[:J], param[:N])
+        @warn "Zjn does not have the right size J ($(graph[:J])) x N ($(param[:N]))."
     end
 
     if haskey(param, :Hj) && !haskey(graph, :Hj)

src/main/optimal_network.jl

@@ -31,7 +31,7 @@ plot_graph(graph, results[:Ijk])
 function optimal_network(param, graph; I0=nothing, Il=nothing, Iu=nothing, verbose=false, return_model=0, solve_allocation = false)
 
     # I0=nothing; Il=nothing; Iu=nothing; verbose=false; return_model = false; return_model = 0;
-    # Check param.Zjn and make matrix if vector:
+    # Check graph.Zjn and make matrix if vector:
     if length(size(graph[:Zjn])) == 1
         graph[:Zjn] = reshape(graph[:Zjn], graph[:J], 1)
     end