take mean of log10 parking in 'uta_export' for #13

UrbanAnalyst · May 10, 2023 · 0b63d89 · 0b63d89
1 parent 14c6420
commit 0b63d89
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: utaengine
 Title: Routing and aggregation engine for 'Urban Transport Analyst'
-Version: 0.1.0.153
+Version: 0.1.0.154
 Authors@R: 
     person(given = "Mark",
            family = "Padgham",

diff --git a/R/uta-batch.R b/R/uta-batch.R
@@ -265,7 +265,13 @@ uta_export <- function (city, soc, results_path) {
     for (i in unique (pt_index)) {
         index <- which (pt_index == i)
         for (v in c (vars, extra_vars)) {
-            soc [[v]] [i] <- mean (res [[v]] [index], na.rm = TRUE)
+            if (v == "parking") {
+                p <- res$parking [index]
+                p <- p [which (p > 0 & !is.nan (p))]
+                soc [[v]] [i] <- 10^mean (log10 (p), na.rm = TRUE)
+            } else {
+                soc [[v]] [i] <- mean (res [[v]] [index], na.rm = TRUE)
+            }
         }
     }
 

diff --git a/codemeta.json b/codemeta.json
@@ -7,7 +7,7 @@
   "codeRepository": "https://github.com/UrbanAnalyst/uta-engine",
   "issueTracker": "https://github.com/UrbanAnalyst/uta-engine/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.0.153",
+  "version": "0.1.0.154",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",