Merge pull request #3 from michaelzehetleitner/fix/aicc-correction

ManuelRausch · web-flow · commit d00b5aef8349 · 2025-11-13T14:50:07.000+01:00
Correct AIC and AICc reporting across confidence fitters
diff --git a/R/int_fit2Chan.R b/R/int_fit2Chan.R
@@ -100,9 +100,9 @@ fit2Chan <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
-
diff --git a/R/int_fitCAS.R b/R/int_fitCAS.R
@@ -95,8 +95,9 @@ fitCAS <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
diff --git a/R/int_fitCEV.R b/R/int_fitCEV.R
@@ -97,8 +97,9 @@ fitCEV <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
diff --git a/R/int_fitITG.R b/R/int_fitITG.R
@@ -104,8 +104,9 @@ fitITGcm <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
@@ -206,9 +207,9 @@ fitITGc <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
-
diff --git a/R/int_fitLogWEV.R b/R/int_fitLogWEV.R
@@ -92,8 +92,9 @@ fitLogWEV <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
diff --git a/R/int_fitLognorm.R b/R/int_fitLognorm.R
@@ -95,8 +95,9 @@ fitLognorm <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
diff --git a/R/int_fitNoisy.R b/R/int_fitNoisy.R
@@ -101,8 +101,9 @@ fitNoisy <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
diff --git a/R/int_fitPDA.R b/R/int_fitPDA.R
@@ -101,9 +101,9 @@ fitPDA <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
-
diff --git a/R/int_fitRCE.R b/R/int_fitRCE.R
@@ -95,8 +95,9 @@ fitRCE <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
diff --git a/R/int_fitSDT.R b/R/int_fitSDT.R
@@ -88,9 +88,9 @@ fitSDT <-
       res$N <- nTrials
       res$k <- k
       res$BIC <-  2 * fit$value + k * log(nTrials)
-      res$AICc <- 2 * fit$value + k * 2 + 2*k*(k-1)/(nTrials-k-1)
-      res$AIC <- 2 * fit$value + k * 2
+      res$AIC <- 2 * fit$value + 2 * k
+      denom <- nTrials - k - 1
+      res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA
     }
     res
   }
-
diff --git a/tests/testthat/test-information-criteria.R b/tests/testthat/test-information-criteria.R
@@ -0,0 +1,30 @@
+test_that("int_fitSDT reports AICc with +1 correction", {
+  N_SA_RA <- matrix(c(20, 15), nrow = 1)
+  N_SA_RB <- matrix(c(10, 5), nrow = 1)
+  N_SB_RA <- matrix(c(12, 8), nrow = 1)
+  N_SB_RB <- matrix(c(18, 22), nrow = 1)
+
+  total_trials <- sum(N_SA_RA + N_SA_RB + N_SB_RA + N_SB_RB)
+
+  fit_sdt <- getFromNamespace("fitSDT", "statConfR")
+
+  res <- fit_sdt(
+    N_SA_RA = N_SA_RA,
+    N_SA_RB = N_SA_RB,
+    N_SB_RA = N_SB_RA,
+    N_SB_RB = N_SB_RB,
+    nInits = 1,
+    nRestart = 1,
+    nRatings = 2,
+    nCond = 1,
+    nTrials = total_trials
+  )
+
+  expect_s3_class(res, "data.frame")
+  expect_equal(res$AIC, 2 * res$negLogLik + 2 * res$k)
+
+  denom <- res$N - res$k - 1
+  skip_if(denom <= 0, "AICc undefined when N <= k + 1")
+  expected_AICc <- res$AIC + (2 * res$k * (res$k + 1)) / denom
+  expect_equal(res$AICc, expected_AICc)
+})

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,9 @@ fit2Chan <-`
`100`	`100`	`res$N <- nTrials`
`101`	`101`	`res$k <- k`
`102`	`102`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`103`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`104`		`- res$AIC <- 2 * fit$value + k * 2`
	`103`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`104`	`+ denom <- nTrials - k - 1`
	`105`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`105`	`106`	`}`
`106`	`107`	`res`
`107`	`108`	`}`
`108`		`-`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,9 @@ fitCAS <-`
`95`	`95`	`res$N <- nTrials`
`96`	`96`	`res$k <- k`
`97`	`97`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`98`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`99`		`- res$AIC <- 2 * fit$value + k * 2`
	`98`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`99`	`+ denom <- nTrials - k - 1`
	`100`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`100`	`101`	`}`
`101`	`102`	`res`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,9 @@ fitCEV <-`
`97`	`97`	`res$N <- nTrials`
`98`	`98`	`res$k <- k`
`99`	`99`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`100`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`101`		`- res$AIC <- 2 * fit$value + k * 2`
	`100`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`101`	`+ denom <- nTrials - k - 1`
	`102`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`102`	`103`	`}`
`103`	`104`	`res`
`104`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,9 @@ fitITGcm <-`
`104`	`104`	`res$N <- nTrials`
`105`	`105`	`res$k <- k`
`106`	`106`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`107`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`108`		`- res$AIC <- 2 * fit$value + k * 2`
	`107`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`108`	`+ denom <- nTrials - k - 1`
	`109`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`109`	`110`	`}`
`110`	`111`	`res`
`111`	`112`	`}`
`@@ -206,9 +207,9 @@ fitITGc <-`
`206`	`207`	`res$N <- nTrials`
`207`	`208`	`res$k <- k`
`208`	`209`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`209`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`210`		`- res$AIC <- 2 * fit$value + k * 2`
	`210`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`211`	`+ denom <- nTrials - k - 1`
	`212`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`211`	`213`	`}`
`212`	`214`	`res`
`213`	`215`	`}`
`214`		`-`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,9 @@ fitLogWEV <-`
`92`	`92`	`res$N <- nTrials`
`93`	`93`	`res$k <- k`
`94`	`94`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`95`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`96`		`- res$AIC <- 2 * fit$value + k * 2`
	`95`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`96`	`+ denom <- nTrials - k - 1`
	`97`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`97`	`98`	`}`
`98`	`99`	`res`
`99`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,9 @@ fitLognorm <-`
`95`	`95`	`res$N <- nTrials`
`96`	`96`	`res$k <- k`
`97`	`97`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`98`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`99`		`- res$AIC <- 2 * fit$value + k * 2`
	`98`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`99`	`+ denom <- nTrials - k - 1`
	`100`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`100`	`101`	`}`
`101`	`102`	`res`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,9 @@ fitNoisy <-`
`101`	`101`	`res$N <- nTrials`
`102`	`102`	`res$k <- k`
`103`	`103`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`104`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`105`		`- res$AIC <- 2 * fit$value + k * 2`
	`104`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`105`	`+ denom <- nTrials - k - 1`
	`106`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`106`	`107`	`}`
`107`	`108`	`res`
`108`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,9 @@ fitPDA <-`
`101`	`101`	`res$N <- nTrials`
`102`	`102`	`res$k <- k`
`103`	`103`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`104`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`105`		`- res$AIC <- 2 * fit$value + k * 2`
	`104`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`105`	`+ denom <- nTrials - k - 1`
	`106`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`106`	`107`	`}`
`107`	`108`	`res`
`108`	`109`	`}`
`109`		`-`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,9 @@ fitRCE <-`
`95`	`95`	`res$N <- nTrials`
`96`	`96`	`res$k <- k`
`97`	`97`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`98`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`99`		`- res$AIC <- 2 * fit$value + k * 2`
	`98`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`99`	`+ denom <- nTrials - k - 1`
	`100`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`100`	`101`	`}`
`101`	`102`	`res`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,9 @@ fitSDT <-`
`88`	`88`	`res$N <- nTrials`
`89`	`89`	`res$k <- k`
`90`	`90`	`res$BIC <- 2 * fit$value + k * log(nTrials)`
`91`		`- res$AICc <- 2 * fit$value + k * 2 + 2k(k-1)/(nTrials-k-1)`
`92`		`- res$AIC <- 2 * fit$value + k * 2`
	`91`	`+ res$AIC <- 2 * fit$value + 2 * k`
	`92`	`+ denom <- nTrials - k - 1`
	`93`	`+ res$AICc <- if (denom > 0) res$AIC + (2 * k * (k + 1)) / denom else NA`
`93`	`94`	`}`
`94`	`95`	`res`
`95`	`96`	`}`
`96`		`-`