25 Commits

Author SHA1 Message Date
Glen Whitney
7dcdad04fc
feat(simplify): Provide context option to control simplifications allowed (#2399)
* feat(simplify): Allow context option

  If the options argument has a key 'context', it value is interpreted
  as a context specifying various (non-default) properties of operators.
  This context is propagated to all rules and all matching.

  Adds some initial tests that the context option affects the behavior
  of simplify appropriately. Not all can be activated until in a future
  commit we add the ability for the application of a rule to be contingent
  on aspects of the context.

  Note that the enhanced rule matching necessary to support rules
  constrained by non-default operator properties led to a couple of
  changes to the output of rationalize() as well. Since the new output
  seemed to better match what a person would typical write for the
  rationalized form, this commit changed the test rather than attempted
  to preserve the exact prior order of terms.

* feat(simplifyCore): strip all parentheses

  Prior to this commit, simplifyCore stripped internal parentheses, but
  would leave top-level ones. But top-level parentheses don't carry any
  semantics, and no tests other than the ones that explicitly checked for
  the retention of top-level parentheses were affected by this change.
  Not making a special case for the top level also notably streamlined the
  code in simplifyCore.

  Adds tests for the new parenthesis-stripping behavior, as well as for
  other node types that were added earlier but which did not yet have
  simplifyCore tests.

* refactor(simplifyCore): Strip any node marked as trivial in context

  This replaces special-case tests for unary + and parentheses, and
  paves the way for example for 'abs' being marked trivial in a
  putative positiveContext

* refactor(simplify): Rename 'context' parameter to rules and document it.

  The new name is 'imposeContext' -- the motivation for the change is to
  distinguish the parameter for 'assuming', which will be added as a new
  parameter to control rule application based on context.

* feat(simplify): Allow context-based conditions on rule application.

  Adds a new property of rules specified as objects: `assuming`. Its
  value should be a context, and every property specified in that context
  must match the incoming context, or else the rule will not be applied.
  Updates the constant floating rules to require their operators be commutative,
  as a test of the feature, and adds a unit test for this.

* feat(simplify): annotate rules with underlying assumptions

  Also activates a number of tests of simplifications that should
  or should not occur in various contexts.

  To get all tests to pass, I could no longer find a rule ordering
  that worked in all cases, without the ability to mark an individual
  rule as applying repeatedly until just that rule stabilized. So this
  commit also adds that ability, and uses it to eliminate the tricky rule
  of expanding n1 + (n2 + n3)*(-1) to n1 + n2*(-1) + n3*(-1) late in the
  rule ordering, in favor of the more intuitive (complete) expansion of
  (n1 + n2)*(-1) to n1*(-1) + n2*(-1) early in the rule ordering, before
  constant folding and gathering of like terms.

* feat(simplify): Add contexts for specific domains

  In particular, adds a `simplify.realContext` and a `simplify.positiveContext`
  which (attempt to) guarantee that no simplifications that change the value
  of the expression, on any real number or any positive real number,
  respectively, will occur.

  Adds multiple tests for these contexts, including verification that the
  simplification in either context does not change some example values of
  any of the expressions in any simplify test.

  This testing uncovered that it is unaryPlus that must be marked as trivial
  for simplifyCore to work properly, so that marking is added as well.

* chore: Alter value consistency tests for browsers/older Node

  The problem was NaN != NaN in some JavaScripts but not others,
  so test for "both values NaN" explicitly before using deepEqual.

* fix: Implement requested changes from review

  Added documentation about scope and context in top-level algebra functions
  page; made variable name less abbreviated; performed suggested refactoring.

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2022-02-16 11:06:13 +01:00
Glen Whitney
790a5941c3
feat: Add leafCount function (#2411)
This function returns the number of leaves in the parse tree of an
  expression. The motivation is to provide an initial complexity measure
  that could be used to decide whether or not to apply some simplification
  rules. Docs, embedded docs, and test cases are provided.

  Resolves #2389.
2022-02-16 09:31:38 +01:00
Glen Whitney
3c54623662
fix(simplify): Correct regression in simplify (#2394)
* fix(simplify): Correct regression in simplify

  Also adds a 'debugConsole' option to simplify() so that it is possible
  to see the effect of each rule. This was critical to identifying the problem,
  which was that recent changes ended up with `simplifyConstant` in the
  wrong position in the list of rules. Correcting that also removed the need
  for the two rules coalescing negations with constants.

  Resolves #2393.

* fix(simplify): Correct another regression based on rule ordering

  Disccovered that `x - (y-y+x)` had also stopped simplifying due
  to recent changes, again because of re-ordering of the rules. So
  added it to the tests, and fixed the rule ordering (adding a more
  extensive comment about it). A big part of the reason that rule
  ordering is so sensitive is that the reduction engine only checks
  once in each pass for each rule whether it matches. So an alternate
  fix to changing the rule ordering back would have been to re-check
  each rule after it's applied (in case its application created new
  instances of the rule) but since the re-ordering worked, that seemed
  simpler as a fix for now.
2022-01-23 09:50:17 +01:00
Glen Whitney
a2fd057831
fix(simplify): Array and object simplification (#2382)
* fix(simplify): Allow simplify to work in arrays, objects, and indexing

  Mostly ArrayNode, ObjectNode, AccessorNode, and IndexNode nodes are
  simply transparent to simplification -- they simply allow it to occur
  within subexpressions. Then main exception is that if an array or object
  is indexed by a constant, the expression can be replaced by the
  corresponding subitem, e.g. `[3,4,5][2]` simplifies to `4`.

  This at least partially resolves #1913 (see my latest comment there).

* fix(simplify): Resolve operations on constant arrays

  This involves allowing ArrayNodes containing only constant entries
  to temporarily convert to Matrix type inside of simplifyConstant, so that
  function and operator calls can occur on them.
  I also had to add a special case for the function `size` because
  it can be computed even on symbolic arrays, since the result depends
  only on the shape, not the entries.

  Deals with additional cases of #1913; unclear if there are remaining
  aspects of that issue on which further work is desirable.

* chore: fix alphabetization of dependencies

  And restores inadvertent deletion of a blank line.

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2022-01-15 19:43:04 +01:00
Glen Whitney
84c3abdbbb
fix(simplify): Improve collection of nonconstant like terms (#2384)
The key is that the rule-matching engine is optimized for finding matches
  on the lefts of terms, but the central term-collection rule
  `n1*n3 + n2*n3 -> (n1+n2)*n3` was written with the key common term rightmost.
  Reversing this rule to `n3*n1 + n3*n2 -> n3*(n1+n2)` therefore does most
  of the work of improving like-term collection. It also better corresponds
  to typical mathematical presentation: common terms tend to be pulled out
  to the left in common practice.

  Floating constants to the right of a product initially (before they are
  moved back to the left for human-preferred output) and ensuring that
  negations are subsumed into constants whenever possible did the rest.

  Also, rule context was not being propagated into the simplification
  engine; this commit corrects that.

  Resolves #1179.
  Resolves #1290.

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2022-01-15 11:47:43 +01:00
Glen Whitney
4a1bd3bf3a
fix(simplify): Leave string constants as strings. (#2372)
* fix(simplify): Leave string constants as strings.

  Note that because the `size` built-in function called on a string returns
  a Matrix, which is represented in math.js expressions as an Array, this
  commit has to add ArrayNode as a dependency of `simplify` (and hence
  also of `rationalize`).

  In addition, it requires changing the handling of ArrayNodes
  and AccessorNodes in `simplifyConstant` from "unimplemented" to just a
  pass-through (since a full implementation of simplification in Arrays and
  indexing seemed beyond the scope of this change, but `simplify` must not
  throw an error on `size("foo")`). Hence, this commit also adds skipped unit
  tests for some expressions with arrays and indexing that should ultimately
  simplify.

  It also removes the skip on the test group "should not change the value of
  numbers when converting to fractions (3)" since all of those tests already
  appear to pass.

  Resolves #2152.

  Changes the behavior in #1913 from throwing an error to allowing Arrays and
  indexes but not simplifying inside them.

* chore: Fix lint and remove explanatory comment
2022-01-12 21:16:21 +01:00
Hyeonjong
43e705e7f6
Add simplify rule (#2365)
* Add simplify rule (Fix #2156)

* Add some tests

* Add more tests

* Fix simplify rule
2021-12-29 13:19:30 +01:00
Jos de Jong
4d841e4572 Create a mocha config file, define global timeout of 10 seconds 2021-06-23 11:03:08 +02:00
Jos de Jong
e051cae156 Do not use Object.entries for now (gives IE11 error, babel transpilation missing I suppose) 2021-05-19 16:34:19 +02:00
jhugman
e80995d52d
Add support for scopes with get and set methods (#2166)
* Add support for scopes with get and set methods

* Fix build for node v12

* Fixup cli and parser tests

* Add tests for simplify and evaluate

* Add example for a custom scope object

* Function calls need child scopes

* Transitionary step: Separate Safe and Scope Property calls

* Renamed identifiers in FunctionNode

* Evaluate with ObjectScopeWrapper

* Simplify tests passing

* Assume all scopes are map-like. Except parser

* Remove isMapLike check in customs.*SafeProperty() methods

* Change MapLike to Map

* Move keywords from an Object to a Set

* Move ScopeProperty functions in to scope.js

* Removed deprecation warning

* Rename scope.js to map.js

* Rename ScopeProperty to MapProperty

* Add tests and docs for map.js

* Put back the micro-optimization of function calls

* Use Map in the parser

* Called scope methods directly in cli.js

* Coercing of scope into a Map is done in Node, not evaluate

* Move createSubScope to its own file

* Fixup following self-review

* Add scope docs

* Final self-review changes

* Address reviewer comments

* Remove MapProperty witness marks

* Converted broken benchmark possibly lost in a rebase

* Use bare map as scope in benchmark

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2021-05-16 13:33:01 +02:00
Jos de Jong
67a9878073 Revert "Configure default timeout for mocha tests as 10 seconds"
This reverts commit f812e662
2021-02-03 19:01:15 +01:00
Jos de Jong
f812e66252 Configure default timeout for mocha tests as 10 seconds 2021-02-03 17:58:37 +01:00
Quentin Truong
02d36c1177
Check for equal number of arguments in simplify (#2090)
* Check for equal number of arguments when simplifying non-associative nodes

* Use === instead of ==

* Run linter and remove trailing space
2021-01-27 11:10:14 +01:00
Jos de Jong
9250f44e88 Fix #2026: introduce new option fractionsLimit in function simplify 2020-11-13 15:14:04 +01:00
Jos de Jong
488943d299 Fix #2026: have function simplify not output decimal values into fractions with very large numerator/denominator 2020-11-13 14:47:30 +01:00
Jos de Jong
41c5e2fabe Merge branch 'develop' into v8
# Conflicts:
#	HISTORY.md
#	package-lock.json
#	package.json
#	src/expression/embeddedDocs/embeddedDocs.js
#	src/factoriesAny.js
#	src/function/special/erf.js
#	src/plain/number/probability.js
#	src/version.js
2020-11-02 11:59:12 +01:00
Jos de Jong
3c9d9a9fc5 Increase timeouts for IE 2020-11-02 09:46:49 +01:00
Jos de Jong
eb9fcb3c41 Fix timeout on IE10 2020-10-18 13:05:11 +02:00
Jos de Jong
6f00715754
Specify import require paths (continuation of #1941) (#1962)
* Add `.js` extension to source file imports

* Specify package `exports` in `package.json`

Specify package type as `commonjs` (It's good to be specific)

* Move all compiled scripts into `lib` directory

Remove ./number.js (You can use the compiled ones in `./lib/*`)

Tell node that the `esm` directory is type `module` and enable tree shaking.

Remove unused files from packages `files` property

* Allow importing of package.json

* Make library ESM first

* - Fix merge conflicts
- Refactor `bundleAny` into `defaultInstance.js` and `browserBundle.cjs`
- Refactor unit tests to be able to run with plain nodejs (no transpiling)
- Fix browser examples

* Fix browser and browserstack tests

* Fix running unit tests on Node 10 (which has no support for modules)

* Fix node.js examples (those are still commonjs)

* Remove the need for `browserBundle.cjs`

* Generate minified bundle only

* [Security] Bump node-fetch from 2.6.0 to 2.6.1 (#1963)

Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Cleanup console.log

* Add integration tests to test the entry points (commonjs/esm, full/number only)

* Create backward compatibility error messages in the files moved/removed since v8

* Describe breaking changes in HISTORY.md

* Bump karma from 5.2.1 to 5.2.2 (#1965)

Bumps [karma](https://github.com/karma-runner/karma) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v5.2.1...v5.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Co-authored-by: Lee Langley-Rees <lee@greenimp.co.uk>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-20 18:01:29 +02:00
Michal Grňo
ba4ff2f9c9
Add usolveAll and lsolveAll methods (#1916)
* refactor solveValidation

* refactor usolve

* usolve algorithm implemented (for square mat.)

* added lsolve, consistent return type, fixed tests

* fixed lusolve and its tests, fixed linting issues

* added tests for usolve&lsolve, try-catch in lusolve

* put changes into separate files (u-/lsolveAll), revert changes to u-, l- and lusolve

* made *solveAll return [] for non-solvable, implemented sparse algorithms

* improved documentation for *solve(All)

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2020-08-29 13:11:16 +02:00
David Bramwell
88733f70af
Let simplify handle a/(b/c) (#1734)
Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2020-02-04 20:34:37 +01:00
jos
1d5ad22296 Remove redundant code causing a vague error, see #1724 2020-02-04 20:30:35 +01:00
Harry Sarson
462f46947f fix qr and sign edge cases (#1670)
* fix qr and sign edge cases

qr() was throwing an error if the pivots of a matrix were zero.
This commit fixes that and ensures that the results are consistant
with wolfram alpha.

Whilst doing this I found a bug in complex.js, I have added a work
around but we should flag this upstream.

I also addressed the long standing concerns about assert statements
within the body of the qr function.

Fixes #1669
Fixes #942

* further improvements to qr and sign

mainly fixing things I got wrong in previous commit

* add array test

* fix: remove only from tests and disallow

Uses mochas `--forbid-only` flag as advised by
https://github.com/standard/standard/issues/988
2019-11-18 20:03:09 +01:00
jos
d8a4f3a00a Update to standard@13.0.2 2019-07-20 13:46:31 +02:00
jos
db4910bed4 Move all test related stuff in folder test 2019-06-05 11:45:02 +02:00