Adding the export of the number of points.

atmoswing · Jun 25, 2018 · 27f637c · 27f637c
1 parent e757674
commit 27f637c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/R/parseOutputs.R b/R/parseOutputs.R
@@ -401,6 +401,8 @@ parseAllResultsText <- function(directory, predictandDB, datasets, methods, verb
       fieldYmin <- paste(dataset, "_", method, "_ymin", sep = "")
       fieldXstep <- paste(dataset, "_", method, "_xstep", sep = "")
       fieldYstep <- paste(dataset, "_", method, "_ystep", sep = "")
+      fieldXpts <- paste(dataset, "_", method, "_xpts", sep = "")
+      fieldYpts <- paste(dataset, "_", method, "_ypts", sep = "")
       fieldXw <- paste(dataset, "_", method, "_xw", sep = "")
       fieldYw <- paste(dataset, "_", method, "_yw", sep = "")
 
@@ -487,28 +489,34 @@ parseAllResultsText <- function(directory, predictandDB, datasets, methods, verb
         pos <- which(dat == "Xptsnb" | dat == "xPtsNb")
         for (i in 1:length(pos)) {
           fullFieldName <- paste(fieldXw, "_", i, sep = "")
+          fullFieldNamePts <- paste(fieldXpts, "_", i, sep = "")
           if (verbose) {
             message(paste("Field:", fullFieldName))
           }
 
           if(!fullFieldName %in% colnames(stations)) {
             stations[fullFieldName] <- NA
+            stations[fullFieldNamePts] <- NA
           }
           stations[[fullFieldName]][which(stations$id == stationId)] <- (dat[[pos[[i]]+1]] - 1) * dat[[pos[[i]]+3]]
+          stations[[fullFieldNamePts]][which(stations$id == stationId)] <- dat[[pos[[i]]+1]]
         }
 
         # Ypts
         pos <- which(dat == "Yptsnb" | dat == "yPtsNb")
         for (i in 1:length(pos)) {
           fullFieldName <- paste(fieldYw, "_", i, sep = "")
+          fullFieldNamePts <- paste(fieldYpts, "_", i, sep = "")
           if (verbose) {
             message(paste("Field:", fullFieldName))
           }
 
           if(!fullFieldName %in% colnames(stations)) {
             stations[fullFieldName] <- NA
+            stations[fullFieldNamePts] <- NA
           }
           stations[[fullFieldName]][which(stations$id == stationId)] <- (dat[[pos[[i]]+1]] - 1) * dat[[pos[[i]]+3]]
+          stations[[fullFieldNamePts]][which(stations$id == stationId)] <- dat[[pos[[i]]+1]]
         }
 
         # Score