Skip to content

Bump webpack from 5.75.0 to 5.77.0 #53

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.

Sign up for GitHub

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 2 commits into
base: main
Choose a base branch
from
Open

Bump webpack from 5.75.0 to 5.77.0 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d647aa
evaluate_to_constant returns NaN for non-numeric, by default
dqnykamp Mar 29, 2023
16b16b8
Bump webpack from 5.75.0 to 5.77.0
dependabot[bot] Mar 29, 2023
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
4 changes: 2 additions & 2 deletions build/math-expressions.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/math-expressions_umd.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions lib/assumptions/element_of_sets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ function is_integer_ast(tree, assumptions, original_assumptions) {
return Number.isInteger(tree);

// if can convert to constant, evaluate directly
var c = evaluate_to_constant(tree, false);
var c = evaluate_to_constant(tree, {remove_units_first: false, nan_for_non_numeric: false});
if(c !== null) {
return Number.isInteger(c);
}
Expand Down Expand Up @@ -436,7 +436,7 @@ function is_real_ast(tree, assumptions, original_assumptions) {
return Number.isFinite(tree);

// if can convert to constant, evaluate directly
var c = evaluate_to_constant(tree, false);
var c = evaluate_to_constant(tree, {remove_units_first: false, nan_for_non_numeric: false});

if(c !== null) {
if(typeof c === 'number') {
Expand Down Expand Up @@ -762,7 +762,7 @@ function is_complex_ast(tree, assumptions, original_assumptions) {
return Number.isFinite(tree);

// if can convert to constant, evaluate directly
var c = evaluate_to_constant(tree, false);
var c = evaluate_to_constant(tree, {remove_units_first: false, nan_for_non_numeric: false});
if(c !== null) {
if(typeof c === 'number') {
return Number.isFinite(c);
Expand Down Expand Up @@ -1057,7 +1057,7 @@ function is_nonzero_ast(tree, assumptions, original_assumptions) {
}

// if can convert to constant, evaluate directly
var c = evaluate_to_constant(tree, false);
var c = evaluate_to_constant(tree, {remove_units_first: false, nan_for_non_numeric: false});
if(c !== null) {
if(typeof c === 'number') {
if(Number.isFinite(c))
Expand Down Expand Up @@ -1489,7 +1489,7 @@ function is_positive_ast(tree, assumptions, strict, original_assumptions) {
return is_real;

// if can convert to constant, evaluate directly
var c = evaluate_to_constant(tree, false);
var c = evaluate_to_constant(tree, {remove_units_first: false, nan_for_non_numeric: false});

if(c !== null) {
if(typeof c === 'number') {
Expand Down
17 changes: 10 additions & 7 deletions lib/expression/evaluation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,20 @@ const evaluate = function (expr, bindings) {
// return parser.ast.to.finiteField( expr.tree, modulus )( bindings );
// };

const evaluate_to_constant = function (expr_or_tree, remove_units_first = true, scale_based_on_unit = true) {
const evaluate_to_constant = function (expr_or_tree,
{ remove_units_first = true, scale_based_on_unit = true, nan_for_non_numeric = true } = {}
) {
// evaluate to number by converting tree to number
// and calling without arguments

// return null if couldn't evaluate to constant (e.g., contains a variable)
// otherwise returns constant
// return NaN (or null if nan_for_non_numeric is false)
// if couldn't evaluate to constant (e.g., contains a variable)
// otherwise returns constant (which could be NaN for an expression like 0/0)
// NOTE: constant could be a math.js complex number object

var tree = get_tree(expr_or_tree);

if(remove_units_first) {
if (remove_units_first) {
tree = remove_units(tree, scale_based_on_unit);
}

Expand All @@ -56,14 +59,14 @@ const evaluate_to_constant = function (expr_or_tree, remove_units_first = true,
} else if (tree === "i" && math.define_i) {
return { re: 0, im: 1 };
}
return null;
return nan_for_non_numeric ? NaN : null;
}

if (!Array.isArray(tree)) {
return null;
return nan_for_non_numeric ? NaN : null;
}

var num = null;
var num = nan_for_non_numeric ? NaN : null;
try {
var the_f = f(tree);
num = the_f();
Expand Down
8 changes: 4 additions & 4 deletions lib/expression/simplify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,9 +584,9 @@ function evaluate_numbers_sub(tree, assumptions, max_digits, skip_ordering, eval
return null;
}

var c = evaluate_to_constant(tree, false);
var c = evaluate_to_constant(tree, {remove_units_first: false});

if (c !== null) {
if (!Number.isNaN(c)) {
if (typeof c === 'number') {
if (Number.isFinite(c)) {
let n = simplify_number(c);
Expand Down Expand Up @@ -882,8 +882,8 @@ function collect_like_terms_factors(expr_or_tree, assumptions, max_digits) {
return true;
if (Array.isArray(s) && s[0] === '-' && (typeof s[1] === 'number'))
return true;
let c = evaluate_to_constant(s, false);
if (typeof c === 'number' && Number.isFinite(c))
var c = evaluate_to_constant(s, {remove_units_first: false});
if (Number.isFinite(c))
return true;

return false;
Expand Down
12 changes: 6 additions & 6 deletions lib/polynomial/polynomial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ function expression_to_polynomial(expr_or_tree) {
if(typeof tree === 'number')
return tree;

let c = evaluate_to_constant(tree, false);
if(c !== null && Number.isFinite(c)) {
var c = evaluate_to_constant(tree, {remove_units_first: false});
if(Number.isFinite(c)) {
return simplify.simplify(tree);
}

Expand Down Expand Up @@ -80,10 +80,10 @@ function expression_to_polynomial(expr_or_tree) {
// if pow isn't a literal nonnegative integer
if((typeof pow !== 'number') || pow < 0 || !Number.isInteger(pow)) {

let pow_num = evaluate_to_constant(pow, false);
let pow_num = evaluate_to_constant(pow, {remove_units_first: false});

// check if pow is a rational number with a small base
if(pow_num !== null || Number.isFinite(pow_num)) {
if(Number.isFinite(pow_num)) {
let pow_fraction = math.fraction(pow_num);
if(pow_fraction.d <= 100) {
if(pow_fraction.s < 0)
Expand Down Expand Up @@ -117,9 +117,9 @@ function expression_to_polynomial(expr_or_tree) {
else if(operator === '/') {
var denom = operands[1];

var denom_num = evaluate_to_constant(denom, false);
var denom_num = evaluate_to_constant(denom, {remove_units_first: false});

if(denom_num === null || !Number.isFinite(denom_num)) {
if(!Number.isFinite(denom_num)) {
// return entire tree as polynomial variable
return ['polynomial', tree, [[1, 1]]];
}
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "math-expressions",
"description": "Perform basic equality testing and symbolic computations on mathematical expressions involving transcendental functions",
"version": "2.0.0-alpha59",
"version": "2.0.0-alpha60",
"author": {
"name": "Jim Fowler",
"email": "[email protected]",
Expand Down
16 changes: 8 additions & 8 deletions spec/slow_simplify.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ describe("evaluate_to_constant", function () {

});

it("with blanks gives null", function () {
expect(me.fromText("1+2+").evaluate_to_constant()).toEqual(null);
it("with blanks gives NaN", function () {
expect(me.fromText("1+2+").evaluate_to_constant()).toEqual(NaN);
})

it("multiple pluses and minus", function () {
Expand All @@ -298,19 +298,19 @@ describe("evaluate_to_constant", function () {
})

it("with units", function () {
expect(me.fromText("50%").evaluate_to_constant(false)).toEqual(null);
expect(me.fromText("50%").evaluate_to_constant({remove_units_first:false})).toEqual(NaN);
expect(me.fromText("50%").evaluate_to_constant()).toEqual(0.5);
expect(me.fromText("50%").evaluate_to_constant(true, false)).toEqual(50);
expect(me.fromText("50%").evaluate_to_constant({scale_based_on_unit: false})).toEqual(50);
expect(me.fromText("50%").remove_units().evaluate_to_constant()).toEqual(0.5);
expect(me.fromText("50%").remove_units(false).evaluate_to_constant()).toEqual(50);
expect(me.fromText("$9.5").evaluate_to_constant(false)).toEqual(null);
expect(me.fromText("$9.5").evaluate_to_constant({remove_units_first:false})).toEqual(NaN);
expect(me.fromText("$9.5").evaluate_to_constant()).toEqual(9.5);
expect(me.fromText("$9.5").evaluate_to_constant(true, false)).toEqual(9.5);
expect(me.fromText("$9.5").evaluate_to_constant({scale_based_on_unit: false})).toEqual(9.5);
expect(me.fromText("$9.5").remove_units().evaluate_to_constant()).toEqual(9.5);
expect(me.fromText("$9.5").remove_units(false).evaluate_to_constant()).toEqual(9.5);
expect(me.fromText("180deg").evaluate_to_constant(false)).toEqual(null);
expect(me.fromText("180deg").evaluate_to_constant({remove_units_first:false})).toEqual(NaN);
expect(me.fromText("180deg").evaluate_to_constant()).toEqual(Math.PI);
expect(me.fromText("180deg").evaluate_to_constant(true, false)).toEqual(180);
expect(me.fromText("180deg").evaluate_to_constant({scale_based_on_unit: false})).toEqual(180);
expect(me.fromText("180deg").remove_units().evaluate_to_constant()).toEqual(Math.PI);
expect(me.fromText("180deg").remove_units(false).evaluate_to_constant()).toEqual(180);
})
Expand Down