Also adjusting naming convention.

Author: SebKrantz

code/11_GE_simulation_trans_african/optimal_trans_african_networks_largest_pcities.jl

@@ -4,20 +4,20 @@ using OptimalTransportNetworks
 include("../helpers/helpers.jl")
 
 # Read Undirected Graph
-graph = CSV.read("data/transport_network/trans_african/fastest_routes_graph_edges.csv", DataFrame)
-histogram(graph.ug_cost, bins=100)
+edges = CSV.read("data/transport_network/trans_african/fastest_routes_graph_edges.csv", DataFrame)
+histogram(edges.ug_cost, bins=100)
 # Adjusting 
-graph.distance /= 1000    # Convert to km
-graph.border_dist /= 1000 # Convert to km
-graph.duration /= 60      # Convert to hours
-graph.total_cost = graph.ug_cost / 1e6  # Convert to millions
+edges.distance /= 1000    # Convert to km
+edges.border_dist /= 1000 # Convert to km
+edges.duration /= 60      # Convert to hours
+edges.total_cost = edges.ug_cost / 1e6  # Convert to millions
 
-n = maximum([maximum(graph.from), maximum(graph.to)])
+n = maximum([maximum(edges.from), maximum(edges.to)])
 
 # Create Adjacency Matrix
 adj_matrix = falses(n, n)
-for i in 1:size(graph, 1)
-    adj_matrix[graph.from[i], graph.to[i]] = adj_matrix[graph.to[i], graph.from[i]] = true
+for i in 1:size(edges, 1)
+    adj_matrix[edges.from[i], edges.to[i]] = adj_matrix[edges.to[i], edges.from[i]] = true
 end
 
 # Read Nodes Data
@@ -28,24 +28,24 @@ describe(nodes)
 
 # Create Infrastructure Matrix: Following Graff (2024) = average speed in km/h: length of route is accounted for in cost function
 infra_matrix = zeros(n, n)
-for i in 1:size(graph, 1)
-    speed = graph.distance[i] / graph.duration[i]
-    infra_matrix[graph.from[i], graph.to[i]] = infra_matrix[graph.to[i], graph.from[i]] = speed
+for i in 1:size(edges, 1)
+    speed = edges.distance[i] / edges.duration[i]
+    infra_matrix[edges.from[i], edges.to[i]] = infra_matrix[edges.to[i], edges.from[i]] = speed
 end
-describe(graph.distance ./ graph.duration)
+describe(edges.distance ./ edges.duration)
 
 # Create Iceberg Trade Cost Matrix: Following Graff (2024)
-# graph.distance += graph.border_dist # uncomment to enable frictions
+# edges.distance += edges.border_dist # uncomment to enable frictions
 iceberg_matrix = zeros(n, n)
-for i in 1:size(graph, 1)
-    iceberg_matrix[graph.from[i], graph.to[i]] = iceberg_matrix[graph.to[i], graph.from[i]] = 0.1158826 * log(graph.distance[i] / 1.609)
+for i in 1:size(edges, 1)
+    iceberg_matrix[edges.from[i], edges.to[i]] = iceberg_matrix[edges.to[i], edges.from[i]] = 0.1158826 * log(edges.distance[i] / 1.609)
 end
 iceberg_matrix[iceberg_matrix .< 0] .= 0
 
 # Create Infrastructure Building Cost Matrix: Following Graff (2024)
 infra_building_matrix = zeros(n, n)
-for i in 1:size(graph, 1)
-    infra_building_matrix[graph.from[i], graph.to[i]] = infra_building_matrix[graph.to[i], graph.from[i]] = graph.total_cost[i]
+for i in 1:size(edges, 1)
+    infra_building_matrix[edges.from[i], edges.to[i]] = infra_building_matrix[edges.to[i], edges.from[i]] = edges.total_cost[i]
 end
 
 # Basic characteristics of the economy
@@ -153,13 +153,13 @@ end
 res_nodes |> CSV.write("results/transport_network/GE/trans_african/nodes_results_$(filename).csv")
 
 # Saving: Graph / Edges
-res_graph = deepcopy(graph)
-res_graph.Ijk_orig = res_to_vec(infra_matrix, graph)
-res_graph.Ijk = res_to_vec(res_opt[:Ijk], graph)
+res_edges = deepcopy(edges)
+res_edges.Ijk_orig = res_to_vec(infra_matrix, edges)
+res_edges.Ijk = res_to_vec(res_opt[:Ijk], edges)
 for n in 1:N
-    res_graph[!, Symbol("Qjk_$(n)")] = res_to_vec(res_opt[:Qjkn][:,:,n], graph)
+    res_edges[!, Symbol("Qjk_$(n)")] = res_to_vec(res_opt[:Qjkn][:,:,n], edges)
 end
-res_graph |> CSV.write("results/transport_network/GE/trans_african/edges_results_$(filename).csv")
+res_edges |> CSV.write("results/transport_network/GE/trans_african/edges_results_$(filename).csv")
 
 
 

code/11_GE_simulation_trans_african/optimal_trans_african_networks_largest_pcities.m

@@ -8,21 +8,21 @@
 % With all_routes, need to set beta = 1 and CrossGoodCongestion 'off' to use efficient dual solution
 
 % Read Undirected Graph
-graph = readtable("data/transport_network/trans_african/fastest_routes_graph_edges.csv");
-% histogram(graph.ug_cost, 'BinWidth', 100);
+edges = readtable("data/transport_network/trans_african/fastest_routes_graph_edges.csv");
+% histogram(edges.ug_cost, 'BinWidth', 100);
 % Adjusting 
-graph.distance = graph.distance / 1000;       % Convert to km
-graph.border_dist = graph.border_dist / 1000; % Convert to km
-graph.duration = graph.duration / 60;         % Convert to hours
-graph.total_cost = graph.ug_cost / 1e6;       % Convert to millions
+edges.distance = edges.distance / 1000;       % Convert to km
+edges.border_dist = edges.border_dist / 1000; % Convert to km
+edges.duration = edges.duration / 60;         % Convert to hours
+edges.total_cost = edges.ug_cost / 1e6;       % Convert to millions
 
-n = max(max(graph.from), max(graph.to));
+n = max(max(edges.from), max(edges.to));
 
 % Create Adjacency Matrix
 adj_matrix = false(n, n);
-for i = 1:height(graph)
-    adj_matrix(graph.from(i), graph.to(i)) = true;
-    adj_matrix(graph.to(i), graph.from(i)) = true;
+for i = 1:height(edges)
+    adj_matrix(edges.from(i), edges.to(i)) = true;
+    adj_matrix(edges.to(i), edges.from(i)) = true;
 end
 
 % Read Nodes Data
@@ -33,27 +33,27 @@
 
 % Create Infrastructure Matrix: Following Graff (2024) = average speed in km/h: length of route is accounted for in cost function
 infra_matrix = zeros(n, n);
-for i = 1:height(graph)
-    speed = graph.distance(i) / graph.duration(i);
-    infra_matrix(graph.from(i), graph.to(i)) = speed;
-    infra_matrix(graph.to(i), graph.from(i)) = speed;
+for i = 1:height(edges)
+    speed = edges.distance(i) / edges.duration(i);
+    infra_matrix(edges.from(i), edges.to(i)) = speed;
+    infra_matrix(edges.to(i), edges.from(i)) = speed;
 end
-summary(graph.distance ./ graph.duration);
+summary(edges.distance ./ edges.duration);
 
 % Create Iceberg Trade Cost Matrix: Following Graff (2024)
-% graph.distance = graph.distance + graph.border_dist; % uncomment to enable frictions
+% edges.distance = edges.distance + edges.border_dist; % uncomment to enable frictions
 iceberg_matrix = zeros(n, n);
-for i = 1:height(graph)
-    iceberg_matrix(graph.from(i), graph.to(i)) = 0.1158826 * log(graph.distance(i) / 1.609);
-    iceberg_matrix(graph.to(i), graph.from(i)) = 0.1158826 * log(graph.distance(i) / 1.609);
+for i = 1:height(edges)
+    iceberg_matrix(edges.from(i), edges.to(i)) = 0.1158826 * log(edges.distance(i) / 1.609);
+    iceberg_matrix(edges.to(i), edges.from(i)) = 0.1158826 * log(edges.distance(i) / 1.609);
 end
 iceberg_matrix(iceberg_matrix < 0) = 0;
 
 % Create Infrastructure Building Cost Matrix: Following Graff (2024)
 infra_building_matrix = zeros(n, n);
-for i = 1:height(graph)
-    infra_building_matrix(graph.from(i), graph.to(i)) = graph.total_cost(i);
-    infra_building_matrix(graph.to(i), graph.from(i)) = graph.total_cost(i);
+for i = 1:height(edges)
+    infra_building_matrix(edges.from(i), edges.to(i)) = edges.total_cost(i);
+    infra_building_matrix(edges.to(i), edges.from(i)) = edges.total_cost(i);
 end
 
 % Basic characteristics of the economy
@@ -110,36 +110,36 @@
                         'a', a, 'sigma', sigma, 'N', N, 'alpha', alpha, 'beta', beta, 'gamma', gamma, 'rho', rho, ...
                         'verbose', 'on', 'K', K, 'TolKappa', 1e-5);
 
-[param, g] = create_graph(param,[],[],'X',nodes.lon,'Y',nodes.lat,'Type','custom','Adjacency',adj_matrix); 
+[param, graph] = create_graph(param,[],[],'X',nodes.lon,'Y',nodes.lat,'Type','custom','Adjacency',adj_matrix); 
 
 param.Lj = population; 
 param.Zjn = productivity;
 % param.omegaj = weights; % In case want to give more weight to specific locations
 param.Hj = population .* (1-alpha); % TG: I normalise this because the general utility function has a (h_j/(1-alpha))^(1-alpha) thing with it
 
-g.delta_i = infra_building_matrix;
-g.delta_tau = iceberg_matrix;
+graph.delta_i = infra_building_matrix;
+graph.delta_tau = iceberg_matrix;
 
 % Naming conventions: if IRS -> 'cgc_irs' or 'irs_na' without annealing; if alpha = 0.1 -> add '_alpha01'; if with_ports = false -> add '_noport'; if frictions -> add '_bc' (border cost)
 filename = '22g_10b_fixed_cgc_sigma38_rho0'; % adjust if sigma != 1.5
 fprintf('File extension: %s\n', filename);
 
 % Solve allocation from existing infrastructure
 strcat("Started P_stat on ", datestr(datetime('now')))
-res_stat = solve_allocation(param, g, infra_matrix, true);
+res_stat = solve_allocation(param, graph, infra_matrix, true);
 
 % Solve Optimal Network (this can take long - up to 48h)
 strcat("Started P_opt on ", datestr(datetime('now')))
-res_opt = optimal_network(param, g, infra_matrix, min_mask, max_mask, false);
+res_opt = optimal_network(param, graph, infra_matrix, min_mask, max_mask, false);
 
 % Check: should be 1
-K_ratio = K / sum(sum(res_opt.Ijk .* g.delta_i));
+K_ratio = K / sum(sum(res_opt.Ijk .* graph.delta_i));
 disp(K_ratio);
 
 % Plot Network
-plot_graph(param, g, res_opt.Ijk, 'Margin', 0.01);
+plot_graph(param, graph, res_opt.Ijk, 'Margin', 0.01);
 axis equal;
-plot_graph(param, g, res_opt.Ijk - infra_matrix, 'Margin', 0.01);
+plot_graph(param, graph, res_opt.Ijk - infra_matrix, 'Margin', 0.01);
 axis equal;
 
 % Saving: Nodes
@@ -164,10 +164,10 @@
 writetable(res_nodes, sprintf('results/transport_network/GE/trans_african/nodes_results_%s.csv', filename));
 
 % Saving: Graph / Edges
-res_graph = graph;
-res_graph.Ijk_orig = res_to_vec(infra_matrix, graph);
-res_graph.Ijk = res_to_vec(res_opt.Ijk, graph);
+res_edges = edges;
+res_edges.Ijk_orig = res_to_vec(infra_matrix, edges);
+res_edges.Ijk = res_to_vec(res_opt.Ijk, edges);
 for n = 1:N
-    res_graph = setfield(res_graph, ['Qjk_', num2str(n)], res_to_vec(res_opt.Qjkn(:,:,n), graph));
+    res_edges = setfield(res_edges, ['Qjk_', num2str(n)], res_to_vec(res_opt.Qjkn(:,:,n), edges));
 end
-writetable(res_graph, sprintf('results/transport_network/GE/trans_african/edges_results_%s.csv', filename));
+writetable(res_edges, sprintf('results/transport_network/GE/trans_african/edges_results_%s.csv', filename));