Misc tweaks

R/plotLZISD.R

@@ -265,7 +265,7 @@ plotLZISD = function(
     }
 
     # Mean + CI
-    pm = signif(mV0,2)
+    pm = round(mV0,2)
     mtext(text = paste0('- ',pm),
           side = 4,
           at   = mV0,
@@ -341,6 +341,8 @@ plotLZISD = function(
       pcl    = loV,
       pcu    = upV,
       meanP  = mV0,
+      meanPl = loV0,
+      meanPu = upV0,
       ZISDE  = ZISDE,
       ZISDEUp= ZISDEUp,
       ZISDM  = ZISDM,

R/plotLZV.R

@@ -114,6 +114,7 @@ varZCI = function (
 #' @param plot (logical) plot the results
 #' @param xlab (string) X axis label
 #' @param xlim (vector) min and max values of X axis
+#' @param score (logical) estimate calibration stats (default: `FALSE`)
 #' @param add (logical) add to previous graph ?
 #' @param col (integer) color index of curve to add
 #'
@@ -146,6 +147,7 @@ plotLZV = function(
   xlim      = NULL,
   ylim      = NULL,
   title     = '',
+  score     = FALSE,
   add       = FALSE,
   col       = 5,
   label     = 0,
@@ -203,7 +205,7 @@ plotLZV = function(
               nBoot = max(nBoot, N),
               method = method,
               CImethod = BSmethod)
-  mV0 = zs$mean
+  mV0  = zs$mean
   loV0 = zs$ci[1]
   upV0 = zs$ci[2]
 
@@ -304,14 +306,17 @@ plotLZV = function(
 
     # Mean variance
     ypos = par("usr")[4]
-    pm = signif(mV0,2)
-    mtext(text = c(' Average',paste0('- ',pm)),
-          side = 4,
-          at = c(ypos,mV0),
-          col = c(1,cols[col]),
-          cex = 0.75*cex,
-          las = 1,
-          font = 2)
+    pm   = round(mV0, digits = 2)
+    mtext(
+      text = c(
+        ' Average',
+        paste0('- ', pm)),
+      side = 4,
+      at   = c(ypos, mV0),
+      col  = c(1,cols[col]),
+      cex  = 0.75*cex,
+      las  = 1,
+      font = 2)
     segments(
       xlim[2],loV0,
       xlim[2],upV0,
@@ -330,6 +335,22 @@ plotLZV = function(
 
   }
 
+  ZVE = ZVEUp = ZVDM = ZVMs = NA
+  if(score) {
+    scores = abs(log(mV))
+    # Max deviation
+    im = which.max(scores)
+    ZVM = exp( sign(log(mV[im])) * scores[im] )
+    # Significant ?
+    ZVMs = FALSE
+    if(varZ < loV[im] | varZ > upV[im])
+      ZVMs = TRUE
+    # Mean deviation
+    ZVE = exp(mean(scores))
+    scores = pmax(log(upV/mV),log(mV/loV))
+    ZVEUp = exp(mean(scores))
+  }
+
   invisible(
     list(
       mint   = mint,
@@ -338,7 +359,13 @@ plotLZV = function(
       pc     = mV,
       pcl    = loV,
       pcu    = upV,
-      meanP  = mV0
+      meanP  = mV0,
+      meanPl = loV0,
+      meanPu = upV0,
+      ZVE    = ZVE,
+      ZVEUp  = ZVEUp,
+      ZVM    = ZVM,
+      ZVMs   = ZVMs
     )
   )
 }

R/plotRelDiag.R

@@ -68,7 +68,8 @@ sdZCI = function (
 #'
 #' @param X     (vector) vector of uncertainties
 #' @param Y     (vector) vector of errors
-#' @param aux (vector) auxilliary vector to resolve ties in X sorting
+#' @param ordX  (vector) set of abscissas to order sample
+#' @param aux   (vector) auxilliary vector to resolve ties in sample sorting
 #' @param intrv (object) intervals generated by `genIntervals` (default: `NULL`)
 #' @param nBin  (integer) number of intervals for local coverage stats
 #' @param slide (logical) use sliding window for subsetting (X,Z)
@@ -104,6 +105,7 @@ sdZCI = function (
 #' }
 plotRelDiag = function(
   X, Y,
+  ordX      = NULL,
   aux       = NULL,
   logX      = FALSE,
   nBin      = NULL,
@@ -132,10 +134,21 @@ plotRelDiag = function(
 
   N = length(Y)
 
-  if(is.null(aux))
-    ord  = order(X)
-  else
-    ord  = order(X,aux)
+  if(!is.null(ordX)) {
+    if(length(ordX) != N)
+      stop('>>> Inconsistent length for ordX')
+    # Order by ordX, aux
+    if(is.null(aux))
+      ord  = order(ordX)
+    else
+      ord  = order(ordX,aux)
+  } else {
+    # Order by X, aux
+    if(is.null(aux))
+      ord  = order(X)
+    else
+      ord  = order(X,aux)
+  }
   xOrd = X[ord]
   yOrd = Y[ord]
 
@@ -146,8 +159,12 @@ plotRelDiag = function(
     if(nBin <= 0)
       stop('>>> nBin should be > 0')
     Xin = N
-    if(!equiPop)
-      Xin = xOrd
+    if(!equiPop) {
+      if(!is.null(ordX))
+        Xin = ordX[ord]
+      else
+        Xin = xOrd
+    }
     intrv = ErrViewLib::genIntervals(Xin, nBin, slide, equiPop, popMin, logBin)
   }
   nBin0 = nBin
@@ -169,10 +186,18 @@ plotRelDiag = function(
     upV[i]  = zs$ci[2]
     mint[i] = sqrt(mean(xOrd[sel] ^ 2))
   }
+  io = order(mint)
+  mint = mint[io]
+  mV   = mV[io]
+  loV  = loV[io]
+  upV  = upV[io]
 
   ENCE = NA
-  if(score)
+  MNCE = NA
+  if(score) {
     ENCE = mean(abs(mV-mint)/mint)
+    MNCE = max(abs(mV-mint)/mint)
+  }
 
 
   if(plot) {
@@ -285,7 +310,8 @@ plotRelDiag = function(
       pc     = mV,
       pcl    = loV,
       pcu    = upV,
-      ENCE   = ENCE
+      ENCE   = ENCE,
+      MNCE   = MNCE
     )
   )
 }