Update R/compute_weighted_intensity_levels.R

Co-authored-by: Rasmus Skytte Randløv <[email protected]>

Author: SofiaOtero

R/compute_weighted_intensity_levels.R

@@ -101,14 +101,13 @@ compute_weighted_intensity_levels <- function(
 
   # The weighted negative loglikelihood function
   nll <- function(par, weighted_observations, family = family) {
-    switch(family,
-      weibull = -sum(stats::dweibull(weighted_observations$observation, shape = exp(par[1]), scale = exp(par[2]),
-                                     log = TRUE) * weighted_observations$weight),
-      lnorm = -sum(stats::dlnorm(weighted_observations$observation, meanlog =  par[1], sdlog = par[2],
-                                 log = TRUE) * weighted_observations$weight),
-      exp =  -sum(stats::dexp(weighted_observations$observation, rate = exp(par[1]),
-                              log = TRUE) * weighted_observations$weight)
+    log_probability <- switch(family,
+      weibull = stats::dweibull(weighted_observations$observation, shape = exp(par[1]), scale = exp(par[2]), log = TRUE),
+      lnorm = stats::dlnorm(weighted_observations$observation, meanlog =  par[1], sdlog = par[2], log = TRUE),
+      exp = stats::dexp(weighted_observations$observation, rate = exp(par[1]), log = TRUE) 
     )
+    
+    return(-sum(log_probability * weighted_observations$weight))
   }
 
   # Run optimisation for weighted observations