umt 1.1.7 → 1.2.0

package/module/Math/mathConverter.js

@@ -1,44 +1,45 @@
 import { mathSeparator } from "./mathSeparator";
 /**
- * @param {string} x
- * @returns string
+ * nの2乗を展開します。
+ *
+ * 1250*1250 => 1500*1000+400*100+200*100+50*50
+ *
+ * @param {string} equation - 変換する数学的な式
+ * @returns {string} 変換後の式
  */
-export const mathConverter = (x) => {
-    let returnValue = x;
+export const mathConverter = (equation) => {
+    let convertedEquation = equation;
     while (true) {
-        if (returnValue.indexOf("^") !== -1 || returnValue.indexOf("*") !== -1) {
-            //掛け算と割り算の処理
-            const y = [
-                returnValue.match(/\d+\.?(\d+)?(\*|\^)\d+\.?(\d+)?/),
+        if (convertedEquation.includes("^") || convertedEquation.includes("*")) {
+            // 乗算と累乗の処理
+            const extractedData = [
+                convertedEquation.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 !== "";
+            if (extractedData[0]) {
+                extractedData[1] = extractedData[0][0]
+                    .split(/(\d+\.\d+)|(\d+)/g)
+                    .filter((number_) => {
+                    return number_ !== undefined && number_ !== "";
                 });
-                if (y[1][0] === y[1][2] || (y[1][2] && y[1][1] === "^")) {
-                    const [n, m] = mathSeparator(y[1][0]);
-                    if (n) {
-                        returnValue = `${Number(y[1][0]) + m}*${n}+`;
-                        if (m <= 100) {
-                            returnValue += `${m}*${m}`;
+                if (extractedData[1][0] === extractedData[1][2] ||
+                    (extractedData[1][2] && extractedData[1][1] === "^")) {
+                    const [primary, remainder] = mathSeparator(extractedData[1][0]);
+                    if (primary) {
+                        convertedEquation = `${Number(extractedData[1][0]) + remainder}*${primary}+`;
+                        if (remainder <= 100) {
+                            convertedEquation += `${remainder}*${remainder}`;
                         }
                         else {
-                            returnValue += mathConverter(`${m}*${m}`);
-                            return returnValue;
+                            convertedEquation += mathConverter(`${remainder}*${remainder}`);
+                            return convertedEquation;
                         }
-                        return returnValue;
+                        return convertedEquation;
                     }
                 }
-                return returnValue;
             }
-            else {
-                return returnValue;
-            }
-        }
-        else {
-            return returnValue;
         }
+        return convertedEquation;
     }
 };
 //# sourceMappingURL=mathConverter.js.map

package/module/Math/mathConverter.js.map

@@ -1 +1 @@
-{"version":3,"file":"mathConverter.js","sourceRoot":"","sources":["../../src/Math/mathConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;GAGG;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAS,EAAU,EAAE;IACjD,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,OAAO,IAAI,EAAE;QACX,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YACtE,YAAY;YACZ,MAAM,CAAC,GAAwC;gBAC7C,WAAW,CAAC,KAAK,CAAC,iCAAiC,CAAC;gBACpD,CAAC,EAAE,CAAC;aACL,CAAC;YACF,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBACR,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;oBACrD,OAAO,OAAO,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC9C,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE;oBACvD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEtC,IAAI,CAAC,EAAE;wBACL,WAAW,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;wBAC7C,IAAI,CAAC,IAAI,GAAG,EAAE;4BACZ,WAAW,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;yBAC5B;6BAAM;4BACL,WAAW,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;4BAC1C,OAAO,WAAW,CAAC;yBACpB;wBACD,OAAO,WAAW,CAAC;qBACpB;iBACF;gBACD,OAAO,WAAW,CAAC;aACpB;iBAAM;gBACL,OAAO,WAAW,CAAC;aACpB;SACF;aAAM;YACL,OAAO,WAAW,CAAC;SACpB;KACF;AACH,CAAC,CAAC"}
+{"version":3,"file":"mathConverter.js","sourceRoot":"","sources":["../../src/Math/mathConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAU,EAAE;IACxD,IAAI,iBAAiB,GAAG,QAAQ,CAAC;IAEjC,OAAO,IAAI,EAAE;QACX,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtE,WAAW;YACX,MAAM,aAAa,GAAwC;gBACzD,iBAAiB,CAAC,KAAK,CAAC,iCAAiC,CAAC;gBAC1D,CAAC,EAAE,CAAC;aACL,CAAC;YAEF,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE;gBACpB,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;qBACnC,KAAK,CAAC,mBAAmB,CAAC;qBAC1B,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;oBAClB,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,CAAC;gBACjD,CAAC,CAAC,CAAC;gBAEL,IACE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC3C,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EACpD;oBACA,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEhE,IAAI,OAAO,EAAE;wBACX,iBAAiB,GAAG,GAClB,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAChC,IAAI,OAAO,GAAG,CAAC;wBAEf,IAAI,SAAS,IAAI,GAAG,EAAE;4BACpB,iBAAiB,IAAI,GAAG,SAAS,IAAI,SAAS,EAAE,CAAC;yBAClD;6BAAM;4BACL,iBAAiB,IAAI,aAAa,CAAC,GAAG,SAAS,IAAI,SAAS,EAAE,CAAC,CAAC;4BAChE,OAAO,iBAAiB,CAAC;yBAC1B;wBACD,OAAO,iBAAiB,CAAC;qBAC1B;iBACF;aACF;SACF;QACD,OAAO,iBAAiB,CAAC;KAC1B;AACH,CAAC,CAAC"}

package/module/Math/mathSeparator.d.ts

@@ -1,5 +1,10 @@
 /**
+ * 最大値の位で区切ります。
+ *
+ * 1250 => [1000, 250]
+ *
+ * 150 => [100, 50]
  * @param  {string|number} number
  * @returns string
  */
-export declare const mathSeparator: (number: string | number) => number[];
+export declare const mathSeparator: (number: string | number) => [number, number];

package/module/Math/mathSeparator.js

@@ -1,17 +1,31 @@
+import { isDouble } from "./isDouble";
 import { isNumber } from "./isNumber";
 /**
+ * 最大値の位で区切ります。
+ *
+ * 1250 => [1000, 250]
+ *
+ * 150 => [100, 50]
  * @param  {string|number} number
  * @returns string
  */
 export const mathSeparator = (number) => {
-    if (isNumber(number)) {
-        const [n, x] = typeof number === "string"
-            ? [number.length - 1, Number(number)]
-            : [String(number).length - 1, number];
+    let copyNumber = number;
+    let decimalPart = 0;
+    if (isDouble(copyNumber)) {
+        const splitNumber = String(copyNumber).split(".");
+        // 小数点部分を取得
+        decimalPart = Number(`0.${splitNumber[1]}`);
+        copyNumber = splitNumber[0];
+    }
+    if (isNumber(copyNumber)) {
+        const [n, x] = typeof copyNumber === "string"
+            ? [copyNumber.length - 1, Number(copyNumber)]
+            : [String(copyNumber).length - 1, copyNumber];
         if (n) {
-            return [Math.pow(10, n), x - Math.pow(10, n)];
+            return [Math.pow(10, n), x - Math.pow(10, n) + decimalPart];
         }
-        return [0, 0];
+        return [Number(copyNumber), 0];
     }
     return [0, 0];
 };

package/module/Math/mathSeparator.js.map

@@ -1 +1 @@
-{"version":3,"file":"mathSeparator.js","sourceRoot":"","sources":["../../src/Math/mathSeparator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAuB,EAAE,EAAE;IACvD,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE;QACpB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GACV,OAAO,MAAM,KAAK,QAAQ;YACxB,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,EAAE;YACL,OAAO,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,EAAE,CAAC,GAAG,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC;SAC/B;QACD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KACf;IACD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"mathSeparator.js","sourceRoot":"","sources":["../../src/Math/mathSeparator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAuB,EAAoB,EAAE;IACzE,IAAI,UAAU,GAAG,MAAM,CAAC;IACxB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE;QACxB,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClD,WAAW;QACX,WAAW,GAAG,MAAM,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5C,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;KAC7B;IACD,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE;QACxB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GACV,OAAO,UAAU,KAAK,QAAQ;YAC5B,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;QAClD,IAAI,CAAC,EAAE;YACL,OAAO,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,EAAE,CAAC,GAAG,SAAA,EAAE,EAAI,CAAC,CAAA,GAAG,WAAW,CAAC,CAAC;SAC7C;QACD,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;KAChC;IACD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAChB,CAAC,CAAC"}

package/module/Math/nCr.d.ts

@@ -1,6 +1,7 @@
 /**
- * nCr
- * @param  {number} n
- * @param  {number} r
+ * n個からr個を選ぶ組み合わせ（nCr）を計算します。
+ * @param n - 選ぶ元となる全体の数
+ * @param r - 選ぶ個数
+ * @returns 組み合わせの結果、または引数が無効な場合はNaN
  */
 export declare const nCr: (n: number, r: number) => number;

package/module/Math/nCr.js

@@ -1,20 +1,20 @@
 import { nPr } from "./nPr";
 /**
- * nCr
- * @param  {number} n
- * @param  {number} r
+ * n個からr個を選ぶ組み合わせ（nCr）を計算します。
+ * @param n - 選ぶ元となる全体の数
+ * @param r - 選ぶ個数
+ * @returns 組み合わせの結果、または引数が無効な場合はNaN
  */
 export const nCr = (n, r) => {
-    //nCr
-    let y = nPr(n, r);
-    let age = 1;
-    for (let i = 2; i <= r; i++) {
-        age *= i;
+    if (n === 0 || r === 0 || n < r) {
+        return Number.NaN;
     }
-    y /= age;
-    if (1 > y) {
-        return 0;
+    const numerator = nPr(n, r);
+    let denominator = 1;
+    for (let index = 2; index <= r; index++) {
+        denominator *= index;
     }
-    return y;
+    const result = numerator / denominator;
+    return result;
 };
 //# sourceMappingURL=nCr.js.map

package/module/Math/nCr.js.map

@@ -1 +1 @@
-{"version":3,"file":"nCr.js","sourceRoot":"","sources":["../../src/Math/nCr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B;;;;GAIG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IAC1C,KAAK;IACL,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAClB,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3B,GAAG,IAAI,CAAC,CAAC;KACV;IACD,CAAC,IAAI,GAAG,CAAC;IACT,IAAI,CAAC,GAAG,CAAC,EAAE;QACT,OAAO,CAAC,CAAC;KACV;IACD,OAAO,CAAC,CAAC;AACX,CAAC,CAAC"}
+{"version":3,"file":"nCr.js","sourceRoot":"","sources":["../../src/Math/nCr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE;IAClD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC/B,OAAO,MAAM,CAAC,GAAG,CAAC;KACnB;IAED,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5B,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE;QACvC,WAAW,IAAI,KAAK,CAAC;KACtB;IAED,MAAM,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC;IAEvC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/module/Math/nHr.d.ts

@@ -1,6 +1,7 @@
 /**
- * 重複を許して取り出す
- * @param  {number} n
- * @param  {number} r
+ * n個からr個を重複を許して選ぶ組み合わせ（nHr）を計算します。
+ * @param n - 選ぶ元となる全体の数
+ * @param r - 選ぶ個数
+ * @returns 重複組み合わせの結果、または引数が無効な場合はNaN
  */
 export declare const nHr: (n: number, r: number) => number;

package/module/Math/nHr.js

@@ -1,17 +1,15 @@
 import { nCr } from "./nCr";
 /**
- * 重複を許して取り出す
- * @param  {number} n
- * @param  {number} r
+ * n個からr個を重複を許して選ぶ組み合わせ（nHr）を計算します。
+ * @param n - 選ぶ元となる全体の数
+ * @param r - 選ぶ個数
+ * @returns 重複組み合わせの結果、または引数が無効な場合はNaN
  */
 export const nHr = (n, r) => {
-    if (n === 0 || r === 0) {
-        return NaN;
+    if (n === 0 || r === 0 || n < 0 || r < 0) {
+        return Number.NaN;
     }
-    const y = nCr(n + r - 1, r);
-    if (1 > y) {
-        return 0;
-    }
-    return y;
+    const result = nCr(n + r - 1, r);
+    return result;
 };
 //# sourceMappingURL=nHr.js.map

package/module/Math/nHr.js.map

@@ -1 +1 @@
-{"version":3,"file":"nHr.js","sourceRoot":"","sources":["../../src/Math/nHr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B;;;;GAIG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IAC1C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACtB,OAAO,GAAG,CAAC;KACZ;IACD,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC,EAAE;QACT,OAAO,CAAC,CAAC;KACV;IACD,OAAO,CAAC,CAAC;AACX,CAAC,CAAC"}
+{"version":3,"file":"nHr.js","sourceRoot":"","sources":["../../src/Math/nHr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE;IAClD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACxC,OAAO,MAAM,CAAC,GAAG,CAAC;KACnB;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAEjC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/module/Math/nPr.d.ts

@@ -1,6 +1,7 @@
 /**
- * nPr
- * @param  {number} n
- * @param  {number} r
+ * n個からr個を選ぶ順列（nPr）を計算します。
+ * @param n - 選ぶ元となる全体の数
+ * @param r - 選ぶ個数
+ * @returns 順列の結果、または引数が無効な場合はNaN
  */
 export declare const nPr: (n: number, r: number) => number;

package/module/Math/nPr.js

@@ -1,37 +1,17 @@
 /**
- * nPr
- * @param  {number} n
- * @param  {number} r
+ * n個からr個を選ぶ順列（nPr）を計算します。
+ * @param n - 選ぶ元となる全体の数
+ * @param r - 選ぶ個数
+ * @returns 順列の結果、または引数が無効な場合はNaN
  */
 export const nPr = (n, r) => {
-    let copyN = n;
-    let copyR = r;
-    // nPr;
-    if (copyN === 0 || copyR === 0) {
-        return NaN;
+    if (n === 0 || r === 0 || n < r) {
+        return Number.NaN;
     }
-    let y = copyN;
-    let x = 0;
-    while (x === 0) {
-        if (copyR === 1) {
-            y *= copyR;
-        }
-        copyR--;
-        if (copyR === 0) {
-            x++;
-        }
-        else {
-            copyN--;
-            if (copyN === 0) {
-                x++;
-                break;
-            }
-            y *= copyN;
-        }
+    let result = 1;
+    for (let index = 0; index < r; index++) {
+        result *= n - index;
     }
-    if (1 > y) {
-        return 0;
-    }
-    return y;
+    return result;
 };
 //# sourceMappingURL=nPr.js.map

package/module/Math/nPr.js.map

@@ -1 +1 @@
-{"version":3,"file":"nPr.js","sourceRoot":"","sources":["../../src/Math/nPr.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IAC1C,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO;IACP,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE;QAC9B,OAAO,GAAG,CAAC;KACZ;IACD,IAAI,CAAC,GAAG,KAAK,CAAC;IACd,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,KAAK,CAAC,EAAE;QACd,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,CAAC,IAAI,KAAK,CAAC;SACZ;QACD,KAAK,EAAE,CAAC;QACR,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,CAAC,EAAE,CAAC;SACL;aAAM;YACL,KAAK,EAAE,CAAC;YACR,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,CAAC,EAAE,CAAC;gBACJ,MAAM;aACP;YACD,CAAC,IAAI,KAAK,CAAC;SACZ;KACF;IACD,IAAI,CAAC,GAAG,CAAC,EAAE;QACT,OAAO,CAAC,CAAC;KACV;IACD,OAAO,CAAC,CAAC;AACX,CAAC,CAAC"}
+{"version":3,"file":"nPr.js","sourceRoot":"","sources":["../../src/Math/nPr.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE;IAClD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC/B,OAAO,MAAM,CAAC,GAAG,CAAC;KACnB;IACD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE;QACtC,MAAM,IAAI,CAAC,GAAG,KAAK,CAAC;KACrB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/module/Simple/Date/index.d.ts

@@ -1,2 +1 @@
-import { nowSimple } from "./now";
-export { nowSimple };
+export * from "./now";

package/module/Simple/Tool/dayOfWeekSimple.d.ts

@@ -1,9 +1,9 @@
 import { hoursTypeInt } from "../../types/clockType";
 import { MonthsWith31Days, MonthsWith31DaysInt, MonthsWithout31Days, MonthsWithout31DaysInt, convertMonTypeZero, dayType, dayTypeInt } from "../../types/dateType";
-declare function dayOfWeekSimple<T extends MonthsWith31DaysInt | MonthsWithout31DaysInt>(props?: {
+declare function dayOfWeekSimple<T extends MonthsWith31DaysInt | MonthsWithout31DaysInt>(properties?: {
     year?: number;
     mon?: T;
     day?: dayTypeInt<T>;
 }, timeDifference?: hoursTypeInt): number;
-declare function dayOfWeekSimple<T extends MonthsWith31Days | MonthsWithout31Days>(props?: `${number}-${convertMonTypeZero<T>}-${dayType<T>}` | `${number}:${convertMonTypeZero<T>}:${dayType<T>}` | `${number}/${convertMonTypeZero<T>}/${dayType<T>}` | Date, timeDifference?: hoursTypeInt): number;
+declare function dayOfWeekSimple<T extends MonthsWith31Days | MonthsWithout31Days>(properties?: `${number}-${convertMonTypeZero<T>}-${dayType<T>}` | `${number}:${convertMonTypeZero<T>}:${dayType<T>}` | `${number}/${convertMonTypeZero<T>}/${dayType<T>}` | Date, timeDifference?: hoursTypeInt): number;
 export { dayOfWeekSimple };

package/module/Simple/Tool/index.d.ts

@@ -1,4 +1,3 @@
-import { birthdaySimple } from "./birthday";
-import { dayOfWeekSimple } from "./dayOfWeekSimple";
-import { deviationValueSimple } from "./deviationValueSimple";
-export { birthdaySimple, dayOfWeekSimple, deviationValueSimple };
+export * from "./birthday";
+export * from "./dayOfWeekSimple";
+export * from "./deviationValueSimple";

package/module/Simple/index.d.ts

@@ -1,5 +1,4 @@
-import { nowSimple } from "./Date/now";
-import { birthdaySimple } from "./Tool/birthday";
-import { dayOfWeekSimple } from "./Tool/dayOfWeekSimple";
-import { deviationValueSimple } from "./Tool/deviationValueSimple";
-export { birthdaySimple, dayOfWeekSimple, deviationValueSimple, nowSimple };
+export * from "./Date/now";
+export * from "./Tool/birthday";
+export * from "./Tool/dayOfWeekSimple";
+export * from "./Tool/deviationValueSimple";

package/module/Tool/dayOfWeek.d.ts

@@ -1,6 +1,6 @@
 import { hoursTypeInt } from "../types/clockType";
 import { dayTypeInt, monTypeInt } from "../types/dateType";
-export declare const dayOfWeek: <T extends monTypeInt>(props?: {
+export declare const dayOfWeek: <T extends monTypeInt>(properties?: {
     year?: number | undefined;
     mon?: T | undefined;
     day?: dayTypeInt<T> | undefined;

package/module/Tool/index.d.ts

@@ -1,11 +1,10 @@
-import { birthday } from "./birthday";
-import { createPipeline } from "./createPipeline";
-import { dayOfWeek } from "./dayOfWeek";
-import { deleteSpace } from "./deleteSpace";
-import { isArr } from "./isArr";
-import { isBrowser } from "./isBrowser";
-import { isNode } from "./isNode";
-import { isNodeWebkit } from "./isNodeWebkit";
-import { isNotEmpty } from "./isNotEmpty";
-import { isObj } from "./isObj";
-export { birthday, dayOfWeek, createPipeline, isBrowser, isNode, isNodeWebkit, isObj, isArr, deleteSpace, isNotEmpty, };
+export * from "./birthday";
+export * from "./createPipeline";
+export * from "./dayOfWeek";
+export * from "./deleteSpace";
+export * from "./isArray";
+export * from "./isBrowser";
+export * from "./isNode";
+export * from "./isNodeWebkit";
+export * from "./isNotEmpty";
+export * from "./isObject";

package/module/index.d.ts

@@ -4,3 +4,4 @@ export * from "./Simple";
 export * from "./String";
 export * from "./Tool";
 export * from "./Date";
+export * from "./Consts";

package/module/tests/Advance/rangeAdvance.test.d.ts

@@ -0,0 +1 @@
+export {};

package/module/tests/Array/checkFlagAlignment.test.d.ts

@@ -0,0 +1 @@
+export {};

package/module/tests/Array/checkFlagAlignment.test.js

@@ -0,0 +1,130 @@
+import { checkFlagAlignment } from "../../Array/checkFlagAlignment";
+describe("checkFlagAlignment", () => {
+    it("横", () => {
+        const matrix = [
+            [
+                { value: 10, flag: true },
+                { value: 20, flag: true },
+                { value: 30, flag: true },
+            ],
+            [
+                { value: 40, flag: false },
+                { value: 50, flag: false },
+                { value: 60, flag: false },
+            ],
+            [
+                { value: 70, flag: false },
+                { value: 80, flag: false },
+                { value: 90, flag: false },
+            ],
+        ];
+        expect(checkFlagAlignment(matrix)).toBe(true);
+    });
+    it("縦", () => {
+        const matrix = [
+            [
+                { value: 10, flag: false },
+                { value: 20, flag: true },
+                { value: 30, flag: false },
+            ],
+            [
+                { value: 40, flag: false },
+                { value: 50, flag: true },
+                { value: 60, flag: false },
+            ],
+            [
+                { value: 70, flag: false },
+                { value: 80, flag: true },
+                { value: 90, flag: false },
+            ],
+        ];
+        expect(checkFlagAlignment(matrix)).toBe(true);
+    });
+    it("斜め(左上)", () => {
+        const matrix = [
+            [
+                { value: 10, flag: true },
+                { value: 20, flag: false },
+                { value: 30, flag: false },
+            ],
+            [
+                { value: 40, flag: false },
+                { value: 50, flag: true },
+                { value: 60, flag: false },
+            ],
+            [
+                { value: 70, flag: false },
+                { value: 80, flag: false },
+                { value: 90, flag: true },
+            ],
+        ];
+        expect(checkFlagAlignment(matrix)).toBe(true);
+    });
+    it("斜め(右上)", () => {
+        const matrix = [
+            [
+                { value: 10, flag: false },
+                { value: 20, flag: false },
+                { value: 30, flag: true },
+            ],
+            [
+                { value: 40, flag: false },
+                { value: 50, flag: true },
+                { value: 60, flag: false },
+            ],
+            [
+                { value: 70, flag: true },
+                { value: 80, flag: false },
+                { value: 90, flag: false },
+            ],
+        ];
+        expect(checkFlagAlignment(matrix)).toBe(true);
+    });
+    it("揃ってない時", () => {
+        const matrix = [
+            [
+                { value: 10, flag: false },
+                { value: 20, flag: true },
+                { value: 30, flag: false },
+            ],
+            [
+                { value: 40, flag: false },
+                { value: 50, flag: true },
+                { value: 60, flag: false },
+            ],
+            [
+                { value: 70, flag: false },
+                { value: 80, flag: false },
+                { value: 90, flag: false },
+            ],
+        ];
+        expect(checkFlagAlignment(matrix)).toBe(false);
+    });
+    // 以下、大量データのテスト
+    it("横(大量)", () => {
+        const row = Array(1000).fill({ flag: true, value: 1 });
+        const matrix = Array(1000).fill(row);
+        expect(checkFlagAlignment(matrix)).toBe(true);
+    });
+    it("縦(大量)", () => {
+        const row = Array(1000).fill({ flag: false, value: 1 });
+        let matrix = Array(1000).fill(row);
+        for (let i = 0; i < matrix.length; i++) {
+            matrix[i][0].flag = true;
+        }
+        expect(checkFlagAlignment(matrix)).toBe(true);
+    });
+    it("斜め(大量)", () => {
+        let matrix = Array.from({ length: 1000 }, () => Array.from({ length: 1000 }, () => ({ flag: false, value: 1 })));
+        for (let i = 0; i < 1000; i++) {
+            matrix[i][i].flag = true;
+        }
+        expect(checkFlagAlignment(matrix)).toBe(true);
+    });
+    it("揃ってない時(大量)", () => {
+        const row = Array(1000).fill({ flag: false, value: 1 });
+        const matrix = Array(1000).fill(row);
+        expect(checkFlagAlignment(matrix)).toBe(false);
+    });
+});
+//# sourceMappingURL=checkFlagAlignment.test.js.map

package/module/tests/Array/checkFlagAlignment.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkFlagAlignment.test.js","sourceRoot":"","sources":["../../../src/tests/Array/checkFlagAlignment.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE;QACX,MAAM,MAAM,GAAG;YACb;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;aAC1B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;SACF,CAAC;QACF,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE;QACX,MAAM,MAAM,GAAG;YACb;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;SACF,CAAC;QACF,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAChB,MAAM,MAAM,GAAG;YACb;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;aAC1B;SACF,CAAC;QACF,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAChB,MAAM,MAAM,GAAG;YACb;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;aAC1B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;SACF,CAAC;QACF,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAChB,MAAM,MAAM,GAAG;YACb;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzB,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;YACD;gBACE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC1B,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aAC3B;SACF,CAAC;QACF,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IACH,eAAe;IACf,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACf,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACf,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACxD,IAAI,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;SAC1B;QACD,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAChB,IAAI,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAC7C,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAChE,CAAC;QACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;SAC1B;QACD,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;QACpB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/module/tests/Math/calculator/calculator.test.js

@@ -1,16 +1,63 @@
 import { calculator } from "../../../Math/calculator";
-test("calculator", () => {
-    expect(calculator("1+1")).toBe("2");
-    expect(calculator("1+1+1")).toBe("3");
-    expect(calculator("1+1+1+1")).toBe("4");
-    expect(calculator("1+1+1+1+1")).toBe("5");
-    expect(calculator("2*2")).toBe("4");
-    expect(calculator("2*2*2")).toBe("8");
-    expect(calculator("2*2*2*2")).toBe("16");
-    expect(calculator("2*2*2*2*2")).toBe("32");
-    expect(calculator("(1+1)")).toBe("2");
-    expect(calculator("(1+1)+(1+1)")).toBe("4");
-    expect(calculator("2x=(1+1)+(1+1)+(1+1)")).toBe("3/1");
-    expect(calculator("$10*2", { $: 100 })).toBe("2000");
+describe("calculator", () => {
+    // 足し算
+    test("should handle addition", () => {
+        expect(calculator("1+")).toBe("1+");
+        expect(calculator("1+1")).toBe("2");
+        expect(calculator("1+1+1")).toBe("3");
+        expect(calculator("1+1+1+1")).toBe("4");
+        expect(calculator("1+1+1+1+1")).toBe("5");
+    });
+    // 引き算
+    test("should handle subtraction", () => {
+        expect(calculator("1-")).toBe("1-");
+        expect(calculator("1-1")).toBe("0");
+        expect(calculator("1-1-1")).toBe("-1");
+        expect(calculator("1-1-1-1")).toBe("-2");
+        expect(calculator("1-1-1-1-1")).toBe("-3");
+    });
+    // 掛け算
+    test("should handle multiplication", () => {
+        expect(calculator("2*")).toBe("2*");
+        expect(calculator("2*2")).toBe("4");
+        expect(calculator("2*2*2")).toBe("8");
+        expect(calculator("2*2*2*2")).toBe("16");
+        expect(calculator("2*2*2*2*2")).toBe("32");
+    });
+    // 割り算
+    test("should handle division", () => {
+        expect(calculator("2/")).toBe("2/");
+        expect(calculator("2/2")).toBe("1");
+        expect(calculator("2/2/2")).toBe("0.5");
+        expect(calculator("2/2/2/2")).toBe("0.25");
+        expect(calculator("2/2/2/2/2")).toBe("0.125");
+    });
+    // べき乗
+    test("should handle exponentiation", () => {
+        expect(calculator("2^")).toBe("2^");
+        expect(calculator("2^2")).toBe("4");
+        expect(calculator("2^2^2")).toBe("16");
+        expect(calculator("2^2^2^2")).toBe("65536");
+        expect(calculator("2^2^2^2^2")).toBe("Infinity");
+        expect(calculator("3^4")).toBe("81");
+        expect(calculator("3^4^2")).toBe("43046721");
+    });
+    // 括弧
+    test("should handle parentheses", () => {
+        expect(calculator("(1+1)")).toBe("2");
+        expect(calculator("(1")).toBe("(1");
+        expect(calculator("(1+")).toBe("(1+");
+        expect(calculator("1)")).toBe("1)");
+        expect(calculator("(1)")).toBe("(1)");
+        expect(calculator("(1+1)+(1+1)")).toBe("4");
+    });
+    // 方程式
+    test("should handle equations", () => {
+        expect(calculator("2x=(1+1)+(1+1)+(1+1)")).toBe("3");
+    });
+    // 変数
+    test("should handle variables", () => {
+        expect(calculator("$10*2", { $: 100 })).toBe("2000");
+    });
 });
 //# sourceMappingURL=calculator.test.js.map

package/module/tests/Math/calculator/calculator.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculator.test.js","sourceRoot":"","sources":["../../../../src/tests/Math/calculator/calculator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;IACtB,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"calculator.test.js","sourceRoot":"","sources":["../../../../src/tests/Math/calculator/calculator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,MAAM;IACN,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAClC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,MAAM;IACN,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM;IACN,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACxC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM;IACN,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAClC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,MAAM;IACN,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACxC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjD,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,KAAK;IACL,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM;IACN,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,KAAK;IACL,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}