Skip to content

Commit 3390ea5

Browse files
committed
corrected small bug on how NOV matrices are added to WHW matrices - NO effect on Bogota results
1 parent 322ad07 commit 3390ea5

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

R/injuries_function_2.R

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,14 @@ injuries_function_2 <- function(true_distances, injuries_list, reg_model, consta
206206
nov_data <- data.frame(as.list(whw_temp[[scen]]$nov))
207207
cas_data <- data.frame(whw_temp[[scen]]$whw)
208208
for (c_mode in colnames(nov_data)){ # loop through NOV casualty modes
209-
210209
if (!c_mode %in% row.names(cas_data)){# if the casualty mode is not a strike mode, then add a row to data
211210
cas_data[c_mode,] <- NA
212211
cas_data[c_mode,c_mode] <- nov_data[1,c_mode]
212+
} else if (c_mode %in% colnames(cas_data)) {
213+
cas_data[c_mode,c_mode] <- cas_data[c_mode,c_mode] + nov_data[1,c_mode]
213214
} else {
215+
cas_data[,c_mode] <- 0 # add new column
216+
cas_data[c_mode,] <- 0 # add new row
214217
cas_data[c_mode,c_mode] <- cas_data[c_mode,c_mode] + nov_data[1,c_mode]
215218
}
216219
}

0 commit comments

Comments
 (0)