update: CDF

Author: VickScarlet

src/data/data.json

@@ -5151,9 +5151,9 @@
                 "key": "altDilution",
                 "value": 30
             },
-            "lifeStd": {
-                "key": "lifeStd",
-                "value": 12
+            "lifeBeta": {
+                "key": "lifeBeta",
+                "value": 3.8
             },
             "year": {
                 "key": "year",

src/data/data.xlsx

@@ -1,6 +1,6 @@
 import { data, version } from '@/data/data.json'
 import { database } from '@/database'
-import { zoneRandom, cdf } from '@/utils'
+import { zoneRandom, weibullCDF } from '@/utils'
 
 export { version }
 
@@ -335,7 +335,7 @@ export function percentBefore(
     sex: Sex
 ) {
     const x = life + age.value
-    const mean = country.life[sex.value]
-    const std = getConfig('lifeStd')
-    return (cdf(x, mean, std) * 100).toFixed(2).replace(/\.00$/, '')
+    const average = country.life[sex.value]
+    const beta = getConfig('lifeBeta')
+    return (weibullCDF(x, beta, average) * 100).toFixed(2).replace(/\.00$/, '')
 }

src/data/index.ts

@@ -37,13 +37,7 @@ export function yearsLater(year: number) {
     return formatDate(date)
 }
 
-export function pdf(x: number, mean: number, std: number): number {
-    return (
-        Math.exp(-((x - mean) ** 2) / (2 * std ** 2)) /
-        (std * Math.sqrt(2 * Math.PI))
-    )
-}
-export function cdf(x: number, mean: number, std: number): number {
+export function normalCDF(x: number, mean: number, std: number): number {
     const z = (x - mean) / std
     return 0.5 * (1 + erf(z / Math.sqrt(2)))
 }
@@ -67,3 +61,18 @@ function erf(x: number): number {
 
     return sign * y
 }
+
+export function weibullCDF(x: number, k: number, scale: number): number {
+    if (x < 0) {
+        return 0
+    }
+    return 1 - Math.exp(-Math.pow(x / scale, k))
+}
+
+export function logNormalCDF(x: number, mean: number, std: number): number {
+    if (x <= 0) {
+        return 0
+    }
+    const z = (Math.log(x) - mean) / std
+    return 0.5 * (1 + erf(z / Math.sqrt(2)))
+}