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.

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

Some additional helper functions #7

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Some additional helper functions #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3dceb6e
fixed some changes
aliang8 Jun 28, 2017
b862d6f
added tests and fixed function
aliang8 Jun 30, 2017
c72cb3d
fixed getCofficientAndConstant
aliang8 Jun 30, 2017
f1d1e81
pushing
aliang8 Jun 30, 2017
9ccc904
fixed getCoefficientAndConstants
aliang8 Jun 30, 2017
4f769a2
fixed comments
aliang8 Jul 1, 2017
fc21cc9
fix 2^2 case
aliang8 Jul 1, 2017
7a26bad
nodeEquals in hasSameBase
aliang8 Jul 2, 2017
cbc3bb9
revert package
aliang8 Jul 2, 2017
b14fdeb
fixed some helper functions
aliang8 Jul 4, 2017
2ecf06c
fixes
aliang8 Jul 4, 2017
623f926
merge with master
aliang8 Jul 4, 2017
e94f341
made some changes
aliang8 Jul 4, 2017
0c40e27
more fixes
aliang8 Jul 4, 2017
b21ee85
fix getVariableFactors
aliang8 Jul 4, 2017
29938d4
fix getVariableFactors
aliang8 Jul 4, 2017
c669902
fixed
aliang8 Jul 5, 2017
2b31dfd
added some more changes to getCoefficientAndConstants
aliang8 Jul 5, 2017
62f8a0d
revert lines
aliang8 Jul 6, 2017
acde4be
added hasCoeff and negate
aliang8 Jul 6, 2017
8c5671b
fix lint
aliang8 Jul 6, 2017
caf9282
merge with master
aliang8 Jul 6, 2017
5df8e66
fixed comments
aliang8 Jul 6, 2017
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
88 changes: 88 additions & 0 deletions lib/__test__/__snapshots__/query.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,45 @@ exports[`query getCoefficientsAndConstants 3x^2 * 2x^2 1`] = `
}
`;

exports[`query getCoefficientsAndConstants x + 4 + 2^x + x 1`] = `
{
"others": [
{
"type": "Apply",
"op": "pow",
"args": [
{
"value": "2",
"type": "Number"
},
{
"type": "Identifier",
"name": "x"
}
]
}
],
"constants": [
{
"value": "4",
"type": "Number"
}
],
"coefficientMap": {
"x": [
{
"value": "1",
"type": "Number"
},
{
"value": "1",
"type": "Number"
}
]
}
}
`;

exports[`query getCoefficientsAndConstants x^3 + y^3 + x y z + 3 1`] = `
{
"others": [
Expand Down Expand Up @@ -210,6 +249,55 @@ exports[`query getCoefficientsAndConstants x^3 + y^3 + x y z + 3 1`] = `
}
`;

exports[`query getCoefficientsAndConstants z + 2*(y + x) + 4 + z 1`] = `
{
"others": [
{
"type": "Apply",
"op": "mul",
"args": [
{
"value": "2",
"type": "Number"
},
{
"type": "Apply",
"op": "add",
"args": [
{
"type": "Identifier",
"name": "y"
},
{
"type": "Identifier",
"name": "x"
}
]
}
]
}
],
"constants": [
{
"value": "4",
"type": "Number"
}
],
"coefficientMap": {
"z": [
{
"value": "1",
"type": "Number"
},
{
"value": "1",
"type": "Number"
}
]
}
}
`;

exports[`query getVariableFactors 2 x y z 1`] = `
[
{
Expand Down
7 changes: 5 additions & 2 deletions lib/__test__/query.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@ describe('query', () => {
'x^3 + y^3 + x y z + 3',
'2/3 + 3 + cos(4)',
'3x^2 * 2x^2',
'2/3(x + 1)^1'
'2/3(x + 1)^1',
'x + 4 + 2^x + x',
'z + 2*(y + x) + 4 + z'
])

it('isVariableFactor', () => {
it('isVariableFactor', () => {
console.log(query.isPolynomial(parse('2*(y+x)')))
Copy link
Member

Choose a reason for hiding this comment

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

I think these two lines should be reverted.

assert(query.isVariableFactor(parse('x')))
assert(query.isVariableFactor(parse('xyz')))
assert(query.isVariableFactor(parse('x^2')))
Expand Down
6 changes: 3 additions & 3 deletions lib/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ export const sortVariables = (variables) =>
export const getCoefficientsAndConstants = (node, coefficientMap = {}, constants = [], others = []) => {
if (isNumber(node) || isConstantFraction(node)) {
constants.push(node)
} else if (isFunction(node)) {
} else if (isFunction(node) || hasConstantBase(node)) {
// cos, sin, f(a), etc
others.push(node)
} else if (isPolynomialTerm(node) && !hasConstantBase(node)) {
} else if (isPolynomialTerm(node)) {
// x^2, 3x^2

// sort the variables first (2yzx -> 2xyz)
Expand All @@ -232,7 +232,7 @@ export const getCoefficientsAndConstants = (node, coefficientMap = {}, constants
} else {
coefficientMap[key].push(coefficient)
}
} else if(isPolynomial(node) || isApply(node)) {
} else if(isPolynomial(node) || isAdd(node) || (isMul(node) && node.args.every(isPolynomialTerm))) {
// 2x^2 + 3x + 1, 3x^2 * 2x^2
Copy link
Member

Choose a reason for hiding this comment

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

Given the comment, shouldn't checking isPolynomial(node) enough since we've already ruled out constants and single term polynomials. Why are the other conditions necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think so; it leaves out non-polynomial expressions such as x + 4 + x + 2^x that we would still want to collect and combine.

Copy link
Member

Choose a reason for hiding this comment

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

Gotcha. Can you update the comment with that example?

node.args.forEach(function(arg) {
getCoefficientsAndConstants(arg, coefficientMap, constants, others)
Expand Down