Merge pull request #320 from Triangle-Modeling-and-Analytics/dev

v1.3
Triangle-Modeling-and-Analytics · Sep 19, 2023 · 7448434 · 7448434
2 parents db7294e + f31a7aa
commit 7448434
Show file tree

Hide file tree

Showing 87 changed files with 3,642 additions and 1,519 deletions.
diff --git a/README.md b/README.md
@@ -1,23 +1,21 @@
 # TRMG2
 The second generation of the Triangle Regional Model.
 
-Project stakeholders include:
-
-- ITRE
-- CAMPO
-- DCHC
-- NCDOT
-- GoTriangle
-- Caliper
-- WSP
-
-Development documentation can be found here:  
+Development documentation:  
 https://triangle-modeling-and-analytics.github.io/TRMG2/
 
-The user's guide wiki is located here:  
+User's guide:  
 https://github.com/Triangle-Modeling-and-Analytics/TRMG2/wiki
 
+Official model releases:
+https://github.com/Triangle-Modeling-and-Analytics/TRMG2/releases
+
+Project stakeholders:
+ITRE, CAMPO, DCHC, NCDOT, GoTriangle
+
+Model developers:
+Caliper & WSP
+
 Client PM: Leta Huntsinger  
 Caliper PM: Vince Bernardin  
-Caliper DPM: Kyle Ward  
-
+Caliper DPM: Kyle Ward
diff --git a/docs/renv.lock b/docs/renv.lock
@@ -93,18 +93,6 @@
       "Repository": "CRAN",
       "Hash": "e031418365a7f7a766181ab5a41a5716"
     },
-    "RDCOMClient": {
-      "Package": "RDCOMClient",
-      "Version": "0.95-0",
-      "Source": "GitHub",
-      "RemoteType": "github",
-      "RemoteHost": "api.github.com",
-      "RemoteRepo": "RDCOMClient",
-      "RemoteUsername": "dkyleward",
-      "RemoteRef": "HEAD",
-      "RemoteSha": "8ce0463a1ae27541f38b9fd877c2c87770575921",
-      "Hash": "a67b840fe7f5b8865aa238ae8b32ec86"
-    },
     "Rcpp": {
       "Package": "Rcpp",
       "Version": "1.0.5",
@@ -168,6 +156,20 @@
       "Repository": "CRAN",
       "Hash": "9addc7e2c5954eca5719928131fed98c"
     },
+    "bookdown": {
+      "Package": "bookdown",
+      "Version": "0.24",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Hash": "3837766a1e1b527af25fa3e2d12a2800"
+    },
+    "boot": {
+      "Package": "boot",
+      "Version": "1.3-25",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Hash": "bd51734a754b6c2baf28b2d1ebc11e91"
+    },
     "brio": {
       "Package": "brio",
       "Version": "1.1.0",
@@ -189,13 +191,6 @@
       "Repository": "CRAN",
       "Hash": "34d90fa5845004236b9eacafc51d07b2"
     },
-    "caliperR": {
-      "Package": "caliperR",
-      "Version": "1.0.0",
-      "Source": "unknown",
-      "Remotes": "Caliper-Corporation/RDCOMClient",
-      "Hash": "841acc24eda79bcc3428ad472ba7e7f6"
-    },
     "callr": {
       "Package": "callr",
       "Version": "3.5.1",
@@ -957,6 +952,13 @@
       "Repository": "CRAN",
       "Hash": "320017b52d05a943981272b295750388"
     },
+    "rmdformats": {
+      "Package": "rmdformats",
+      "Version": "1.0.3",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Hash": "eff584cded25f9016463e0087436498a"
+    },
     "rpart": {
       "Package": "rpart",
       "Version": "4.1-15",
@@ -1027,6 +1029,13 @@
       "Repository": "CRAN",
       "Hash": "e0485290545c0e768c2b50390114da1f"
     },
+    "spatial": {
+      "Package": "spatial",
+      "Version": "7.3-12",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Hash": "58a02ce0150652b96c044bc67a0df2e5"
+    },
     "stringi": {
       "Package": "stringi",
       "Version": "1.5.3",

diff --git a/docs/resident_dest_choice.Rmd b/docs/resident_dest_choice.Rmd
@@ -13,7 +13,6 @@ options(dplyr.summarise.inform = FALSE)
 options(scipen = 999)
 
 library(tidyverse)
-library(caliperR)
 library(sf)
 library(knitr)
 library(kableExtra)

diff --git a/master/accessibility/accessibilities.csv b/master/accessibility/accessibilities.csv
@@ -21,8 +21,8 @@ Service_RateHigh,5.6,1.2,0,5.6,1,0,
 Office,3,0.5,0,3,1,0,
 Industry,3,0.5,0,3,1,0,
 Hospital,0,0,0,0,0,10,
-wHH,0,0,0.037543,0,0,0,
-wK12,0,0,0.005133,0,0,0,
+wHH,0,0,0.037543,0,0,0,These fields are interactions between the zone's walkability score and the attractor
+wK12,0,0,0.005133,0,0,0,"e.g. ""walkability * K12 enrollment"""
 wStudGQ_NCSU,0,0,0.021174,0,0,0,
 wStudGQ_UNC,0,0,0.021174,0,0,0,
 wStudGQ_DUKE,0,0,0.021174,0,0,0,

diff --git a/master/networks/init_cong_time_2020.bin b/master/networks/init_cong_time_2020.bin
diff --git a/master/networks/init_cong_time_2030.DCB b/master/networks/init_cong_time_2030.DCB
@@ -0,0 +1,11 @@
+
+68
+"ID",I,1,4,0,10,0,,"","",,"Sum",
+"ABInitCongTimeAM",R,5,8,0,10,4,,"","Do not edit this field unless updating the model||This initial congested time comes from a converged|model run. It's purpose is to speed up model run time|by reducing the number of feedback iterations|required. If a link does not have a value in this|field, the model will use the free-flow speed|instead.",,"Sum",
+"BAInitCongTimeAM",R,13,8,0,10,4,,"","",,"Sum",
+"ABInitCongTimeMD",R,21,8,0,10,4,,"","",,"Sum",
+"BAInitCongTimeMD",R,29,8,0,10,4,,"","",,"Sum",
+"ABInitCongTimePM",R,37,8,0,10,4,,"","",,"Sum",
+"BAInitCongTimePM",R,45,8,0,10,4,,"","",,"Sum",
+"ABInitCongTimeNT",R,53,8,0,10,4,,"","",,"Sum",
+"BAInitCongTimeNT",R,61,8,0,10,4,,"","",,"Sum",
diff --git a/master/networks/init_cong_time_2030.bin b/master/networks/init_cong_time_2030.bin
diff --git a/master/networks/init_cong_time_2040.DCB b/master/networks/init_cong_time_2040.DCB
@@ -0,0 +1,11 @@
+
+68
+"ID",I,1,4,0,10,0,,"","",,"Sum",
+"ABInitCongTimeAM",R,5,8,0,10,4,,"","Do not edit this field unless updating the model||This initial congested time comes from a converged|model run. It's purpose is to speed up model run time|by reducing the number of feedback iterations|required. If a link does not have a value in this|field, the model will use the free-flow speed|instead.",,"Sum",
+"BAInitCongTimeAM",R,13,8,0,10,4,,"","",,"Sum",
+"ABInitCongTimeMD",R,21,8,0,10,4,,"","",,"Sum",
+"BAInitCongTimeMD",R,29,8,0,10,4,,"","",,"Sum",
+"ABInitCongTimePM",R,37,8,0,10,4,,"","",,"Sum",
+"BAInitCongTimePM",R,45,8,0,10,4,,"","",,"Sum",
+"ABInitCongTimeNT",R,53,8,0,10,4,,"","",,"Sum",
+"BAInitCongTimeNT",R,61,8,0,10,4,,"","",,"Sum",
diff --git a/master/networks/init_cong_time_2040.bin b/master/networks/init_cong_time_2040.bin
diff --git a/master/networks/init_cong_time_2050.bin b/master/networks/init_cong_time_2050.bin
diff --git a/master/networks/master_links.BIN b/master/networks/master_links.BIN
diff --git a/master/networks/master_links.BX b/master/networks/master_links.BX