Merge pull request #3 from andrewbaxter439/no_renv

Updates to main project
andrewbaxter439 · Jul 28, 2021 · 1dccfa4 · 1dccfa4
2 parents 6763fd2 + ca1e912
commit 1dccfa4
Show file tree

Hide file tree

Showing 38 changed files with 3,433 additions and 1,485 deletions.
diff --git a/Conception rates by age and country updated.xlsx b/Conception rates by age and country updated.xlsx
diff --git a/Conception rates by age and country.xlsx b/Conception rates by age and country.xlsx
diff --git a/Data/its_outputs.xlsx b/Data/its_outputs.xlsx
diff --git a/Data/its_outputs/model 1.xlsx b/Data/its_outputs/model 1.xlsx
diff --git a/Data/its_outputs/model 10.xlsx b/Data/its_outputs/model 10.xlsx
diff --git a/Data/its_outputs/model 2.xlsx b/Data/its_outputs/model 2.xlsx
diff --git a/Data/its_outputs/model 3.xlsx b/Data/its_outputs/model 3.xlsx
diff --git a/Data/its_outputs/model 4.xlsx b/Data/its_outputs/model 4.xlsx
diff --git a/Data/its_outputs/model 5.xlsx b/Data/its_outputs/model 5.xlsx
diff --git a/Data/its_outputs/model 6.xlsx b/Data/its_outputs/model 6.xlsx
diff --git a/Data/its_outputs/model 7.xlsx b/Data/its_outputs/model 7.xlsx
diff --git a/Data/its_outputs/model 8.xlsx b/Data/its_outputs/model 8.xlsx
diff --git a/Data/its_outputs/model 9.xlsx b/Data/its_outputs/model 9.xlsx
diff --git a/Data/under-18-birth-rates.csv b/Data/under-18-birth-rates.csv
diff --git a/Data/under-20-pregnancy-rates.csv b/Data/under-20-pregnancy-rates.csv
diff --git a/R/Data completion in excel file.R b/R/Data completion in excel file.R
@@ -1,4 +1,4 @@
-library(XLConnect)
+# library(XLConnect)
 library(tidyverse)
 
 # Connect to Excel file --------------------------------------------------------------------------------------

diff --git a/R/ITS model pre-strategy fit.R b/R/ITS model pre-strategy fit.R
@@ -0,0 +1,12 @@
+library(tidyverse)
+library(readxl)
+
+output_tables <- map(excel_sheets("Data/its_outputs.xlsx"), ~
+      read_xlsx("Data/its_outputs.xlsx", sheet = .x))
+
+
+output_tables %>% 
+  map(~ filter(.x, Year < 1999, 
+               Country == "England") %>% 
+        summarise(mspe = Metrics::mse(Value, Predict),
+                  rsq = cor(Value, Predict) ^2))