umt 1.1.7 → 1.2.0

package/module/Advance/index.d.ts

@@ -0,0 +1 @@
+export * from "./rangeAdvance";

package/module/Advance/rangeAdvance.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 条件式を満たす数値の配列を返す
+ * @param start 開始数値
+ * @param end 終了数値
+ * @param conditionalExpression 条件式
+ * @returns
+ */
+declare function rangeAdvance(start: number, end?: number, conditionalExpression?: (number_: number) => boolean): number[];
+export { rangeAdvance };

package/module/Array/checkFlagAlignment.d.ts

@@ -0,0 +1,3 @@
+export declare const checkFlagAlignment: <T extends {
+    flag: boolean;
+}>(matrix: T[][]) => boolean;

package/module/Array/checkFlagAlignment.js

@@ -0,0 +1,26 @@
+export const checkFlagAlignment = (matrix) => {
+    const rows = matrix.length;
+    const cols = matrix[0].length;
+    // 横方向のチェック
+    for (let index = 0; index < rows; index++) {
+        if (matrix[index].every((cell) => cell.flag)) {
+            return true;
+        }
+    }
+    // 縦方向のチェック
+    for (let index = 0; index < cols; index++) {
+        if (matrix.every((row) => row[index].flag)) {
+            return true;
+        }
+    }
+    // 斜め方向のチェック (左上から右下へ)
+    if (matrix.every((row, index) => row[index].flag)) {
+        return true;
+    }
+    // 斜め方向のチェック (左下から右上へ)
+    if (matrix.every((row, index) => row[cols - index - 1].flag)) {
+        return true;
+    }
+    return false;
+};
+//# sourceMappingURL=checkFlagAlignment.js.map

package/module/Array/checkFlagAlignment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkFlagAlignment.js","sourceRoot":"","sources":["../../src/Array/checkFlagAlignment.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAa,EACJ,EAAE;IACX,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE9B,WAAW;IACX,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,EAAE;QACzC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC5C,OAAO,IAAI,CAAC;SACb;KACF;IAED,WAAW;IACX,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,EAAE;QACzC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;KACF;IAED,sBAAsB;IACtB,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE;QACjD,OAAO,IAAI,CAAC;KACb;IAED,sBAAsB;IACtB,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;QAC5D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/module/Date/index.d.ts

@@ -1,3 +1,2 @@
-import { newDateInt, newDateStr } from "./new";
-import { now } from "./now";
-export { now, newDateInt, newDateStr };
+export * from "./new";
+export * from "./now";

package/module/Math/calculator/convertCurrency.js

@@ -8,15 +8,15 @@ import { multiplication } from "../multiplication";
  * @returns 換算後の通貨額を文字列で返す。換算できない場合は元の文字列を返す。
  */
 export const convertCurrency = (inputString, conversionRates) => {
-    // biome-ignore lint/style/useBlockStatements: <explanation>
-    if (!conversionRates)
+    if (!conversionRates) {
         return inputString;
+    }
     for (const currencySymbol in conversionRates) {
         if (inputString.startsWith(currencySymbol)) {
-            const amountStr = inputString.slice(currencySymbol.length);
+            const amountString = inputString.slice(currencySymbol.length);
             const rate = conversionRates[currencySymbol];
             if (isNumber(rate)) {
-                const amount = Number(amountStr);
+                const amount = Number(amountString);
                 const convertedAmount = multiplication(amount, Number(rate));
                 return Number.isNaN(convertedAmount)
                     ? inputString

package/module/Math/calculator/convertCurrency.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertCurrency.js","sourceRoot":"","sources":["../../../src/Math/calculator/convertCurrency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAK7B,WAAmB,EACnB,eAAmB,EACnB,EAAE;IACF,4DAA4D;IAC5D,IAAI,CAAC,eAAe;QAAE,OAAO,WAAW,CAAC;IAEzC,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,IAAI,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YAC1C,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;YAE7C,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAClB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;gBACjC,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBAE7D,OAAO,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;oBAClC,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;aAC7B;SACF;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC"}
+{"version":3,"file":"convertCurrency.js","sourceRoot":"","sources":["../../../src/Math/calculator/convertCurrency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAK7B,WAAmB,EACnB,eAAmB,EACnB,EAAE;IACF,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,WAAW,CAAC;KACpB;IAED,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,IAAI,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YAC1C,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC9D,MAAM,IAAI,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;YAE7C,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAClB,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;gBACpC,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC7D,OAAO,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;oBAClC,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;aAC7B;SACF;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC"}

package/module/Math/calculator/core.js

@@ -2,6 +2,7 @@ import { addition } from "../../Math/addition";
 import { division } from "../../Math/division";
 import { multiplication } from "../../Math/multiplication";
 import { subtract } from "../../Math/subtract";
+import { isNumber } from "../isNumber";
 import { convertCurrency } from "./convertCurrency";
 export const calculatorCore = (expression, currencyExchange) => {
     let sanitizedExpression = expression;
@@ -15,15 +16,36 @@ export const calculatorCore = (expression, currencyExchange) => {
         }
         // 括弧の処理
         if (containsParentheses(sanitizedExpression)) {
-            sanitizedExpression = resolveParentheses(sanitizedExpression);
+            const temporary = resolveParentheses(sanitizedExpression);
+            if (temporary === NaN.toString()) {
+                return sanitizedExpression;
+            }
+            sanitizedExpression = temporary;
         }
-        // 乗算、除算、べき乗の処理
-        else if (containsMulDivExp(sanitizedExpression)) {
-            sanitizedExpression = resolveMulDivExp(sanitizedExpression);
+        // 乗算、べき乗の処理
+        else if (containsMulExp(sanitizedExpression)) {
+            const temporary = resolveMulExp(sanitizedExpression);
+            if (temporary === NaN.toString()) {
+                return sanitizedExpression;
+            }
+            sanitizedExpression = temporary;
+        }
+        // 除算の処理
+        else if (containsDiv(sanitizedExpression)) {
+            const temporary = resolveDiv(sanitizedExpression);
+            if (temporary === NaN.toString()) {
+                return sanitizedExpression;
+            }
+            sanitizedExpression = temporary;
         }
         // 加算と減算の処理
-        else if (containsAddSub(sanitizedExpression)) {
-            sanitizedExpression = resolveAddSub(sanitizedExpression);
+        else if (containsAddSub(sanitizedExpression) &&
+            !isNumber(sanitizedExpression)) {
+            const temporary = resolveAddSub(sanitizedExpression);
+            if (temporary === NaN.toString()) {
+                return sanitizedExpression;
+            }
+            sanitizedExpression = temporary;
         }
         // もう計算するものがなければ結果を返す
         else {
@@ -33,17 +55,17 @@ export const calculatorCore = (expression, currencyExchange) => {
 };
 const sanitizeSigns = (expr) => {
     return expr
-        .replace(/--/g, "+")
-        .replace(/\+\+/g, "+")
-        .replace(/\+-/g, "+0-")
-        .replace(/\-\+/g, "+0-");
+        .replaceAll("--", "+")
+        .replaceAll("++", "+")
+        .replaceAll("+-", "+0-")
+        .replaceAll("-+", "+0-");
 };
 const applyCurrencyExchange = (expr, rates) => {
     let returnExpr = expr;
     // 通貨の交換ロジック
-    for (const i in rates) {
-        if (returnExpr.indexOf(i) !== -1) {
-            const $ = returnExpr.match(new RegExp(`\\${i}([0-9]+)`));
+    for (const index in rates) {
+        if (returnExpr.includes(index)) {
+            const $ = returnExpr.match(new RegExp(`\\${index}([0-9]+)`));
             if ($) {
                 returnExpr = returnExpr.replace($[0], convertCurrency($[0], rates));
             }
@@ -52,52 +74,56 @@ const applyCurrencyExchange = (expr, rates) => {
     return returnExpr;
 };
 const containsParentheses = (expr) => {
-    return expr.indexOf("(") !== -1 || expr.indexOf(")") !== -1;
+    return expr.includes("(") || expr.includes(")");
 };
 const resolveParentheses = (expr) => {
     // 括弧内の計算ロジック
-    const match = expr.match(/\(\d+\.?(\d+)?(\*|\/|\+|\-)\d+\.?(\d+)?\)/);
+    const match = expr.match(/\(\d+\.?(\d+)?([*+/-])\d+\.?(\d+)?\)/);
     if (match) {
-        return expr.replace(match[0], calculatorCore(match[0].replace(/\(|\)/g, "")));
+        return expr.replace(match[0], calculatorCore(match[0].replaceAll(/\(|\)/g, "")));
     }
-    return expr;
+    return NaN.toString();
 };
-const containsMulDivExp = (expr) => {
-    return (expr.indexOf("^") !== -1 ||
-        expr.indexOf("*") !== -1 ||
-        expr.indexOf("/") !== -1);
+const containsMulExp = (expr) => {
+    return expr.includes("^") || expr.includes("*");
 };
-const resolveMulDivExp = (expr) => {
-    // 乗算、除算、べき乗の計算ロジック
-    const match = expr.match(/\d+\.?(\d+)?(\*|\/|\^)\d+\.?(\d+)?/);
+const containsDiv = (expr) => {
+    return expr.includes("/");
+};
+const resolveMulExp = (expr) => {
+    // 乗算、べき乗の計算ロジック
+    const match = expr.match(/(.*?)(\d+\.?(\d+)?([*^])\d+\.?(\d+)?$)/);
     if (match) {
-        const operands = match[0].split(/(\*|\/|\^)/);
+        const operands = match[2].split(/([*/^])/);
         const result = operands[1] === "^"
             ? Math.pow(Number(operands[0]), Number(operands[2]))
-            : operands[1] === "*"
-                ? multiplication(Number(operands[0]), Number(operands[2]))
-                : operands[1] === "/"
-                    ? division(Number(operands[0]), Number(operands[2]))
-                    : 0;
+            : multiplication(Number(operands[0]), Number(operands[2]));
+        return `${match[1]}${result}`;
+    }
+    return NaN.toString();
+};
+const resolveDiv = (expr) => {
+    // 除算の計算ロジック
+    const match = expr.match(/\d+\.?(\d+)?(\/)\d+\.?(\d+)?/);
+    if (match) {
+        const operands = match[0].split(/(\/)/);
+        const result = division(Number(operands[0]), Number(operands[2]));
         return expr.replace(match[0], String(result));
     }
-    return expr;
+    return NaN.toString();
 };
 const containsAddSub = (expr) => {
-    return expr.indexOf("+") !== -1 || expr.indexOf("-") !== -1;
+    return expr.includes("+") || expr.includes("-");
 };
 const resolveAddSub = (expr) => {
     // 加算、減算の計算ロジック
-    const match = expr.match(/\d+\.?(\d+)?(\+|\-)\d+\.?(\d+)?/);
+    const match = expr.match(/(-?\d+)\.?(\d+)?(\+|-)(-?\d+)\.?(\d+)?/);
     if (match) {
-        const operands = match[0].split(/(\+|\-)/);
-        const result = operands[1] === "+"
-            ? addition(Number(operands[0]), Number(operands[2]))
-            : operands[1] === "-"
-                ? subtract(Number(operands[0]), Number(operands[2]))
-                : 0;
+        const result = match[3] === "+"
+            ? addition(Number(match[1]), Number(match[4]))
+            : subtract(Number(match[1]), Number(match[4]));
         return expr.replace(match[0], String(result));
     }
-    return expr;
+    return NaN.toString();
 };
 //# sourceMappingURL=core.js.map

package/module/Math/calculator/core.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/Math/calculator/core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/Math/calculator/core.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,5 @@
-import { calculator } from "./calculator";
-import { calculatorInitialization } from "./calculatorInitialization";
-import { convertCurrency } from "./convertCurrency";
-import { calculatorCore } from "./core";
-import { literalExpression } from "./literalExpression";
-export { calculator, calculatorInitialization, calculatorCore, convertCurrency, literalExpression, };
+export * from "./calculator";
+export * from "./calculatorInitialization";
+export * from "./convertCurrency";
+export * from "./core";
+export * from "./literalExpression";

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

@@ -1,5 +1,6 @@
 /**
- * 方程式計算
- * @param  {string} x
+ * 文字式の方程式を計算する
+ * @param x 方程式の文字列
+ * @returns 計算結果
  */
 export declare const literalExpression: (x: string) => string;

package/module/Math/calculator/literalExpression.js

@@ -2,51 +2,57 @@ import { division } from "../division";
 import { gcd } from "../gcd";
 import { calculatorCore } from "./core";
 /**
- * 方程式計算
- * @param  {string} x
+ * 文字式の方程式を計算する
+ * @param x 方程式の文字列
+ * @returns 計算結果
  */
 export const literalExpression = (x) => {
-    const cache = [[], ""];
-    for (const i of x.split("=")) {
-        if (/[a-zA-Z]+/.test(i) === false) {
-            cache[1] = i;
+    // 方程式の数値と変数部分を格納
+    let numericalPart = "";
+    let variablePart = [];
+    // 等号で分割し、数値と変数部分を識別
+    for (const part of x.split("=")) {
+        if (/[A-Za-z]+/.test(part)) {
+            variablePart = part
+                .split(/(\d+[A-Za-z]+)|([^A-Za-z]+)/)
+                .filter((n) => n && n !== undefined);
         }
         else {
-            cache[0] = i
-                .split(/([0-9]+[a-zA-Z]+)|([^a-zA-Z]+)/)
-                .filter((n) => n !== "" && typeof n !== "undefined");
+            numericalPart = part;
         }
     }
-    if (cache[0][1]) {
-        cache[0][1] = calculatorCore(cache[0][1]);
-        if (cache[0][1].indexOf("+") !== -1) {
-            cache[0][1] = cache[0][1].replace(/\+/g, "plus");
-        }
-        if (cache[0][1].indexOf("-") !== -1) {
-            cache[0][1] = cache[0][1].replace(/\-/g, "minus");
-        }
-        if (cache[0][1].indexOf("plus") !== 1) {
-            cache[0][1] = cache[0][1].replace(/plus/g, "-");
-        }
-        if (cache[0][1].indexOf("minus") !== 1) {
-            cache[0][1] = cache[0][1].replace(/minus/g, "+");
-        }
+    // 変数部分の計算
+    if (variablePart[1]) {
+        variablePart[1] = calculatorCore(variablePart[1])
+            .replaceAll("+", "plus")
+            .replaceAll("-", "minus")
+            .replaceAll("plus", "-")
+            .replaceAll("minus", "+");
     }
-    cache[1] = cache[0][1]
-        ? calculatorCore(`${cache[1]}${cache[0][1]}`)
-        : calculatorCore(cache[1]);
-    cache[0] = cache[0][0]
-        .split(/([0-9]+)|([a-zA-Z]+)/)
-        .filter((n) => n !== "" && typeof n !== "undefined");
-    if (Number.isNaN(Number(cache[0][0]))) {
-        return cache[1];
+    // 数値部分の計算
+    numericalPart = variablePart[1]
+        ? calculatorCore(`${numericalPart}${variablePart[1]}`)
+        : calculatorCore(numericalPart);
+    // 変数部分を再分割
+    variablePart = variablePart[0]
+        .split(/(\d+)|([A-Za-z]+)/)
+        .filter((n) => n && n !== undefined);
+    // 数値がない場合は計算結果を返す
+    if (Number.isNaN(Number(variablePart[0]))) {
+        return numericalPart;
     }
-    else {
-        const cacheGcd = gcd(Number(cache[0][0]), Number(cache[1]));
-        if (cacheGcd !== 1) {
-            return `${division(Number(cache[1]), cacheGcd)}/${division(Number(cache[0][0]), cacheGcd)}`;
+    // 最大公約数で簡約
+    const commonGcd = gcd(Number(variablePart[0]), Number(numericalPart));
+    console.log("====================================");
+    console.log(commonGcd, variablePart[0], numericalPart);
+    console.log("====================================");
+    if (commonGcd !== 1) {
+        numericalPart = `${division(Number(numericalPart), commonGcd)}/${division(Number(variablePart[0]), commonGcd)}`;
+        if (/(-?)\d+\/1/.test(numericalPart)) {
+            return numericalPart.replace(/\/1/, "");
         }
-        return cache[0][0] === "1" ? `${cache[1]}/${cache[0][0]}` : cache[1];
+        return numericalPart;
     }
+    return numericalPart;
 };
 //# sourceMappingURL=literalExpression.js.map

package/module/Math/calculator/literalExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"literalExpression.js","sourceRoot":"","sources":["../../../src/Math/calculator/literalExpression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"literalExpression.js","sourceRoot":"","sources":["../../../src/Math/calculator/literalExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAU,EAAE;IACrD,iBAAiB;IACjB,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,YAAY,GAAa,EAAE,CAAC;IAEhC,oBAAoB;IACpB,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC/B,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC1B,YAAY,GAAG,IAAI;iBAChB,KAAK,CAAC,6BAA6B,CAAC;iBACpC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC;SACxC;aAAM;YACL,aAAa,GAAG,IAAI,CAAC;SACtB;KACF;IAED,UAAU;IACV,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE;QACnB,YAAY,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;aAC9C,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;aACvB,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC;aACxB,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC;aACvB,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;KAC7B;IAED,UAAU;IACV,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC,cAAc,CAAC,GAAG,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;IAElC,WAAW;IACX,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC;SAC3B,KAAK,CAAC,mBAAmB,CAAC;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC;IAEvC,kBAAkB;IAClB,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;QACzC,OAAO,aAAa,CAAC;KACtB;IAED,WAAW;IACX,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACpD,IAAI,SAAS,KAAK,CAAC,EAAE;QACnB,aAAa,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,SAAS,CAAC,IAAI,QAAQ,CACvE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EACvB,SAAS,CACV,EAAE,CAAC;QACJ,IAAI,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YACpC,OAAO,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;SACzC;QACD,OAAO,aAAa,CAAC;KACtB;IAED,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}

package/module/Math/gcd.d.ts

@@ -1,5 +1,5 @@
 /**
- * 自然数の最大公約数
+ * 最大公約数
  * @param  {number} x
  * @param  {number} y
  * @param  {number} ...z

package/module/Math/gcd.js

@@ -1,19 +1,18 @@
-import { valueSwap } from "./valueSwap";
 /**
- * 自然数の最大公約数
+ * 最大公約数
  * @param  {number} x
  * @param  {number} y
  * @param  {number} ...z
  * @returns number
  */
 export const gcd = (x, y, ...z) => {
-    let copyX = x;
-    let copyY = y;
-    const copyZ = z;
+    let copyX = Math.abs(x);
+    let copyY = Math.abs(y);
+    const copyZ = z.map((element) => Math.abs(element));
     if (copyX === 0 || copyY === 0) {
         return 0;
     }
-    [copyX, copyY] = valueSwap(copyX, copyY);
+    [copyX, copyY] = [Math.max(copyX, copyY), Math.min(copyX, copyY)];
     /* ユークリッドの互除法 */
     let r = copyY % copyX;
     while (r !== 0) {
@@ -22,8 +21,8 @@ export const gcd = (x, y, ...z) => {
         r = copyY % copyX;
     }
     if (copyZ.length > 0) {
-        for (let i = 0; i < copyZ.length; i++) {
-            copyX = gcd(copyX, copyZ[i]);
+        for (const element of copyZ) {
+            copyX = gcd(copyX, element);
         }
     }
     return copyX;

package/module/Math/gcd.js.map

@@ -1 +1 @@
-{"version":3,"file":"gcd.js","sourceRoot":"","sources":["../../src/Math/gcd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,GAAG,CAAW,EAAE,EAAE;IAC1D,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,KAAK,GAAG,CAAC,CAAC;IAChB,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE;QAC9B,OAAO,CAAC,CAAC;KACV;IACD,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,gBAAgB;IAChB,IAAI,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;IACtB,OAAO,CAAC,KAAK,CAAC,EAAE;QACd,KAAK,GAAG,KAAK,CAAC;QACd,KAAK,GAAG,CAAC,CAAC;QACV,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;KACnB;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
+{"version":3,"file":"gcd.js","sourceRoot":"","sources":["../../src/Math/gcd.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,GAAG,CAAW,EAAE,EAAE;IAC1D,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxB,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACpD,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE;QAC9B,OAAO,CAAC,CAAC;KACV;IACD,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAElE,gBAAgB;IAChB,IAAI,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;IACtB,OAAO,CAAC,KAAK,CAAC,EAAE;QACd,KAAK,GAAG,KAAK,CAAC;QACd,KAAK,GAAG,CAAC,CAAC;QACV,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;KACnB;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE;YAC3B,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SAC7B;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/module/Math/index.d.ts

@@ -1,40 +1,39 @@
-import { addition } from "./addition";
-import { average } from "./average";
-import { calculator } from "./calculator";
-import { calculatorInitialization } from "./calculator/calculatorInitialization";
-import { degToRad } from "./degToRad";
-import { deviationValue } from "./deviationValue";
-import { division } from "./division";
-import { factorial } from "./factorial";
-import { factorize } from "./factorize";
-import { gcd } from "./gcd";
-import { getDecimalLength } from "./getDecimalLength";
-import { isDouble } from "./isDouble";
-import { isNumber } from "./isNumber";
-import { isPrimeNumber } from "./isPrimeNumber";
-import { isValueNaN } from "./isValueNaN";
-import { lcm } from "./lcm";
-import { mathConverter } from "./mathConverter";
-import { mathSeparator } from "./mathSeparator";
-import { max } from "./max";
-import { min } from "./min";
-import { multiples } from "./multiples";
-import { multiplication } from "./multiplication";
-import { nCr } from "./nCr";
-import { nHr } from "./nHr";
-import { nPr } from "./nPr";
-import { primeFactorization } from "./primeFactorization";
-import { quotient } from "./quotient";
-import { radToDeg } from "./radToDeg";
-import { random } from "./random";
-import { reduce } from "./reduce";
-import { repeatedTrial } from "./repeatedTrial";
-import { roundOf } from "./roundOf";
-import { solveEquation } from "./solveEquation";
-import { standardDeviation } from "./standardDeviation";
-import { subtract } from "./subtract";
-import { toBinary } from "./toBinary";
-import { toCelsius } from "./toCelsius";
-import { toKelvin } from "./toKelvin";
-import { valueSwap } from "./valueSwap";
-export { addition, average, calculator, calculatorInitialization, degToRad, deviationValue, division, factorial, factorize, gcd, getDecimalLength, isDouble, isNumber, isPrimeNumber, lcm, mathConverter, mathSeparator, max, min, multiples, multiplication, nCr, nHr, nPr, primeFactorization, quotient, radToDeg, random, reduce, repeatedTrial, roundOf, solveEquation, standardDeviation, subtract, toBinary, toCelsius, toKelvin, isValueNaN, valueSwap, };
+export * from "./addition";
+export * from "./average";
+export * from "./calculator";
+export * from "./calculator/calculatorInitialization";
+export * from "./degToRad";
+export * from "./deviationValue";
+export * from "./division";
+export * from "./factorial";
+export * from "./factorize";
+export * from "./gcd";
+export * from "./getDecimalLength";
+export * from "./isDouble";
+export * from "./isNumber";
+export * from "./isPrimeNumber";
+export * from "./isValueNaN";
+export * from "./lcm";
+export * from "./mathConverter";
+export * from "./mathSeparator";
+export * from "./max";
+export * from "./min";
+export * from "./multiples";
+export * from "./multiplication";
+export * from "./nCr";
+export * from "./nHr";
+export * from "./nPr";
+export * from "./primeFactorization";
+export * from "./quotient";
+export * from "./radToDeg";
+export * from "./random";
+export * from "./reduce";
+export * from "./repeatedTrial";
+export * from "./roundOf";
+export * from "./solveEquation";
+export * from "./standardDeviation";
+export * from "./subtract";
+export * from "./toBinary";
+export * from "./toCelsius";
+export * from "./toKelvin";
+export * from "./valueSwap";

package/module/Math/isDouble.d.ts

@@ -1,4 +1,5 @@
 /**
+ * 小数かどうかを判定する
  * @param {unknown} x
  * @param {boolean} [loose=true] - 文字列も対象にするかどうか
  * @returns boolean

package/module/Math/isDouble.js

@@ -1,4 +1,5 @@
 /**
+ * 小数かどうかを判定する
  * @param {unknown} x
  * @param {boolean} [loose=true] - 文字列も対象にするかどうか
  * @returns boolean
@@ -6,15 +7,13 @@
 function isDouble(x, loose = true) {
     if (loose) {
         return (
-        // biome-ignore lint/nursery/noGlobalIsFinite: <explanation>
+        // biome-ignore lint/suspicious/noGlobalIsFinite: <explanation>
         isFinite(x) &&
             !Number.isNaN(x) &&
             Number.isFinite(Number(x)) &&
             !Number.isInteger(Number(x)));
     }
-    else {
-        return Number.isFinite(x) && !Number.isInteger(x);
-    }
+    return Number.isFinite(x) && !Number.isInteger(x);
 }
 export { isDouble };
 //# sourceMappingURL=isDouble.js.map

package/module/Math/isDouble.js.map

@@ -1 +1 @@
-{"version":3,"file":"isDouble.js","sourceRoot":"","sources":["../../src/Math/isDouble.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,SAAS,QAAQ,CAAC,CAAU,EAAE,KAAK,GAAG,IAAI;IACxC,IAAI,KAAK,EAAE;QACT,OAAO;QACL,4DAA4D;QAC5D,QAAQ,CAAC,CAAW,CAAC;YACrB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAChB,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC7B,CAAC;KACH;SAAM;QACL,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KACnD;AACH,CAAC;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"isDouble.js","sourceRoot":"","sources":["../../src/Math/isDouble.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,SAAS,QAAQ,CAAC,CAAU,EAAE,KAAK,GAAG,IAAI;IACxC,IAAI,KAAK,EAAE;QACT,OAAO;QACL,+DAA+D;QAC/D,QAAQ,CAAC,CAAW,CAAC;YACrB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAChB,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC7B,CAAC;KACH;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/module/Math/mathConverter.d.ts

@@ -1,5 +1,9 @@
 /**
- * @param {string} x
- * @returns string
+ * nの2乗を展開します。
+ *
+ * 1250*1250 => 1500*1000+400*100+200*100+50*50
+ *
+ * @param {string} equation - 変換する数学的な式
+ * @returns {string} 変換後の式
  */
-export declare const mathConverter: (x: string) => string;
+export declare const mathConverter: (equation: string) => string;