Merge pull request #240 from Bonface-Osoro/update_capacity.py

Update capacity.r units.
Bonface-Osoro · Mar 3, 2024 · 4c44a68 · 4c44a68
2 parents 4fd16ba + e74ba08
commit 4c44a68
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/data/raw/scenarios_percs.xlsx b/data/raw/scenarios_percs.xlsx
diff --git a/validation/Total rocket emissions.xlsx b/validation/Total rocket emissions.xlsx
diff --git a/vis/capacity.r b/vis/capacity.r
@@ -22,7 +22,9 @@ data$constellation = factor(data$constellation,
 df = data %>%
   group_by(constellation, cnr_scenario) %>%
   summarize(mean = mean(channel_capacity_mbps),
-            sd = sd(channel_capacity_mbps))
+            sd = sd(channel_capacity_mbps),
+            mean_gbps = round(mean(channel_capacity_mbps)/1e3,2),
+            sd_gbps = round(sd(channel_capacity_mbps)/1e3,2))
 
 df$cnr_scenario = as.factor(df$cnr_scenario)
 df$CNR = factor(
@@ -85,12 +87,13 @@ chn_capacity <-
 ##Single Satellite Capacity##
 #############################
 
-
 df = data %>%
   group_by(constellation, cnr_scenario) %>%
   summarise(
     mean = mean(capacity_per_single_satellite_mbps),
-    sd = sd(capacity_per_single_satellite_mbps)
+    sd = sd(capacity_per_single_satellite_mbps),
+    mean_gbps = round(mean(capacity_per_single_satellite_mbps)/1e3,2),
+    sd_gbps = round(sd(capacity_per_single_satellite_mbps)/1e3,1)
   ) %>%
   ungroup()
 
@@ -163,7 +166,9 @@ df = data %>%
   group_by(constellation, cnr_scenario) %>%
   summarise(
     mean = mean(constellation_capacity_mbps * 0.65),
-    sd = sd(constellation_capacity_mbps * 0.65)
+    sd = sd(constellation_capacity_mbps * 0.65),
+    mean_gbps = round(mean(constellation_capacity_mbps * 0.65)/1e6,2),
+    sd_gbps = round(sd(constellation_capacity_mbps * 0.65)/1e6,1)
   ) %>%
   ungroup()
 
@@ -246,7 +251,8 @@ data2$constellation = factor(data2$constellation,
 df = data2 %>%
   group_by(constellation, subscriber_scenario) %>%
   summarize(mean = mean(capacity_per_user),
-            sd = sd(capacity_per_user))
+            sd = sd(capacity_per_user),
+            )
 
 df$subscriber_scenario = as.factor(df$subscriber_scenario)
 
@@ -382,11 +388,10 @@ monthly_traffic <-
 ##Average users per area##
 ##########################
 
-
 df = data2 %>%
   group_by(constellation, subscriber_scenario) %>%
-  summarize(mean = mean(user_per_area),
-            sd = sd(user_per_area))
+  summarize(mean = round(mean(user_per_area),5),
+            sd = round(sd(user_per_area),6))
 
 df$subscriber_scenario = as.factor(df$subscriber_scenario)
 

diff --git a/vis/figures/d_lca_metrics_panel.png b/vis/figures/d_lca_metrics_panel.png