umt 1.0.10 → 1.0.12

package/module/Math/calculator/core.js

@@ -1,71 +1,92 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const addition_1 = __importDefault(require("../addition"));
-const division_1 = __importDefault(require("../division"));
-const multiplication_1 = __importDefault(require("../multiplication"));
-const subtract_1 = __importDefault(require("../subtract"));
-const exchange_1 = __importDefault(require("./exchange"));
+exports.calculatorCore = void 0;
+const addition_1 = require("../addition");
+const division_1 = require("../division");
+const multiplication_1 = require("../multiplication");
+const subtract_1 = require("../subtract");
+const exchange_1 = require("./exchange");
+/**
+ * 電卓
+ * ()や符号に対応
+ * xなどの文字は未対応
+ * @param  {string} x 計算式
+ */
 const calculatorCore = (x, ex) => {
+    //符号反転
     x = x.replace(/--/g, '+');
     x = x.replace(/\+\+/g, '+');
     x = x.replace(/\+-/g, '+0-');
     x = x.replace(/\-\+/g, '+0-');
-    if (x.indexOf('$') != -1) {
+    //円計算
+    while (true) {
         if (ex) {
-            const $ = x.match(/(\$[0-9]+)/);
-            if ($) {
-                return calculatorCore(x.replace($[0], (0, exchange_1.default)({ n: $[0], $: ex.$ })), ex);
+            for (const i in ex) {
+                if (x.indexOf(i) != -1) {
+                    const $ = x.match(new RegExp(`\\${i}` + '([0-9]+)'));
+                    if ($) {
+                        x = x.replace($[0], (0, exchange_1.exchange)($[0], ex));
+                    }
+                }
             }
         }
-    }
-    if (x.indexOf('(') != -1 || x.indexOf(')') != -1) {
-        const y = x.match(/\(\d+\.?(\d+)?(\*|\/|\+|\-)\d+\.?(\d+)?\)/);
-        if (y) {
-            return calculatorCore(x.replace(y[0], calculatorCore(y[0].replace(/\(|\)/g, ''))), ex);
+        //括弧の処理
+        if (x.indexOf('(') != -1 || x.indexOf(')') != -1) {
+            //括弧の中身をぬく
+            const y = x.match(/\(\d+\.?(\d+)?(\*|\/|\+|\-)\d+\.?(\d+)?\)/);
+            if (y) {
+                //括弧の中身を計算
+                x = x.replace(y[0], (0, exports.calculatorCore)(y[0].replace(/\(|\)/g, '')));
+            }
+            else {
+                x = x.replace(`(${x.slice(x.indexOf('(') + 1, x.indexOf(')'))})`, (0, exports.calculatorCore)(x.slice(x.indexOf('(') + 1, x.indexOf(')'))));
+            }
         }
-        else {
-            return calculatorCore(x.replace(`(${x.slice(x.indexOf('(') + 1, x.indexOf(')'))})`, calculatorCore(x.slice(x.indexOf('(') + 1, x.indexOf(')')))), ex);
+        else if (x.indexOf('^') != -1 ||
+            x.indexOf('*') != -1 ||
+            x.indexOf('/') != -1) {
+            //掛け算と割り算の処理
+            const y = [
+                x.match(/\d+\.?(\d+)?(\*|\/|\^)\d+\.?(\d+)?/),
+                [''],
+            ];
+            if (y[0]) {
+                y[1] = y[0][0]
+                    .split(/(\d+\.\d+)|(\d+)/g)
+                    .filter((n) => {
+                    return typeof n != 'undefined' && n != '';
+                });
+                x = x.replace(y[0][0], `${y[1][1] == '^'
+                    ? Math.pow(+y[1][0], +y[1][2])
+                    : y[1][1] == '*'
+                        ? (0, multiplication_1.multiplication)(+y[1][0], +y[1][2])
+                        : y[1][1] == '/'
+                            ? (0, division_1.division)(+y[1][0], +y[1][2])
+                            : '0'}`);
+            }
         }
-    }
-    else if (x.indexOf('*') != -1 || x.indexOf('/') != -1) {
-        const y = [
-            x.match(/\d+\.?(\d+)?(\*|\/)\d+\.?(\d+)?/),
-            [''],
-        ];
-        if (y[0]) {
-            y[1] = y[0][0].split(/(\d+\.\d+)|(\d+)/g).filter((n) => {
-                return typeof n != 'undefined' && n != '';
-            });
-            return calculatorCore(x.replace(y[0][0], `${y[1][1] == '*'
-                ? (0, multiplication_1.default)(Number(y[1][0]), Number(y[1][2]))
-                : y[1][1] == '/'
-                    ? (0, division_1.default)(Number(y[1][0]), Number(y[1][2]))[0]
-                    : '0'}`), ex);
+        else if (x.indexOf('+') != -1 || x.indexOf('-') != -1) {
+            //加算と減算の処理
+            let y = [
+                x.match(/\d+\.?(\d+)?(\+|\-)\d+\.?(\d+)?/),
+                [''],
+            ];
+            if (y[0]) {
+                y[1] = y[0][0]
+                    .split(/(\d+\.\d+)|(\d+)/g)
+                    .filter((n) => {
+                    return typeof n != 'undefined' && n !== '';
+                });
+                x = x.replace(y[0][0], `${y[1][1] == '+'
+                    ? (0, addition_1.addition)(Number(y[1][0]), Number(y[1][2]))
+                    : y[1][1] == '-'
+                        ? (0, subtract_1.subtract)(Number(y[1][0]), Number(y[1][2]))
+                        : '0'}`);
+            }
         }
-        return x;
-    }
-    else if (x.indexOf('+') != -1 || x.indexOf('-') != -1) {
-        let y = [
-            x.match(/\d+\.?(\d+)?(\+|\-)\d+\.?(\d+)?/),
-            [''],
-        ];
-        if (y[0]) {
-            y[1] = y[0][0].split(/(\d+\.\d+)|(\d+)/g).filter((n) => {
-                return typeof n != 'undefined' && n !== '';
-            });
-            return calculatorCore(x.replace(y[0][0], `${y[1][1] == '+'
-                ? (0, addition_1.default)(Number(y[1][0]), Number(y[1][2]))
-                : y[1][1] == '-'
-                    ? (0, subtract_1.default)(Number(y[1][0]), Number(y[1][2]))
-                    : '0'}`), ex);
+        else {
+            return x;
         }
-        return x;
-    }
-    else {
-        return x;
     }
 };
-exports.default = calculatorCore;
+exports.calculatorCore = calculatorCore;

package/module/Math/calculator/exchange.d.ts

@@ -1,5 +1 @@
-declare const exchange: ({ n, $ }: {
-    n: string;
-    $?: number | undefined;
-}) => string;
-export default exchange;
+export declare const exchange: <T extends object>(n: string, props?: T | undefined) => string;

package/module/Math/calculator/exchange.js

@@ -1,20 +1,24 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const multiplication_1 = __importDefault(require("../multiplication"));
-const exchange = ({ n, $ }) => {
-    if ($) {
-        if (n[0] === '$') {
-            return String((0, multiplication_1.default)(Number(n.slice(1)), $));
-        }
-        else {
-            return n;
+exports.exchange = void 0;
+const isNumber_1 = require("../isNumber");
+const multiplication_1 = require("../multiplication");
+const exchange = (n, props) => {
+    if (props) {
+        for (const i in props) {
+            if (n[0] == i) {
+                if ((0, isNumber_1.isNumber)(props[i])) {
+                    return String((0, multiplication_1.multiplication)(Number(n.slice(1)), Number(props[i])));
+                }
+            }
+            else {
+                return n;
+            }
         }
+        return n;
     }
     else {
         return n;
     }
 };
-exports.default = exchange;
+exports.exchange = exchange;

package/module/Math/calculator/index.d.ts

@@ -3,9 +3,6 @@
  * ()や符号に対応
  * 一文字までの方程式に対応
  * @param  {string} x
+ * @param  {object} ex 為替
  */
-interface Props {
-    $?: number;
-}
-declare const calculator: (x: string, ex?: Props) => string;
-export default calculator;
+export declare const calculator: <T extends object>(x: string, ex?: T | undefined) => string;

package/module/Math/calculator/index.js

@@ -1,17 +1,22 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = __importDefault(require("./core"));
-const literalExpression_1 = __importDefault(require("./literalExpression"));
+exports.calculator = void 0;
+const core_1 = require("./core");
+const literalExpression_1 = require("./literalExpression");
+/**
+ * 電卓
+ * ()や符号に対応
+ * 一文字までの方程式に対応
+ * @param  {string} x
+ * @param  {object} ex 為替
+ */
 const calculator = (x, ex) => {
     x = x.replace(/\s+/g, '');
     if (x.indexOf('=') != -1) {
-        return (0, literalExpression_1.default)(x);
+        return (0, literalExpression_1.literalExpression)(x);
     }
     else {
-        return (0, core_1.default)(x, ex);
+        return (0, core_1.calculatorCore)(x, ex);
     }
 };
-exports.default = calculator;
+exports.calculator = calculator;

package/module/Math/calculator/literalExpression.d.ts

@@ -1,5 +1,5 @@
 /**
+ * 方程式計算
  * @param  {string} x
  */
-declare const literalExpression: (x: string) => string;
-export default literalExpression;
+export declare const literalExpression: (x: string) => string;

package/module/Math/calculator/literalExpression.js

@@ -1,12 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const division_1 = __importDefault(require("../division"));
-const gcd_1 = __importDefault(require("../gcd"));
-const core_1 = __importDefault(require("./core"));
+exports.literalExpression = void 0;
+const division_1 = require("../division");
+const gcd_1 = require("../gcd");
+const core_1 = require("./core");
 /**
+ * 方程式計算
  * @param  {string} x
  */
 const literalExpression = (x) => {
@@ -22,6 +21,7 @@ const literalExpression = (x) => {
         }
     }
     if (cache[0][1]) {
+        cache[0][1] = (0, core_1.calculatorCore)(cache[0][1]);
         if (cache[0][1].indexOf('+') !== -1) {
             cache[0][1] = cache[0][1].replace(/\+/g, 'plus');
         }
@@ -36,15 +36,22 @@ const literalExpression = (x) => {
         }
     }
     cache[1] = cache[0][1]
-        ? (0, core_1.default)(`${cache[1]}${cache[0][1]}`)
-        : (0, core_1.default)(cache[1]);
+        ? (0, core_1.calculatorCore)(`${cache[1]}${cache[0][1]}`)
+        : (0, core_1.calculatorCore)(cache[1]);
     cache[0] = cache[0][0]
         .split(/([0-9]+)|([a-zA-Z]+)/)
         .filter((n) => n !== '' && typeof n != 'undefined');
-    const cacheGcd = (0, gcd_1.default)(Number(cache[0][0]), Number(cache[1]));
-    if (cacheGcd !== 1) {
-        return `${(0, division_1.default)(Number(cache[1]), cacheGcd)[0]}/${(0, division_1.default)(Number(cache[0][0]), cacheGcd)[0]}`;
+    if (isNaN(Number(cache[0][0]))) {
+        return cache[1];
+    }
+    else {
+        const cacheGcd = (0, gcd_1.gcd)(Number(cache[0][0]), Number(cache[1]));
+        if (cacheGcd !== 1) {
+            return `${(0, division_1.division)(Number(cache[1]), cacheGcd)}/${(0, division_1.division)(Number(cache[0][0]), cacheGcd)}`;
+        }
+        return cache[0][0] == '1'
+            ? `${cache[1]}/${cache[0][0]}`
+            : cache[1];
     }
-    return `${Number(cache[1])}/${Number(cache[0][0])}`;
 };
-exports.default = literalExpression;
+exports.literalExpression = literalExpression;

package/module/Math/degToRad.d.ts

@@ -1,6 +1,6 @@
 /**
  * 角度をラジアンに変換
  * @param  {number} x
+ * @returns number
  */
-declare const degToRad: (x: number) => number;
-export default degToRad;
+export declare const degToRad: (x: number) => number;

package/module/Math/degToRad.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.degToRad = void 0;
 /**
  * 角度をラジアンに変換
  * @param  {number} x
+ * @returns number
  */
 const degToRad = (x) => {
     return x * (Math.PI / 180);
 };
-exports.default = degToRad;
+exports.degToRad = degToRad;

package/module/Math/deviationValue.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 偏差値を計算する
+ * @param  {number} value
+ * @param  {number} averageValue
+ * @param  {number} standardDeviationValue
+ * @returns number
+ */
+export declare const deviationValue: (value: number, averageValue: number, standardDeviationValue: number) => number;

package/module/Math/deviationValue.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deviationValue = void 0;
+/**
+ * 偏差値を計算する
+ * @param  {number} value
+ * @param  {number} averageValue
+ * @param  {number} standardDeviationValue
+ * @returns number
+ */
+const deviationValue = (value, averageValue, standardDeviationValue) => {
+    return (((value - averageValue) / standardDeviationValue) * 10 + 50);
+};
+exports.deviationValue = deviationValue;

package/module/Math/division.d.ts

@@ -1,7 +1,12 @@
+export interface DIVISION {
+    (x: number, y: number, isFloor?: true): number;
+    (x: number, y: number, isFloor?: false): number[];
+}
 /**
  * 誤差のない割り算
  * @param  {number} x
  * @param  {number} y
+ * @param  {boolean} [isFloor=true]
+ * @returns number
  */
-declare const division: (x: number, y: number) => number[];
-export default division;
+export declare const division: DIVISION;

package/module/Math/division.js

@@ -1,18 +1,29 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const getDecimalLength_1 = __importDefault(require("./getDecimalLength"));
+exports.division = void 0;
+const getDecimalLength_1 = require("./getDecimalLength");
+const valueSwap_1 = require("./valueSwap");
 /**
  * 誤差のない割り算
  * @param  {number} x
  * @param  {number} y
+ * @param  {boolean} [isFloor=true]
+ * @returns number
  */
-const division = (x, y) => {
-    const n = 10 ** ((0, getDecimalLength_1.default)(x) + (0, getDecimalLength_1.default)(y));
+exports.division = ((x, y, isFloor = true) => {
+    const [decimalLengthX, decimalLengthY] = (0, valueSwap_1.valueSwap)((0, getDecimalLength_1.getDecimalLength)(x), (0, getDecimalLength_1.getDecimalLength)(y));
+    const n = decimalLengthX == decimalLengthY
+        ? 1
+        : Math.pow(10, decimalLengthY - decimalLengthX);
     x = +(x + '').replace('.', '');
     y = +(y + '').replace('.', '');
-    return [x / y / n, (x % y) / n];
-};
-exports.default = division;
+    return isFloor
+        ? x > y
+            ? x / y / n
+            : (x / y) * n
+        : [
+            x > y ? (x - (x % y)) / y / n : ((x - (x % y)) / y) * n,
+            x % y,
+        ];
+    // return isFloor ? x / y : [(x - (x % y)) / y, x % y];
+});

package/module/Math/factorial.d.ts

@@ -1,6 +1,6 @@
 /**
  * 階乗
  * @param  {number} x
+ * @returns number
  */
-declare const factorial: (x: number) => number;
-export default factorial;
+export declare const factorial: (x: number) => number;

package/module/Math/factorial.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.factorial = void 0;
 /**
  * 階乗
  * @param  {number} x
+ * @returns number
  */
 const factorial = (x) => {
-    if (x === 0) {
-        return 1;
+    let result = 1;
+    if (x !== 0) {
+        while (x > 1) {
+            result *= x;
+            x--;
+        }
     }
-    return x * factorial(x - 1);
+    return result;
 };
-exports.default = factorial;
+exports.factorial = factorial;

package/module/Math/factorize.d.ts

@@ -1,6 +1,6 @@
 /**
  * 因数分解
  * @param  {number} n
+ * @returns number[]
  */
-declare const factorize: (n: number) => number[];
-export default factorize;
+export declare const factorize: (n: number) => number[];

package/module/Math/factorize.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.factorize = void 0;
 /**
  * 因数分解
  * @param  {number} n
+ * @returns number[]
  */
 const factorize = (n) => {
     const result = [];
@@ -14,4 +16,4 @@ const factorize = (n) => {
     }
     return result;
 };
-exports.default = factorize;
+exports.factorize = factorize;

package/module/Math/gcd.d.ts

@@ -3,6 +3,6 @@
  * @param  {number} x
  * @param  {number} y
  * @param  {number} ...z
+ * @returns number
  */
-declare const gcd: (x: number, y: number, ...z: number[]) => number;
-export default gcd;
+export declare const gcd: (x: number, y: number, ...z: number[]) => number;

package/module/Math/gcd.js

@@ -1,19 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const valueSwap_1 = __importDefault(require("./valueSwap"));
+exports.gcd = void 0;
+const valueSwap_1 = require("./valueSwap");
 /**
  * 自然数の最大公約数
  * @param  {number} x
  * @param  {number} y
  * @param  {number} ...z
+ * @returns number
  */
 const gcd = (x, y, ...z) => {
     if (x === 0 || y === 0)
         return 0;
-    [x, y] = (0, valueSwap_1.default)(x, y);
+    [x, y] = (0, valueSwap_1.valueSwap)(x, y);
     /* ユークリッドの互除法 */
     let r = y % x;
     while (r !== 0) {
@@ -23,9 +22,9 @@ const gcd = (x, y, ...z) => {
     }
     if (z.length > 0) {
         for (let i = 0; i < z.length; i++) {
-            x = gcd(x, z[i]);
+            x = (0, exports.gcd)(x, z[i]);
         }
     }
     return x;
 };
-exports.default = gcd;
+exports.gcd = gcd;

package/module/Math/getDecimalLength.d.ts

@@ -1,6 +1,6 @@
 /**
  * 小数点以下の桁数
  * @param  {number} value
+ * @returns number
  */
-declare const getDecimalLength: (value: number) => number;
-export default getDecimalLength;
+export declare const getDecimalLength: (value: number) => number;

package/module/Math/getDecimalLength.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDecimalLength = void 0;
 /**
  * 小数点以下の桁数
  * @param  {number} value
+ * @returns number
  */
 const getDecimalLength = (value) => {
     let x = (value + '').split('.')[1];
@@ -11,4 +13,4 @@ const getDecimalLength = (value) => {
     }
     return 0;
 };
-exports.default = getDecimalLength;
+exports.getDecimalLength = getDecimalLength;