Skip to content
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

Organized Simplifications and Edited Sgn Functions #221

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

andrew-murdza
Copy link
Contributor

No description provided.

@@ -163,7 +163,10 @@ export const ARITHMETIC_LIBRARY: IdentifierDefinitions[] = [
type: ([x]) => x.type,
sgn: ([x]) => {
if (x.is(0)) return 'zero';
return x.isNumberLiteral ? 'positive' : 'non-negative';
if (x.isNumberLiteral) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't that redundant? The next line also checks isNumberLiteral

@@ -183,13 +186,12 @@ export const ARITHMETIC_LIBRARY: IdentifierDefinitions[] = [
type: addType,

sgn: (ops) => {
if (ops.some((x) => x.isReal === false || x.isNaN)) return 'unsigned';
if (ops.some((x) => x.isNaN)) return 'unsigned';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't that going to return undefined for complex numbers? Shouldn't it return 'unsigned'? I suppose that if two complex numbers could cancel each other out...

@@ -273,12 +275,14 @@ export const ARITHMETIC_LIBRARY: IdentifierDefinitions[] = [

sgn: (ops) => {
const [n, d] = [ops[0], ops[1]];
const s = d.sgn;
const s1 = n.sgn;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to avoid calculating the sign of d and n until needed. In this case, they're not needed until after if (d.is(0))...

if (d.isNegative) return oppositeSgn(n.sgn);
if (n.is(0) || (n.isFinite && d.isInfinity)) return 'zero';
if (!n.is(0) && !d.is(0)) return 'not-zero';
if (d.isPositive) return s1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isPositive will have the side effect of calculating the sign of d. Since the sign is already in s, it's better to use positiveSign(s) instead.

if (n.is(0) || (n.isFinite && d.isInfinity)) return 'zero';
if (!n.is(0) && !d.is(0)) return 'not-zero';
if (d.isPositive) return s1;
if (d.isNegative) return oppositeSgn(s1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as for d.isPositive

return s === 'positive' || s === 'not-zero' || s === 'negative'
? 'positive'
: 'non-negative';
}
if (a.type === 'imaginary') return 'negative';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This checks that a is of type imaginary (and nothing else, i.e. that it is a pure, non-finite, imaginary number). Probably want to use subType(a.type, 'complex') or subType(a.type, 'imaginary') to exclude complex numbers with a real part.

return undefined;
},
canonical: (args, { engine }) => {
args = checkNumericArgs(engine, args, 2);
const [base, exp] = args;
return canonicalRoot(base, exp);
},
evaluate: ([x, n], { numericApproximation }) =>
root(x, n, { numericApproximation }),
evaluate: ([x, n], { numericApproximation }) => x.root(n),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is incorrect. The correct result is root(x, n, { numericApproximation }).
It looks like you may be working off an out-of-date version of the repo and are merging older versions with your changes.

? 'positive'
: 'non-negative';
}
if (x.type === 'imaginary') return 'negative';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above regarding imaginary. Probably want to use subType()

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants