Skip to content

Adding Basic Arithmetic operation #1279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/core/config/Categories.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
"AND",
"ADD",
"SUB",
"Basic Arithmetic",
"Sum",
"Subtract",
"Multiply",
Expand Down
48 changes: 48 additions & 0 deletions src/core/operations/BasicArithmetic.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/**
* @author scottdermott [[email protected]]
* @copyright Crown Copyright 2021
* @license Apache-2.0
*/

import Operation from "../Operation.mjs";

/**
* Basic Arithmetic operation
*/
class BasicArithmetic extends Operation {

/**
* BasicArithmetic constructor
*/
constructor() {
super();

this.name = "Basic Arithmetic";
this.module = "Default";
this.description = "Evalutes Basic Arithmetic. <br><br>e.g. <code>1+2-1</code> becomes <code>2</code>";
this.infoURL = "";
this.inputType = "string";
this.outputType = "number";
this.args = [];
}
/**
* @param {string} input
* @param {Object[]} args
* @returns {number}
*/
run(input, args) {
if (parseInt(input, 10).toString().length === input.length) {
return parseInt(input, 10);
} else if (input.match(/[+-]?([0-9.]+)/g)) {
return (input.replace(/\s/g, "").match(/[+-]?([0-9.]+)/g) || [])
.reduce(function (sum, value) {
return parseFloat(sum) + parseFloat(value);
});
} else {
return NaN;
}
}

}

export default BasicArithmetic;
68 changes: 68 additions & 0 deletions tests/operations/tests/BasicArithmetic.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/**
* @author scottdermott [[email protected]]
* @copyright Crown Copyright 2021
* @license Apache-2.0
*/

/**
* Basic Arithmetic Tests
*/
import TestRegister from "../../lib/TestRegister.mjs";

TestRegister.addTests([
{
name: "Basic Arithmetic: nothing",
input: "",
expectedOutput: "",
recipeConfig: [
{
op: "Basic Arithmetic",
args: [],
},
],
},
{
name: "Basic Arithmetic: Addition",
input: "1+2+3+4+5+6+7+8+9+0",
expectedOutput: 45,
recipeConfig: [
{
op: "Basic Arithmetic",
args: [],
},
],
},
{
name: "Basic Arithmetic: Subtraction",
input: "100-9-8-7-6-5-4-3-2-1-0",
expectedOutput: 55,
recipeConfig: [
{
op: "Basic Arithmetic",
args: [],
},
],
},
{
name: "Basic Arithmetic: Add + Sub",
input: "1+2+3+4+5+6+7+8+9-9-8-7-6-5-4-3-2-1",
expectedOutput: 0,
recipeConfig: [
{
op: "Basic Arithmetic",
args: [],
},
],
},
{
name: "Basic Arithmetic: Large number",
input: "999+999+999+999+999+999+999+999+999+999+999+999+999+999+999+999+999+999+999+999+999+999+999",
expectedOutput: 22977,
recipeConfig: [
{
op: "Basic Arithmetic",
args: [],
},
],
},
]);