Merge pull request #197 from OHI-Science/dev

Dev
OHI-Science · Dec 6, 2021 · 3bb30b7 · 3bb30b7
2 parents fb1f8f6 + 4ee6111
commit 3bb30b7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/R/CalculateGoalIndex.R b/R/CalculateGoalIndex.R
@@ -79,6 +79,9 @@ CalculateGoalIndex <- function(id, status, trend, resilience, pressure,
      d$r <- ifelse(is.na(d$r), 0, d$r)
      d$p <- ifelse(is.na(d$p), 0, d$p)
 
+     ## cap the resilience so that it is no more than the pressures. 
+     d$r <- ifelse(d$r > d$p, d$p, d$r)
+
      d$xF <- with(d, (DISCOUNT * (1 + (BETA * t) + ((1-BETA) * (r - p)))) * x)
      # clamp status domain to [0, 1]
      d$xF <- with(d, score.clamp(xF, xlim = c(0,1)))