Also include customization in get_model() function.

Author: SebKrantz

src/main/annealing.jl

@@ -103,29 +103,6 @@ function annealing(param, graph, I0; kwargs...)
     else
         auxdata = create_auxdata(param, graph, edges, I0)
         model, recover_allocation = get_model(param, auxdata)
-
-        # --------------
-        # CUSTOMIZATIONS
-
-        if haskey(param, :optimizer_attr)
-            for (key, value) in param.optimizer_attr
-                set_optimizer_attribute(model, String(key), value)
-            end
-        end
-
-        if haskey(param, :model_attr) 
-            for value in values(param.model_attr)
-                if !(value isa Tuple)  
-                    error("model_attr must be a dict of tuples.")
-                end
-                set_optimizer_attribute(model, value[1], value[2])
-            end
-        end
-        # E.g.:
-        # set_attribute(model,
-        #    MOI.AutomaticDifferentiationBackend(),
-        #    MathOptSymbolicAD.DefaultBackend(),
-        # )
     end
 
     if !options.verbose

src/main/helper.jl

@@ -234,6 +234,29 @@ function get_model(param, auxdata)
     else
         error("Usupported model configuration with labor_mobility = $(param.mobility) and cross_good_congestion = $(param.cong)")
     end
+
+    # --------------
+    # CUSTOMIZATIONS
+
+    if haskey(param, :optimizer_attr)
+        for (key, value) in param.optimizer_attr
+            set_optimizer_attribute(model, String(key), value)
+        end
+    end
+
+    if haskey(param, :model_attr) 
+        for value in values(param.model_attr)
+            if !(value isa Tuple)  
+                error("model_attr must be a dict of tuples.")
+            end
+            set_optimizer_attribute(model, value[1], value[2])
+        end
+    end
+    # E.g.:
+    # set_attribute(model,
+    #    MOI.AutomaticDifferentiationBackend(),
+    #    MathOptSymbolicAD.DefaultBackend(),
+    # )
     return model, recover_allocation
 end
 
@@ -262,4 +285,3 @@ function rescale_network!(param, graph, I1, Il, Iu; max_iter = 100)
 
     return I1
 end
-

src/main/optimal_network.jl

@@ -67,36 +67,12 @@ function optimal_network(param, graph; I0=nothing, Il=nothing, Iu=nothing, verbo
     # INITIALIZATION
 
     auxdata = create_auxdata(param, graph, edges, I0)
-
     model, recover_allocation = get_model(param, auxdata)
 
-    # --------------
-    # CUSTOMIZATIONS
-
     if !verbose
         set_silent(model)
     end
 
-    if haskey(param, :optimizer_attr)
-        for (key, value) in param.optimizer_attr
-            set_optimizer_attribute(model, String(key), value)
-        end
-    end
-
-    if haskey(param, :model_attr) 
-        for value in values(param.model_attr)
-            if !(value isa Tuple)  
-                error("model_attr must be a dict of tuples.")
-            end
-            set_optimizer_attribute(model, value[1], value[2])
-        end
-    end
-    # E.g.:
-    # set_attribute(model,
-    #    MOI.AutomaticDifferentiationBackend(),
-    #    MathOptSymbolicAD.DefaultBackend(),
-    # )
-
     if return_model == 1
         return model, recover_allocation
     end