mirror of
https://github.com/gchq/CyberChef.git
synced 2025-04-22 07:46:16 -04:00
export Arithmetic funcs individually. Use existing Delim
This commit is contained in:
parent
f79dd29ed3
commit
6ddc1b1c9c
8 changed files with 158 additions and 170 deletions
|
@ -5,9 +5,11 @@
|
|||
* @license Apache-2.0
|
||||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import Arithmetic from "../lib/Arithmetic";
|
||||
import BigNumber from "bignumber.js";
|
||||
import Operation from "../Operation";
|
||||
import { div, createNumArray } from "../lib/Arithmetic";
|
||||
import { DELIM_OPTIONS } from "../lib/Delim";
|
||||
|
||||
|
||||
/**
|
||||
* Divide operation
|
||||
|
@ -29,7 +31,7 @@ class Divide extends Operation {
|
|||
{
|
||||
"name": "Delimiter",
|
||||
"type": "option",
|
||||
"value": Arithmetic.DELIM_OPTIONS,
|
||||
"value": DELIM_OPTIONS,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
@ -40,7 +42,7 @@ class Divide extends Operation {
|
|||
* @returns {BigNumber}
|
||||
*/
|
||||
run(input, args) {
|
||||
const val = Arithmetic._div(Arithmetic._createNumArray(input, args[0]));
|
||||
const val = div(createNumArray(input, args[0]));
|
||||
return val instanceof BigNumber ? val : new BigNumber(NaN);
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import Arithmetic from "../lib/Arithmetic";
|
||||
import { mean, createNumArray } from "../lib/Arithmetic";
|
||||
import { DELIM_OPTIONS } from "../lib/Delim";
|
||||
import BigNumber from "bignumber.js";
|
||||
|
||||
/**
|
||||
|
@ -29,7 +30,7 @@ class Mean extends Operation {
|
|||
{
|
||||
"name": "Delimiter",
|
||||
"type": "option",
|
||||
"value": Arithmetic.DELIM_OPTIONS,
|
||||
"value": DELIM_OPTIONS,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
@ -40,7 +41,7 @@ class Mean extends Operation {
|
|||
* @returns {BigNumber}
|
||||
*/
|
||||
run(input, args) {
|
||||
const val = Arithmetic._mean(Arithmetic._createNumArray(input, args[0]));
|
||||
const val = mean(createNumArray(input, args[0]));
|
||||
return val instanceof BigNumber ? val : new BigNumber(NaN);
|
||||
}
|
||||
|
||||
|
|
|
@ -5,9 +5,10 @@
|
|||
* @license Apache-2.0
|
||||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import Arithmetic from "../lib/Arithmetic";
|
||||
import BigNumber from "bignumber.js";
|
||||
import Operation from "../Operation";
|
||||
import { median, createNumArray } from "../lib/Arithmetic";
|
||||
import { DELIM_OPTIONS } from "../lib/Delim";
|
||||
|
||||
/**
|
||||
* Median operation
|
||||
|
@ -29,7 +30,7 @@ class Median extends Operation {
|
|||
{
|
||||
"name": "Delimiter",
|
||||
"type": "option",
|
||||
"value": Arithmetic.DELIM_OPTIONS,
|
||||
"value": DELIM_OPTIONS,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
@ -40,7 +41,7 @@ class Median extends Operation {
|
|||
* @returns {BigNumber}
|
||||
*/
|
||||
run(input, args) {
|
||||
const val = Arithmetic._median(Arithmetic._createNumArray(input, args[0]));
|
||||
const val = median(createNumArray(input, args[0]));
|
||||
return val instanceof BigNumber ? val : new BigNumber(NaN);
|
||||
}
|
||||
|
||||
|
|
|
@ -5,9 +5,11 @@
|
|||
* @license Apache-2.0
|
||||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import Arithmetic from "../lib/Arithmetic";
|
||||
import BigNumber from "bignumber.js";
|
||||
import Operation from "../Operation";
|
||||
import { multi, createNumArray } from "../lib/Arithmetic";
|
||||
import { DELIM_OPTIONS } from "../lib/Delim";
|
||||
|
||||
|
||||
/**
|
||||
* Multiply operation
|
||||
|
@ -29,7 +31,7 @@ class Multiply extends Operation {
|
|||
{
|
||||
"name": "Delimiter",
|
||||
"type": "option",
|
||||
"value": Arithmetic.DELIM_OPTIONS,
|
||||
"value": DELIM_OPTIONS,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
@ -40,7 +42,7 @@ class Multiply extends Operation {
|
|||
* @returns {BigNumber}
|
||||
*/
|
||||
run(input, args) {
|
||||
const val = Arithmetic._multi(Arithmetic._createNumArray(input, args[0]));
|
||||
const val = multi(createNumArray(input, args[0]));
|
||||
return val instanceof BigNumber ? val : new BigNumber(NaN);
|
||||
}
|
||||
|
||||
|
|
|
@ -5,9 +5,11 @@
|
|||
* @license Apache-2.0
|
||||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import Arithmetic from "../lib/Arithmetic";
|
||||
import BigNumber from "bignumber.js";
|
||||
import Operation from "../Operation";
|
||||
import { stdDev, createNumArray } from "../lib/Arithmetic";
|
||||
import { DELIM_OPTIONS } from "../lib/Delim";
|
||||
|
||||
|
||||
/**
|
||||
* Standard Deviation operation
|
||||
|
@ -29,7 +31,7 @@ class StandardDeviation extends Operation {
|
|||
{
|
||||
"name": "Delimiter",
|
||||
"type": "option",
|
||||
"value": Arithmetic.DELIM_OPTIONS,
|
||||
"value": DELIM_OPTIONS,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
@ -40,7 +42,7 @@ class StandardDeviation extends Operation {
|
|||
* @returns {BigNumber}
|
||||
*/
|
||||
run(input, args) {
|
||||
const val = Arithmetic._stdDev(Arithmetic._createNumArray(input, args[0]));
|
||||
const val = stdDev(createNumArray(input, args[0]));
|
||||
return val instanceof BigNumber ? val : new BigNumber(NaN);
|
||||
|
||||
}
|
||||
|
|
|
@ -5,9 +5,11 @@
|
|||
* @license Apache-2.0
|
||||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import Arithmetic from "../lib/Arithmetic";
|
||||
import BigNumber from "bignumber.js";
|
||||
import Operation from "../Operation";
|
||||
import { sub, createNumArray } from "../lib/Arithmetic";
|
||||
import { DELIM_OPTIONS } from "../lib/Delim";
|
||||
|
||||
|
||||
/**
|
||||
* Subtract operation
|
||||
|
@ -29,7 +31,7 @@ class Subtract extends Operation {
|
|||
{
|
||||
"name": "Delimiter",
|
||||
"type": "option",
|
||||
"value": Arithmetic.DELIM_OPTIONS,
|
||||
"value": DELIM_OPTIONS,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
@ -40,7 +42,7 @@ class Subtract extends Operation {
|
|||
* @returns {BigNumber}
|
||||
*/
|
||||
run(input, args) {
|
||||
const val = Arithmetic._sub(Arithmetic._createNumArray(input, args[0]));
|
||||
const val = sub(createNumArray(input, args[0]));
|
||||
return val instanceof BigNumber ? val : new BigNumber(NaN);
|
||||
}
|
||||
|
||||
|
|
|
@ -4,9 +4,11 @@
|
|||
* @license Apache-2.0
|
||||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import Arithmetic from "../lib/Arithmetic";
|
||||
import BigNumber from "bignumber.js";
|
||||
import Operation from "../Operation";
|
||||
import { sum, createNumArray } from "../lib/Arithmetic";
|
||||
import { DELIM_OPTIONS } from "../lib/Delim";
|
||||
|
||||
|
||||
/**
|
||||
* Sum operation
|
||||
|
@ -28,7 +30,7 @@ class Sum extends Operation {
|
|||
{
|
||||
"name": "Delimiter",
|
||||
"type": "option",
|
||||
"value": Arithmetic.DELIM_OPTIONS,
|
||||
"value": DELIM_OPTIONS,
|
||||
}
|
||||
];
|
||||
}
|
||||
|
@ -39,7 +41,7 @@ class Sum extends Operation {
|
|||
* @returns {BigNumber}
|
||||
*/
|
||||
run(input, args) {
|
||||
const val = Arithmetic._sum(Arithmetic._createNumArray(input, args[0]));
|
||||
const val = sum(createNumArray(input, args[0]));
|
||||
return val instanceof BigNumber ? val : new BigNumber(NaN);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue