@quesmed/types 2.4.3 → 2.4.5

package/dist/cjs/resolvers/mutation/restricted/marksheet.js

@@ -1754,8 +1754,8 @@ const updateMarksheets = (cache, result, options) => {
     }
     try {
         for (let i = 0; i < saveMarksheets.length; i++) {
-            const { marksheetInput } = variables;
-            const marksheet = marksheetInput[i];
+            const { input } = variables;
+            const marksheet = input[i];
             cache.writeFragment({
                 id: cache.identify({
                     id: saveMarksheets[i],

package/dist/cjs/utils/index.d.ts

@@ -2,6 +2,7 @@ export * from './commonFunctions';
 export * from './lightgallery';
 export * from './offlineLink';
 export * from './random';
+export * from './supermemo';
 export * from './webSocketLink';
 export * from './wordsToNumber';
 import uuid from './uuid4';

package/dist/cjs/utils/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./commonFunctions"), exports);
 __exportStar(require("./lightgallery"), exports);
 __exportStar(require("./offlineLink"), exports);
 __exportStar(require("./random"), exports);
+__exportStar(require("./supermemo"), exports);
 __exportStar(require("./webSocketLink"), exports);
 __exportStar(require("./wordsToNumber"), exports);
 const uuid4_1 = __importDefault(require("./uuid4"));

package/dist/cjs/utils/supermemo.d.ts

@@ -0,0 +1,25 @@
+import Decimal from 'decimal.js';
+import { Id, IUserCompletedCard } from '../models';
+export declare const ALGO_FRACTION: Decimal;
+export interface IScoreQuesCardInput {
+    cardId: number;
+    score: number;
+    timeTaken: number;
+}
+export interface IScoreQuesCardVar {
+    input: IScoreQuesCardInput;
+    completedCard: IUserCompletedCard;
+    userId: Id;
+}
+export interface IScoreQuesCardData {
+    cardId: Id;
+    userId: Id;
+    lastSeen: Date;
+    reviewDate: Date;
+    score: number;
+    iteration: number;
+    optimalFactor: number;
+}
+export declare function scoreQuesCard({ input, completedCard, userId, }: IScoreQuesCardVar): IScoreQuesCardData;
+export declare function supermemo(EF: number, quality: number): number;
+export declare function calcOptimalFactor(iteration: number, quality: number, prevOF: number): number;

package/dist/cjs/utils/supermemo.js

@@ -0,0 +1,112 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calcOptimalFactor = exports.supermemo = exports.scoreQuesCard = exports.ALGO_FRACTION = void 0;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const luxon_1 = require("luxon");
+exports.ALGO_FRACTION = new decimal_js_1.default(0.5);
+function scoreQuesCard({ input, completedCard, userId, }) {
+    const lastSeen = luxon_1.DateTime.now();
+    let prevScore = 2.5;
+    let iteration = 1;
+    let optimalFactor = 2;
+    if (completedCard) {
+        prevScore = completedCard.score;
+        if (input.score >= 3) {
+            iteration = completedCard.iteration + 1;
+        }
+        else {
+            iteration = 1;
+        }
+        optimalFactor = calcOptimalFactor(iteration, input.score, completedCard.optimalFactor);
+    }
+    const EF = supermemo(prevScore, input.score);
+    let reviewDate = lastSeen.plus({ days: 1 });
+    if (optimalFactor !== 2) {
+        let daysToReview = 1;
+        if (iteration > 1) {
+            daysToReview = optimalFactor * (iteration - 1) * EF;
+        }
+        reviewDate = lastSeen.plus({ days: daysToReview });
+    }
+    return {
+        score: EF,
+        iteration,
+        lastSeen: lastSeen.toJSDate(),
+        cardId: input.cardId,
+        userId,
+        optimalFactor,
+        reviewDate: reviewDate.toJSDate(),
+    };
+}
+exports.scoreQuesCard = scoreQuesCard;
+function supermemo(EF, quality) {
+    // EF':=EF-0.8+0.28*q-0.02*q*q
+    // EF':=EF+(0.1-(5-q)*(0.08+(5-q)*0.02))
+    const qFactor = new decimal_js_1.default(5 - quality);
+    let newEF = new decimal_js_1.default(EF).plus(new decimal_js_1.default(0.1)
+        .minus(qFactor)
+        .mul(new decimal_js_1.default(0.08).plus(qFactor).mul(new decimal_js_1.default(0.02))));
+    if (newEF.lessThan(1.3)) {
+        newEF = new decimal_js_1.default(1.3);
+    }
+    else if (newEF.greaterThan(2.5)) {
+        newEF = new decimal_js_1.default(2.5);
+    }
+    return newEF.toNearest(0.01).toNumber();
+}
+exports.supermemo = supermemo;
+function calcOptimalFactor(iteration, quality, prevOF) {
+    const iter = new decimal_js_1.default(iteration);
+    const q = new decimal_js_1.default(quality);
+    const pOF = new decimal_js_1.default(prevOF);
+    const one = new decimal_js_1.default(1);
+    let modifier = new decimal_js_1.default(0);
+    let mod5 = iter.plus(one).div(iter);
+    const one_05 = new decimal_js_1.default(1.05);
+    if (mod5.lessThan(one_05)) {
+        mod5 = one_05;
+    }
+    let mod2 = iter.minus(one).div(iter);
+    const zero_75 = new decimal_js_1.default(0.75);
+    if (mod2.greaterThan(zero_75)) {
+        mod2 = zero_75;
+    }
+    const four = new decimal_js_1.default(4);
+    if (q.greaterThan(four)) {
+        modifier = one.plus(mod5.minus(one).mul(q.minus(four)));
+    }
+    else {
+        modifier = one.minus(one.minus(mod2).div(new decimal_js_1.default(2)).mul(four.minus(q)));
+    }
+    if (modifier.lessThan(0.05)) {
+        modifier = new decimal_js_1.default(0.05);
+    }
+    let usedOF = four;
+    if (!iter.eq(1)) {
+        const tmp = pOF.mul(new decimal_js_1.default(0.72).plus(q).mul(new decimal_js_1.default(0.07)));
+        usedOF = pOF
+            .mul(new decimal_js_1.default(1).minus(exports.ALGO_FRACTION))
+            .plus(exports.ALGO_FRACTION.mul(tmp));
+    }
+    let newOF = usedOF.mul(modifier);
+    if (q.greaterThan(four)) {
+        if (newOF.lessThan(pOF)) {
+            newOF = pOF;
+        }
+    }
+    else if (q.lessThan(four)) {
+        if (newOF.greaterThan(pOF)) {
+            newOF = pOF;
+        }
+    }
+    newOF = newOF.mul(exports.ALGO_FRACTION).plus(pOF.mul(one.minus(exports.ALGO_FRACTION)));
+    const one_2 = new decimal_js_1.default(1.2);
+    if (newOF.lessThan(one_2)) {
+        newOF = one_2;
+    }
+    return newOF.toNearest(0.01).toNumber();
+}
+exports.calcOptimalFactor = calcOptimalFactor;

package/dist/mjs/resolvers/mutation/restricted/marksheet.js

@@ -1751,8 +1751,8 @@ export const updateMarksheets = (cache, result, options) => {
     }
     try {
         for (let i = 0; i < saveMarksheets.length; i++) {
-            const { marksheetInput } = variables;
-            const marksheet = marksheetInput[i];
+            const { input } = variables;
+            const marksheet = input[i];
             cache.writeFragment({
                 id: cache.identify({
                     id: saveMarksheets[i],

package/dist/mjs/utils/index.d.ts

@@ -2,6 +2,7 @@ export * from './commonFunctions';
 export * from './lightgallery';
 export * from './offlineLink';
 export * from './random';
+export * from './supermemo';
 export * from './webSocketLink';
 export * from './wordsToNumber';
 import uuid from './uuid4';

package/dist/mjs/utils/index.js

@@ -2,6 +2,7 @@ export * from './commonFunctions';
 export * from './lightgallery';
 export * from './offlineLink';
 export * from './random';
+export * from './supermemo';
 export * from './webSocketLink';
 export * from './wordsToNumber';
 import uuid from './uuid4';

package/dist/mjs/utils/supermemo.d.ts

@@ -0,0 +1,25 @@
+import Decimal from 'decimal.js';
+import { Id, IUserCompletedCard } from '../models';
+export declare const ALGO_FRACTION: Decimal;
+export interface IScoreQuesCardInput {
+    cardId: number;
+    score: number;
+    timeTaken: number;
+}
+export interface IScoreQuesCardVar {
+    input: IScoreQuesCardInput;
+    completedCard: IUserCompletedCard;
+    userId: Id;
+}
+export interface IScoreQuesCardData {
+    cardId: Id;
+    userId: Id;
+    lastSeen: Date;
+    reviewDate: Date;
+    score: number;
+    iteration: number;
+    optimalFactor: number;
+}
+export declare function scoreQuesCard({ input, completedCard, userId, }: IScoreQuesCardVar): IScoreQuesCardData;
+export declare function supermemo(EF: number, quality: number): number;
+export declare function calcOptimalFactor(iteration: number, quality: number, prevOF: number): number;

package/dist/mjs/utils/supermemo.js

@@ -0,0 +1,103 @@
+import Decimal from 'decimal.js';
+import { DateTime } from 'luxon';
+export const ALGO_FRACTION = new Decimal(0.5);
+export function scoreQuesCard({ input, completedCard, userId, }) {
+    const lastSeen = DateTime.now();
+    let prevScore = 2.5;
+    let iteration = 1;
+    let optimalFactor = 2;
+    if (completedCard) {
+        prevScore = completedCard.score;
+        if (input.score >= 3) {
+            iteration = completedCard.iteration + 1;
+        }
+        else {
+            iteration = 1;
+        }
+        optimalFactor = calcOptimalFactor(iteration, input.score, completedCard.optimalFactor);
+    }
+    const EF = supermemo(prevScore, input.score);
+    let reviewDate = lastSeen.plus({ days: 1 });
+    if (optimalFactor !== 2) {
+        let daysToReview = 1;
+        if (iteration > 1) {
+            daysToReview = optimalFactor * (iteration - 1) * EF;
+        }
+        reviewDate = lastSeen.plus({ days: daysToReview });
+    }
+    return {
+        score: EF,
+        iteration,
+        lastSeen: lastSeen.toJSDate(),
+        cardId: input.cardId,
+        userId,
+        optimalFactor,
+        reviewDate: reviewDate.toJSDate(),
+    };
+}
+export function supermemo(EF, quality) {
+    // EF':=EF-0.8+0.28*q-0.02*q*q
+    // EF':=EF+(0.1-(5-q)*(0.08+(5-q)*0.02))
+    const qFactor = new Decimal(5 - quality);
+    let newEF = new Decimal(EF).plus(new Decimal(0.1)
+        .minus(qFactor)
+        .mul(new Decimal(0.08).plus(qFactor).mul(new Decimal(0.02))));
+    if (newEF.lessThan(1.3)) {
+        newEF = new Decimal(1.3);
+    }
+    else if (newEF.greaterThan(2.5)) {
+        newEF = new Decimal(2.5);
+    }
+    return newEF.toNearest(0.01).toNumber();
+}
+export function calcOptimalFactor(iteration, quality, prevOF) {
+    const iter = new Decimal(iteration);
+    const q = new Decimal(quality);
+    const pOF = new Decimal(prevOF);
+    const one = new Decimal(1);
+    let modifier = new Decimal(0);
+    let mod5 = iter.plus(one).div(iter);
+    const one_05 = new Decimal(1.05);
+    if (mod5.lessThan(one_05)) {
+        mod5 = one_05;
+    }
+    let mod2 = iter.minus(one).div(iter);
+    const zero_75 = new Decimal(0.75);
+    if (mod2.greaterThan(zero_75)) {
+        mod2 = zero_75;
+    }
+    const four = new Decimal(4);
+    if (q.greaterThan(four)) {
+        modifier = one.plus(mod5.minus(one).mul(q.minus(four)));
+    }
+    else {
+        modifier = one.minus(one.minus(mod2).div(new Decimal(2)).mul(four.minus(q)));
+    }
+    if (modifier.lessThan(0.05)) {
+        modifier = new Decimal(0.05);
+    }
+    let usedOF = four;
+    if (!iter.eq(1)) {
+        const tmp = pOF.mul(new Decimal(0.72).plus(q).mul(new Decimal(0.07)));
+        usedOF = pOF
+            .mul(new Decimal(1).minus(ALGO_FRACTION))
+            .plus(ALGO_FRACTION.mul(tmp));
+    }
+    let newOF = usedOF.mul(modifier);
+    if (q.greaterThan(four)) {
+        if (newOF.lessThan(pOF)) {
+            newOF = pOF;
+        }
+    }
+    else if (q.lessThan(four)) {
+        if (newOF.greaterThan(pOF)) {
+            newOF = pOF;
+        }
+    }
+    newOF = newOF.mul(ALGO_FRACTION).plus(pOF.mul(one.minus(ALGO_FRACTION)));
+    const one_2 = new Decimal(1.2);
+    if (newOF.lessThan(one_2)) {
+        newOF = one_2;
+    }
+    return newOF.toNearest(0.01).toNumber();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "description": "Typescript types for Quesmed",
   "keywords": [
     "quesmed",
@@ -97,7 +97,9 @@
     "@apollo/client": "^3.5.7",
     "@react-native-async-storage/async-storage": "^1.15.16",
     "@types/react-native": "^0.64",
+    "decimal.js": "^10.4.3",
     "localforage": "^1.10.0",
+    "luxon": "^3.2.1",
     "react-native": "0.64.0",
     "react-native-expo-image-cache": "^4.1.0"
   },
@@ -108,6 +110,7 @@
     "@graphql-tools/load-files": "^6.5.3",
     "@graphql-tools/merge": "^8.2.2",
     "@types/jest": "^27.4.1",
+    "@types/luxon": "^3.2.0",
     "@types/node": "^17.0.10",
     "@yarnpkg/pnpify": "^3.1.1-rc.11",
     "babel-jest": "^27.4.6",