401 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
Jos de Jong
0838448098 Fix #2408: better readable description of the object returned by rationalize 2022-02-06 11:50:58 +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
thetazero
7beac55201
add invmod (modular multiplicative inverse) (#2368)
* add invmod (modular multiplicative inverse)

* implement (most) suggestions

* style error

* fix NaN tests

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2022-01-15 11:40:46 +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
Jos de Jong
f61420881e Fix linting issue, update history and authors 2021-12-29 13:43:01 +01:00
thetazero
24a215fe0e
add fraction support to intersect.js (#2329)
* add fraction support to intersect.js

* Refactor as per josdejong's suggestions

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2021-12-29 13:40:41 +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
Bartosz Leoniak
ccd6ad9aaf
refactor(gamma function): use lanczos approximation with comments (#2364)
* refactor(gamma function): use lanczos approximation with comments

* tests: additional checks for specific numbers

* tests: check for value close to re(0.5)
2021-12-19 17:59:39 +01:00
Bartosz Leoniak
d2583b0d67
fix(gamma function): use reflection formula to handle negative values (#2362)
* fix(gamma function): use reflection formula to handle negative values

* lint
2021-12-15 11:33:04 +01:00
Jos de Jong
e6f3123d20 Improve description of format option precision (see #2328) 2021-10-02 10:34:46 +02:00
Wim Devos
d3c63677d0
Update SetCartesian documentation (#2310)
* Update SetCartesian documentation

* Remove trailing spaces

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2021-09-15 22:08:43 +02:00
Michal Grňo
4dbf40460b
Fix intersect not returning null for matrix input (#2270)
* refactored intersect, fixed it not returning null for matrix input

* intersect: improved flattening algorithm, added tests

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2021-07-07 09:16:22 +02:00
Michal Grno
e093476de4 implemented inverse iteration for eigs 2021-06-03 02:49:26 +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
7ed12ccd70 Upgrade to fraction.js@4.1.0, and integrate support for pow of rational exponents 2021-05-16 10:22:36 +02:00
Jos de Jong
bacfd5b66d Fix error caused by round off issue in IE 2021-05-13 19:09:56 +02:00
Michal Grňo
435a6a0879
Fix “AIAO-MIMO” of my previous PRs (#2210)
* fix aiao-mimo of eigs(m)

* fix aiao-mimo of matrixFromFunction
2021-05-12 10:34:40 +02:00
Jos de Jong
78ba2ee76a Some updates in the docs to make the doc generator happy 2021-05-09 11:03:30 +02:00
Jos de Jong
df551dc1e6 rename createComplex to createComplexEigs to deduplicate (there is already a function createComplex) 2021-05-09 10:38:34 +02:00
Michal Grňo
d7a5693e91
Matrix creation and conversion methods (#2155)
* made dense and sparse matrices iterable, fixed #1184

* added matrixFromFunction, fixes #2153

* added tests for matrixFromFunction

* added matrixFromRows

* added matrixFromColumns

* added rows() and columns() for dense matrix

* improved sparse documentation a tiny bit

* fix linting issues

* added matrixFromRow/Column to seealso of row and column

* removed unnecessary duplication from matrixFromRows/Columns

* added babel runtime

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2021-05-09 10:26:16 +02:00
Michal Grňo
9e8deb5c86
General eigenproblem algorithm (#1743)
* split the eigs function into multiple algorithms

* moved checks and coersions to eigs.js, made them more robust

* fix little bugs, make im and re more robust

* Implemented matrix balancing algorithm

* fix typos

* a draft of reduction to Hessenberg matrix

* finished implementation of reduction to Hessenberg

* fix Hessenberg elimination for complex numbers

* implemented non-shifted explicit QR algorithm for real matrices

* implemented vector computation, won't work untill usolve is fixed

* refactored to match yarn lint

* some minor changes

* solve merge conflicts

* refactored and re-fixed #1789

* some old uncommited changes

* fix small problems introduced by merging

* done some polishing

* improved jsdoc description of eigs

* little changes in jsdoc

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2021-04-18 10:52:51 +02:00
烧风
32113e0b44
Fix pickRandom having no name (#2181) 2021-04-14 14:10:56 +02:00
Jos de Jong
e6af8ec92a Fix #2167: typo in error message 2021-04-14 10:07:55 +02:00
Viktor
91141bbbb6
Miller–Rabin primality test (#2139)
* Miller–Rabin primality test

* add tests for some big numbers

* Update isPrime.js

* Update isPrime.js

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2021-04-10 10:14:16 +02:00
Michal Grňo
2d83c394a9
fixed a link in the comments of usolveAll and lsolveAll (#2154)
* fixed a link in the comments of usolveAll

The overleaf link in `usolveAll` didn't work.

* fixed link in lsolveAll
2021-04-07 14:17:11 +02:00
Jos de Jong
1587d12389 Fix #2128: typo in docs of luSolveAll and usolveAll 2021-03-09 21:13:06 +01:00
Josef Wittmann
bf0eedfdd5
Implement count based on size (#2092)
* Implement count based on size

Closes #2085

* Improve count implementation

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2021-01-31 11:02:26 +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
6fc5d0e39b Fix merge conflicts 2021-01-24 11:03:55 +01:00
Josef Wittmann
b602e21852
Extract reshape wildcard processing 2021-01-06 17:12:51 +01:00
Colin Holzman
d12f3a5fac
Word size suffix and BigNumber support for bin oct hex literals (#1996)
* added support for word size suffix in getToken

* start modifying number(string) to support word size suffix for signed integers

* word size suffixes for Number

* initial support for BigNumber

* fix linter issues

* remove unused variable

* start extending bitwise operators for Number for values greater than 32 bits

* Revert "start extending bitwise operators for Number for values greater than 32 bits"

This reverts commit 6fac1a7b10665a221ab5de521c08fa9fcf959eb1.

* add a test for 53 bit literal

* added an optional second argument to bin, oct, and hex to allow formatting signed numbers with custom word size

* removed size checks

* Attempted to extend bin, oct, hex format functions to work with BigNumber, but not working fully.

Apparently Decimal.js toString method doesn't take a base parameter like js number does. I guess I have to do the formatting myself.

* Added n2base function to do formatting for BigNumber.

* Added check for zero in n2base.

* Removed old failing tests.

* Added some tests (failing).

* Extended 'format' function with 'base' and 'wordSize' options and changed 'bin', 'oct', and 'hex' to use 'format' function.

* Fixed lint issues.

* Fixed issues related to the merge.

* Corrected a test.

* Fixed bignumber formatter.

* Added tests for math.format with 'base' and 'wordSize' options.

* Fixed lint issue.

* Changed 'base' option to 'bin', 'oct', and 'hex' values for 'notation' option of 'format' function.

* Added word size suffix to the output of format, bin, oct, and hex.

* Updated documentation.
2021-01-06 09:46:58 +01:00
Josef Wittmann
dcab05272a
Add numpy-like reshape wildcard 2020-12-31 09:49:25 +01:00
Josef Wittmann
e62bff8506
Add Julia-like reshape wildcard (wip)
Problem: The parser tries to find `end` for the wildcard.
2020-12-31 09:19:42 +01:00
redbar0n
10decb0fed
Update clone.js with doc about deep copying arrays (#2040)
* Update clone.js with doc about deep copying arrays

Since it was missing, and it is important documentation for anyone using math.clone for arrays of arrays (matrices). The deep copying was inferred from the test case, but it shouldn't have been necessary. Now it will hopefully be shown in the doc on the webpage, too.

* Update description to be more general.

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2020-12-03 17:45:20 +01:00
Jos de Jong
4d035f6e66 Fix typo in examples of function round 2020-11-30 09:54:25 +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
46b5102f92 Add missing file extensions on import 2020-11-02 12:53:16 +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
68c6a91801 Update devDependencies 2020-11-02 09:33:11 +01:00
rnd-debug
5849038918
implementing rotate(w, theta) (#1992)
* emplementing rotate(w, theta)

* will return same type as input

* edge cases arraySize

* rising coverage

* making result type predictable

Co-authored-by: Jos de Jong <wjosdejong@gmail.com>
2020-10-28 12:00:52 +01:00
Jos de Jong
e788c1d7f3 Fix #1990: improve pickRandom: return matrix output on matrix input, introduce new option elementWise, always return n number of random picks (see also #1976). 2020-10-18 12:25:02 +02:00
Jos de Jong
5f59174614 Fix unit test and missing import extension 2020-10-18 10:23:36 +02:00
Jos de Jong
83e1963cee Merge branch 'develop' into v8
# Conflicts:
#	HISTORY.md
#	src/function/probability/pickRandom.js
#	test/unit-tests/function/probability/pickRandom.test.js
2020-10-18 10:14:32 +02:00
Jos de Jong
c5ab722d95 Merge branch 'pickrandom-allow-any-array)' of https://github.com/KonradLinkowski/mathjs into develop 2020-10-07 15:06:52 +02:00
Jos de Jong
4633d702f3 Fix merge conflicts 2020-10-07 13:40:21 +02:00