Commit Graph

927 Commits

Author SHA1 Message Date
Quinn Dougherty
7a419742ad moved error message sooner for invalid mean and stdev 2022-07-04 09:57:00 -04:00
Ozzie Gooen
d6bdf5bfeb Formatted code 2022-07-02 15:02:43 -04:00
Ozzie Gooen
d888f685d0 Quick fixes for EvType typescripting 2022-07-02 14:25:05 -04:00
Umur Ozkul
38cc93bdec Module.defineFFI 2022-07-02 14:53:33 +02:00
Quinn Dougherty
9dcac8dd48 fixed \-1\ I had forgotten; added basic mean tests 2022-06-30 12:20:50 -04:00
Quinn Dougherty
54cd636524 added comment for more direct wikipedia citation 2022-06-27 14:37:12 -04:00
Quinn Dougherty
14189fd848 #497 (no tests or examples) 2022-06-27 14:31:35 -04:00
Quinn Dougherty
acb0d3b9ee removed \TwoScalars\ material 2022-06-26 12:28:04 -04:00
Vyacheslav Matyukhin
8880b91c28
peggy: require instead of import, fixes tests 2022-06-26 12:13:38 +03:00
Vyacheslav Matyukhin
7cbece9212
optional location on NodeString (for record keys) 2022-06-26 11:42:33 +03:00
Vyacheslav Matyukhin
5a2b5b2a4d
return typed peggy AST from parse 2022-06-26 11:14:51 +03:00
Quinn Dougherty
29cf1cebb2 fixed paths to constructors 2022-06-24 09:19:15 -04:00
Quinn Dougherty
e0e2f12e27 added path to constructors 2022-06-24 09:07:15 -04:00
Quinn Dougherty
9dbd4f076c fixed paren balancing and so on 2022-06-24 08:56:16 -04:00
Quinn Dougherty
3e67180fe1 Merge remote-tracking branch 'origin/develop' into scoring-cleanup-three 2022-06-24 08:48:07 -04:00
Ozzie Gooen
aeea4806b4
Merge pull request #752 from quantified-uncertainty/reducer-typescript-wall
Reducer typescript wall
2022-06-24 05:43:21 -07:00
Sam Nolan
3b84c2892c Fix typescript errors (start raw decoding early) 2022-06-24 10:53:53 +00:00
Umur Ozkul
e192fe5790 PR comments 2022-06-24 12:15:38 +02:00
Ozzie Gooen
934608d971
Merge pull request #750 from quantified-uncertainty/language-server
Language server; error location in SyntaxErrors
2022-06-23 17:30:29 -07:00
Umur Ozkul
07d5c6d8b3 Iev -> IEv Just more readable prefix 2022-06-23 20:38:07 +02:00
Umur Ozkul
24a9c52789 Merge branch 'develop' into reducer-typescript-wall 2022-06-23 20:07:05 +02:00
Quinn Dougherty
b74b83a2cb Merge remote-tracking branch 'origin/develop' into scoring-cleanup-three 2022-06-23 11:34:03 -04:00
Sam Nolan
2b8545ad04 Fix 1 + distribution having reverse ordered points
Fixes #595
2022-06-23 03:40:40 +00:00
Umur Ozkul
e23f8b011b Merge branch 'develop' into reducer-typescript-wall
packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res
packages/squiggle-lang/src/rescript/SquiggleLibrary/SquiggleLibrary_Math.res
2022-06-23 04:29:13 +02:00
Umur Ozkul
95d3bf6eaa merge Reducer 2022-06-23 04:03:50 +02:00
Umur Ozkul
7b2c16d90f fix typescript test 2022-06-23 04:03:14 +02:00
Umur Ozkul
ac9a468aa6 Reducer InternalExpressionValue created
this will allow complicated changes to execution without changing the typescript interface
2022-06-23 02:25:54 +02:00
Vyacheslav Matyukhin
84a0d83efb
store location on RESyntaxError; export parse() function 2022-06-22 00:34:35 +03:00
Quinn Dougherty
d80ea676c5 fixed tests after pair; error'd out mixed case 2022-06-21 12:23:58 -04:00
Quinn Dougherty
95adc67701 some adjustments I guess 2022-06-21 11:55:15 -04:00
93f5b4ba2a feat: Fix remaining scoring errors with Quinn
Value::0.3 to 0.9
2022-06-20 16:39:48 -04:00
4b1c226173 fix: PointSetDist_Scoring.WithScalarAnswer.scoreWithPrior
Done in pair coding with Quinn.
Value::[0.3 to 0.9]
2022-06-20 16:14:41 -04:00
Quinn Dougherty
633bab9c30 a fistful of comments 2022-06-20 11:11:11 -04:00
Quinn Dougherty
1a6ced0373 a few comments more 2022-06-20 09:34:56 -04:00
Quinn Dougherty
d156b24fd1 \yarn format\ pass 2022-06-20 08:51:34 -04:00
Quinn Dougherty
f5366540f7 Merge remote-tracking branch 'origin/develop' into scoring-cleanup-three 2022-06-20 08:50:59 -04:00
Quinn Dougherty
18733f2d09 merged 592 2022-06-20 08:47:16 -04:00
Quinn Dougherty
74fe0296e0 Merge remote-tracking branch 'origin/scoring-cleanup-refactor' into scoring-cleanup-three 2022-06-20 08:36:31 -04:00
Quinn Dougherty
584c639d01 some of the comments 2022-06-20 08:28:30 -04:00
Ozzie Gooen
8d311a099d Added scaleMultiply 2022-06-17 06:44:06 -07:00
Ozzie Gooen
d4535df712
Merge pull request #696 from quantified-uncertainty/normalize-after-truncate
Normalize after truncate
2022-06-14 17:14:03 -07:00
Ozzie Gooen
6278dff818 Ran formatting 2022-06-14 17:00:09 -07:00
Ozzie Gooen
7ceae18611 Normalize after trunctae 2022-06-14 16:54:59 -07:00
Ozzie Gooen
62ed997de2 More progress on DistGeneric 2022-06-13 18:13:43 -07:00
Ozzie Gooen
6a4132c955 Ran format 2022-06-13 12:10:24 -07:00
Ozzie Gooen
2dc71315ef Added key math variables, all lowercase 2022-06-13 11:43:26 -07:00
Ozzie Gooen
f01df95381 Merge branch 'develop' into documentation-refactor-June12-2022
* develop:
  ⬆️ Bump @storybook/builder-webpack5 from 6.5.7 to 6.5.8
  ⬆️ Bump @storybook/react from 6.5.7 to 6.5.8
  ⬆️ Bump @storybook/addon-essentials from 6.5.7 to 6.5.8
  always merge stdlib
  ⬆️ Bump webpack-dev-server from 4.9.1 to 4.9.2
  ⬆️ Bump @types/node from 17.0.40 to 17.0.42
  ⬆️ Bump reanalyze from 2.22.0 to 2.23.0
  ⬆️ Bump @storybook/manager-webpack5 from 6.5.7 to 6.5.8
  ⬆️ Bump @storybook/addon-actions from 6.5.7 to 6.5.8
  ⬆️ Bump webpack-cli from 4.9.2 to 4.10.0
  ⬆️ Bump @storybook/addon-links from 6.5.7 to 6.5.8
  ⬆️ Bump @hookform/resolvers from 2.9.0 to 2.9.1
  ⬆️ Bump react-hook-form from 7.31.3 to 7.32.0
  ⬆️ Bump tailwindcss from 3.0.24 to 3.1.2
2022-06-13 11:04:21 -07:00
Umur Ozkul
e661665385 Merge branch 'develop' into reducer-modules 2022-06-13 18:56:37 +02:00
Umur Ozkul
28938adf53 always merge stdlib 2022-06-13 18:54:48 +02:00
Ozzie Gooen
bb85869303 Lots of documentation tweaks 2022-06-12 21:19:28 -07:00
Ozzie Gooen
a690cd15fd
Merge pull request #638 from quantified-uncertainty/Documentation-auto-generation
First attempt at a complete API definition
2022-06-11 13:37:27 -07:00
Ozzie Gooen
79b71c39a0 Ran formatter and fixed tests 2022-06-11 08:47:52 -07:00
Umur Ozkul
f406ae9053 Merge branch 'develop' into reducer-modules 2022-06-11 15:23:54 +02:00
Umur Ozkul
0704c8d9f5 module tests pass 2022-06-11 15:15:25 +02:00
Ozzie Gooen
6dc8b711bb Lots of simple cleanup to api docs 2022-06-10 17:35:48 -07:00
Ozzie Gooen
590480d4e1 Merged with develop 2022-06-10 11:53:04 -07:00
Ozzie Gooen
7226a06d39
Merge pull request #662 from quantified-uncertainty/utility-functions
Adds a few utility functions
2022-06-10 11:18:54 -07:00
Ozzie Gooen
844dfd369c
Update FunctionRegistry_Library.res 2022-06-10 11:17:47 -07:00
Umur Ozkul
69bab17331 Math module tests defined (failing)
rename modules

define module

Math module

test helper fixed for defaults and test defined
2022-06-10 16:35:39 +02:00
Umur Ozkul
3ca209a53d bindings and module managers
bindings are a module
2022-06-10 14:19:42 +02:00
Ozzie Gooen
8fd5c6a1be Merge branch 'develop' into Documentation-auto-generation
* develop: (22 commits)
  components-lint respects components prettierignore
  format main.css and prettierignore base.css
  scoped tailwind preflight, top-level .squiggle wrapper
  grammar: identifiers with modules
  Refactored reducerInterface files
  Added simple scientific units
  Added stdev to table of stats, when needed
  Added stdev and variance to Distribution Operation Constructors
  Quick addition of stdev-variance-min-max-mode
  ⬆️ Bump @types/node from 17.0.38 to 17.0.40
  ⬆️ Bump webpack from 5.72.1 to 5.73.0
  ⬆️ Bump @storybook/react from 6.5.6 to 6.5.7
  ⬆️ Bump ts-node from 10.8.0 to 10.8.1
  ⬆️ Bump @storybook/builder-webpack5 from 6.5.6 to 6.5.7
  ⬆️ Bump peggy from 2.0.0 to 2.0.1
  ⬆️ Bump @storybook/addon-essentials from 6.5.6 to 6.5.7
  ⬆️ Bump @storybook/preset-create-react-app from 4.1.1 to 4.1.2
  ⬆️ Bump @hookform/resolvers from 2.8.10 to 2.9.0
  ⬆️ Bump typescript from 4.7.2 to 4.7.3
  ⬆️ Bump @storybook/manager-webpack5 from 6.5.6 to 6.5.7
  ...
2022-06-09 16:50:46 -07:00
Umur Ozkul
2f4db3230d format 2022-06-09 15:53:07 +02:00
Ozzie Gooen
e4eceb9cd3 Minor fix for EvModule support 2022-06-09 06:44:03 -07:00
Ozzie Gooen
1acd4fc259 Minor cleanup 2022-06-09 06:34:31 -07:00
Umur Ozkul
afffdd8559 typescript work in progress 2022-06-09 15:27:51 +02:00
Umur Ozkul
710756bc50 EvModule defined 2022-06-09 15:27:37 +02:00
Umur Ozkul
b623be5f9b format 2022-06-09 14:57:35 +02:00
Umur Ozkul
02c06b638e module access to expression 2022-06-09 14:57:25 +02:00
Umur Ozkul
346c83f2be module parse 2022-06-09 14:35:44 +02:00
Umur Ozkul
cfcf3cb144 module grammar type correction 2022-06-09 14:30:17 +02:00
Ozzie Gooen
b48a0575d9 Cumprod and formatting 2022-06-08 08:21:20 -07:00
Umur Ozkul
b41e32805c grammar: identifiers with modules 2022-06-08 17:00:17 +02:00
Ozzie Gooen
fc40744053 Simple additions of first, last, cumulative sum, diff 2022-06-08 08:00:06 -07:00
Ozzie Gooen
12cdb4ed36 Added dict keys, values, fromList, toList 2022-06-08 07:24:06 -07:00
Ozzie Gooen
8d1d08eaa0 Simple dict merge and mergeMany 2022-06-07 22:35:40 -07:00
Ozzie Gooen
0fcf7e197e Added listMake and upTo 2022-06-07 21:08:39 -07:00
Ozzie Gooen
ff3efeac4c Adding math utility functions 2022-06-07 09:40:24 -07:00
Ozzie Gooen
b022ea2fae
Merge pull request #656 from quantified-uncertainty/stdev-variance
Quick additions of Stdev, Variance, and Mode for SampleSet, and Min and Max for all
2022-06-06 15:52:02 -07:00
Ozzie Gooen
b675b33dfe Refactored reducerInterface files 2022-06-06 14:42:49 -07:00
Ozzie Gooen
a15c0fa888 Added simple scientific units 2022-06-06 13:55:51 -07:00
Ozzie Gooen
079553cd71 Added stdev and variance to Distribution Operation Constructors 2022-06-06 12:21:03 -07:00
Ozzie Gooen
7d9bae96e1 Quick addition of stdev-variance-min-max-mode 2022-06-06 12:08:00 -07:00
Ozzie Gooen
441ac3c251 Changed the name of select functions 2022-06-05 21:47:29 -07:00
Ozzie Gooen
6567f1b8ef Moved API files to API directory 2022-06-05 20:02:17 -07:00
Ozzie Gooen
b0b48c7129 First attempt at new API documentation generation 2022-06-04 09:26:52 -07:00
Ozzie Gooen
10de355f86 First attempt at auto-documentation 2022-06-03 17:59:02 -07:00
Umur Ozkul
9e4a70c516 Merge branch 'develop' into reducer-type-grammar 2022-06-02 14:29:33 +02:00
Umur Ozkul
6b25e82f58 typeExpression
type statements

type paranthesis

type paranthesis

comments

TODO

typeExpression

type statements

type paranthesis

type paranthesis

comments

TODO

peggy construct functions

typeExpression

type statements

type paranthesis

type paranthesis

comments

TODO

peggy construct functions

apply

typeExpression

type statements

type paranthesis

type paranthesis

comments

TODO

peggy construct functions

apply

all types are expressions

typeExpression

type statements

type paranthesis

type paranthesis

comments

TODO

peggy construct functions

apply

all types are expressions

modifiers

typeExpression

type statements

type paranthesis

type paranthesis

comments

TODO

peggy construct functions

apply

all types are expressions

modifiers

0 arg constructors and $ (low priority type modifier)

remove GeneratedParser.js

peggy test helpers

test type parsing

type of test defined

act of binding refactored

recognize all binding functions | "$_setBindings_$" | "$_setTypeOfBindings_$" | "$_setTypeAliasBindings_$"

doBindStatement

bindings default statemetn

doBindExpression

clone type references and type aliases

doSetBindingsInNamespace

member_of, min, max

typeOr

type function

type with expression
2022-06-02 14:20:55 +02:00
Ozzie Gooen
793c42ce20
Merge pull request #599 from quantified-uncertainty/toPointSet-fn 2022-06-02 05:16:32 -07:00
Sam Nolan
23bc41d61c Change import to import type when needed 2022-05-31 04:16:04 +00:00
Umur Ozkul
ac3fa859c0 Replace $$_block__$$ with {}
More redable language tests
2022-05-29 17:55:01 +02:00
Ozzie Gooen
178ec6f89d
Merge pull request #600 from quantified-uncertainty/issue597
fixed #597
2022-05-28 11:10:27 -04:00
Umur Ozkul
217a783d0a format 2022-05-28 16:02:16 +02:00
Umur Ozkul
ce5f12360a fixed #597 2022-05-28 15:52:35 +02:00
Ozzie Gooen
ba34c1abf1 Ran formatter 2022-05-27 14:09:17 -04:00
Ozzie Gooen
c2b90b7023 ToDiscretePointSet 2022-05-27 14:03:41 -04:00
Ozzie Gooen
f49697b64a Simple toContinousPointSet 2022-05-27 13:37:37 -04:00
Ozzie Gooen
70664c0a91
Merge pull request #591 from quantified-uncertainty/declare-test
Declare() functionality
2022-05-27 11:44:51 -04:00
Ozzie Gooen
3566311817 Did formatting 2022-05-27 09:44:36 -04:00
Ozzie Gooen
0da95bd21e Cleanup of SampleSet map 2022-05-27 09:40:49 -04:00
Ozzie Gooen
d3a2f391a7 Added map3 to samplesMap 2022-05-27 09:24:06 -04:00
Ozzie Gooen
20f901e3f8 Added Declaration toString 2022-05-27 07:58:43 -04:00
Ozzie Gooen
cbc51c23de Minor improvement of error type 2022-05-27 07:29:39 -04:00
Ozzie Gooen
d630f7335d Minor fixes 2022-05-26 08:23:43 -04:00
Ozzie Gooen
298d3923bc Fixed bug caused by bad genType format of Declaration 2022-05-25 19:27:15 -04:00
Ozzie Gooen
239abbdcf8 Minor refactors 2022-05-25 18:10:05 -04:00
Quinn Dougherty
6a9179d4b8 Last cleanup
Value: [1e-5 to 1e-3]
2022-05-25 14:40:39 -04:00
Quinn Dougherty
3aaad14f11 slghtly more robust solution to mixed kldivergences (and removed a
warning)

Value: [1e-5 to 1e-2]
2022-05-25 13:51:01 -04:00
Quinn Dougherty
a266b8ed09 Fixed tests (plausibly slightly naively)
Value: [1e-4 to 1e-1]
2022-05-25 13:38:55 -04:00
Quinn Dougherty
cbaf4c150d one CR comment; chasing kldivergence on mixeds bug
Value: [1e-10 to 1e-3]
2022-05-25 13:10:31 -04:00
Ozzie Gooen
5d8f07c1b4 Minor fixes 2022-05-25 10:55:03 -04:00
Quinn Dougherty
249f58d3d8 Slightly baffled why klDivergence : mixed x mixed -> float is busted.
Value: [1e-4 to 3e-2]

hypothesis: I need to reintroduce `combineAlongSupportOfSecondArgument`
2022-05-25 10:39:30 -04:00
Quinn Dougherty
f2460a5e12 It compiles
Value: [1e-3 to 4e-1]
2022-05-25 08:22:57 -04:00
Quinn Dougherty
3a56d6fca4 intermediate commit
Value: [1e-10 to 1e-5]
2022-05-25 08:22:57 -04:00
Quinn Dougherty
bafcb4f7b8 Cleaned up Scoring file: no dispatch yet
Value: [1e-4 to 6e-2]
2022-05-25 08:22:57 -04:00
Ozzie Gooen
c5673fd1b1 Trying to add squigglechart types for declaration 2022-05-24 19:14:13 -04:00
Ozzie Gooen
533c97c41c Added very simple lambdaDeclaration to React components 2022-05-24 17:23:37 -04:00
Ozzie Gooen
d1f2f71912 Made formal Declaration type 2022-05-24 17:02:27 -04:00
Ozzie Gooen
9185719641 Merge branch 'develop' into declare-test
* develop:
  Added type to appease bisect
  Minor additions to datetime units
  Trying to appease the CI tests, which are failing here for some reason.
  Delete Reducer_Peggy_GeneratedParser.js
  Formatted Code
  Moved DateTime functionality into separate file
  remove unit evaluation test
  generic unit support
  numbers with units (tested)
  Cleaned up arithmetic operations of time durations
  Simple better format for Duration toString
  More sophisticated makeFromYear function, that accepts floats
  Added better Duration toString and Date makeWithYear functionality
  Simple dateTime integration
2022-05-24 16:26:32 -04:00
Ozzie Gooen
f5fcd4f9ae Added type to appease bisect 2022-05-24 15:51:22 -04:00
Ozzie Gooen
628cb0c807 Minor additions to datetime units 2022-05-24 14:49:04 -04:00
Ozzie Gooen
822771afe8 Merge branch 'develop' into DateTime-integration
* develop:
  Delete Reducer_Peggy_GeneratedParser.js
  remove unit evaluation test
  generic unit support
  numbers with units (tested)
2022-05-24 14:30:33 -04:00
Ozzie Gooen
8757448900 Trying to appease the CI tests, which are failing here for some reason. 2022-05-24 14:28:02 -04:00
Ozzie Gooen
1e4aecd4fc
Delete Reducer_Peggy_GeneratedParser.js
I'm pretty sure this should be in the gitignore.
2022-05-24 14:23:26 -04:00
Ozzie Gooen
5fd5c1c1f8 Formatted Code 2022-05-24 14:12:49 -04:00
Ozzie Gooen
31e6f13472 Minor cleanup 2022-05-24 07:52:27 -04:00
Ozzie Gooen
6248818531 First attempt at function declaration 2022-05-23 20:49:10 -04:00
Umur Ozkul
5caad73586 Merge branch 'develop' into reducer-dev 2022-05-23 20:40:56 +02:00
Ozzie Gooen
8b0615eec0 Merged with develop 2022-05-23 14:38:15 -04:00
Ozzie Gooen
003b320acb Fixing lint and tests 2022-05-23 14:28:32 -04:00
Ozzie Gooen
faf4718f4d Merged with develop 2022-05-23 13:49:39 -04:00
Ozzie Gooen
bb5af13ddc Moved DateTime functionality into separate file 2022-05-23 13:44:41 -04:00
Umur Ozkul
a386eee570 remove unit evaluation test
We provide no implementation
2022-05-23 18:18:30 +02:00
Umur Ozkul
08c73ac22f Merge branch 'Umur-reducer-dev' into reducer-dev
packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res
packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js
packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy
2022-05-23 18:07:50 +02:00
Umur Ozkul
0124181bce Merge branch 'generic-units' into Umur-reducer-dev
packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js
2022-05-23 18:02:21 +02:00
Umur Ozkul
107bce506f generic unit support 2022-05-23 17:51:38 +02:00
Quinn Dougherty
d32b6bb615 rm generated output
Value: [1e-10 to 1e-4]
2022-05-23 07:10:38 -04:00
Quinn Dougherty
ebcd228232 .gitignore, package.json, .prettierignore: #576
Value: [1e-7 to 1e-3]
2022-05-23 07:05:42 -04:00
Umur Ozkul
4628140069 numbers with units (tested) 2022-05-23 08:13:51 +02:00
Ozzie Gooen
70574329fc Cleaned up arithmetic operations of time durations 2022-05-22 22:40:10 -04:00
Ozzie Gooen
6af2e242f8 Simple better format for Duration toString 2022-05-22 22:11:28 -04:00
Ozzie Gooen
fff2f5da59 More sophisticated makeFromYear function, that accepts floats 2022-05-22 21:57:13 -04:00
Ozzie Gooen
f1d2a1a12f Added better Duration toString and Date makeWithYear functionality 2022-05-22 21:40:06 -04:00
Ozzie Gooen
364190dc7b Simple dateTime integration 2022-05-22 18:37:07 -04:00
Ozzie Gooen
f816f3c200 Ran prettier format 2022-05-22 13:02:54 -04:00
Ozzie Gooen
4b99e0135e Minor cleanup 2022-05-22 13:02:20 -04:00
Ozzie Gooen
ee94a054d0 Minor cleanup 2022-05-22 10:38:17 -04:00
Ozzie Gooen
c200259c79 Added simpe README and resi for FunctionRegistry 2022-05-21 13:52:17 -04:00
Umur Ozkul
949b57c426 Error reporting if function arguments are defined
map(arr, toSample) now correctly reports

toSample not found

instead of

macro(Array,Symbol) not defined
2022-05-21 19:18:39 +02:00
Ozzie Gooen
3531005a2b Added enviornment to Function Registry 2022-05-21 12:18:54 -04:00
Ozzie Gooen
ce58cf1bb3 Beginning cleanup of Process errors 2022-05-21 12:09:49 -04:00
Umur Ozkul
2265254531 Filter arguments passed to mathjs calls by type so that error messages are not too weird 2022-05-21 18:05:55 +02:00
Ozzie Gooen
40bf7443c9 Simple FunctionRegistry cleanup 2022-05-21 11:41:12 -04:00
Ozzie Gooen
7e2437bfc0 Prettier 2022-05-20 22:54:15 -04:00
Ozzie Gooen
390ac2e2bb Renamed itype->frType, value-> frValue 2022-05-20 22:53:53 -04:00
Ozzie Gooen
c9d6302cbf Add better error message when wrong arguments passed 2022-05-20 18:05:45 -04:00
Ozzie Gooen
d9cbe37a5a Added main distributions 2022-05-20 17:36:40 -04:00
Umur Ozkul
feb0284a89 format 2022-05-20 18:20:00 +02:00
Umur Ozkul
a17ea3f5a1 simplify error messages 2022-05-20 18:07:10 +02:00
Umur Ozkul
a314cd46fb . became a post operator that can operate on any expression
Because of
    $x.y[0][0].w + $x.z + $u.v
2022-05-20 17:46:02 +02:00
Umur Ozkul
2a176fac26 $indentified defined. Assignment not allowed 2022-05-20 17:24:06 +02:00
Umur Ozkul
1557c197a0 renamed internal variables starting with $ so that they are not overriden by $ variables in Squigle 2022-05-20 17:11:32 +02:00
Umur Ozkul
870b0c9d4e hidden macros 2022-05-20 17:05:53 +02:00
Umur Ozkul
b165ccac9f floats in scientific notation and optional leading zero 2022-05-20 15:18:27 +02:00
Umur Ozkul
c1f269e9a4 fixed logical operator priority 2022-05-20 00:29:04 +02:00
Ozzie Gooen
2c0dc75403 Split FunctionRegistry into multiple files 2022-05-19 18:24:56 -04:00
Ozzie Gooen
0b85b12551 Moved matching functionality to dedicated module 2022-05-19 18:17:31 -04:00
Ozzie Gooen
c326d0b229 More cleaning 2022-05-19 18:09:37 -04:00
Ozzie Gooen
4b07226b45 Continuing cleanup of FunctionRegistry 2022-05-19 17:04:31 -04:00
Ozzie Gooen
58f1789cfe Refactored Normal and Lognormal functions 2022-05-19 15:12:36 -04:00
Umur Ozkul
a51e4be528 format 2022-05-19 20:25:18 +02:00
Umur Ozkul
57c2fba791 "credibleIntervalToDistribution" 2022-05-19 20:20:14 +02:00
Umur Ozkul
516627629f attempt to resolve "credibleIntervalToDistribution" 2022-05-19 20:12:46 +02:00
Umur Ozkul
986e7c744b pegjs->peggy 2022-05-19 19:10:14 +02:00
Umur Ozkul
749fba2877 pr fixes 2022-05-19 19:08:40 +02:00
Umur Ozkul
c496ae5cdd multi-line tests 2022-05-19 18:19:09 +02:00
Umur Ozkul
f547db9d0a multi line problem due to block and lambda ambiguity 2022-05-19 16:35:12 +02:00
Ozzie Gooen
50a5ef2498 Touchups for FunctionRegistry distTwo 2022-05-19 09:25:34 -04:00
Umur Ozkul
7b5fd2b101 Merge branch 'develop' into reducer-dev 2022-05-19 01:28:37 +02:00
Umur Ozkul
db050668d1 parser
toFunction

additive multiplicative

compact

whitespace

pow

relational equality

boolean

whitespace separator

left associative operators

expression

not

identifier

function call

array constructor

string

indexed values

ident

priority

block

outerBlock

optional final expression

statement separator

outerBlock

innerBlock

better errors

note xor

white space and record

unary minus

inner/outer block

statement

lambda

sort

lambda is a value constructor

lambdaCall

ternary

ternary

basicValue

cleanup

quotes

chained Functions

dot operators

unify unary operators

unify unary operatos

notes

notes

notes

notes

parser

priorities set

white space or newline defined

allow newlines

notes

function call has become a post operator

recordElement

recursive index

postOperatorToFunction

better integer

comments

notes

record priority

comment

atom

finalComment

generated parser

type cast

format

initiate test file

test initiated; todo nodeCall; nodeExpression

callIdentifier

recover extra

initiate testing

initial tests pass

tests pass

remove function node

ternary

test parse passed

to

tests pass

notes

sort

toExpression

format

notes

remove unused modules

remove unnecessary nodeLambdaCall

notes

note

fix construct array

comment test

todo

elixir pipe

fix toString

notes

initial to expression test

value test

parsing records

records

comments

ternary

ifthenelse

inner block passed

inner block

lambda

lambda

new parser tested

now test tricks

ternary in expression

to test lambda as argument

to test lambda in structures

Use peggy Parser

expectEvalError

macros tested

remove mathjs parse

reducer test

comparison operator
2022-05-19 01:23:43 +02:00
Ozzie Gooen
80a6c56efc Merge branch 'develop' into functionRegistry
* develop:
  ⬆️ Bump @types/node from 17.0.33 to 17.0.34
  ⬆️ Bump @babel/plugin-proposal-private-property-in-object
  Cleanup to samplesMap() code
  Cleanup and addition of toInternalSampleArray
  First simple version of samplesMap
2022-05-18 19:10:44 -04:00
Ozzie Gooen
69d962ce75 Wip, working on allowing distributions in normal 2022-05-18 19:10:34 -04:00
Ozzie Gooen
76bbfb2ef1 Added lognormal fn definitions 2022-05-18 18:42:28 -04:00
Ozzie Gooen
88ae0e25b4 Simple experiment of it working 2022-05-18 18:25:32 -04:00
Ozzie Gooen
b67c90eb06 Cleaned up FunctionRegistry to use Match type 2022-05-18 17:27:36 -04:00
Ozzie Gooen
f7f94cbcb1 First part of cleanup 2022-05-18 16:49:22 -04:00
Ozzie Gooen
c1de95b39a Added simple registry module 2022-05-18 16:22:11 -04:00
Ozzie Gooen
3085805a4d Experiment with function registry for normal distribution 2022-05-17 21:16:26 -04:00
Ozzie Gooen
f30de20c8d Refactored match() code 2022-05-17 20:45:32 -04:00
Ozzie Gooen
e0f4809ad7 Function registry first attempt 2022-05-17 18:54:31 -04:00
Ozzie Gooen
ab88b0d012 Merged with develop 2022-05-16 20:14:29 -04:00
Ozzie Gooen
eafdfdc7b7 Cleanup to samplesMap() code 2022-05-16 20:11:38 -04:00
Quinn Dougherty
9e7319ed57 More substantial CR; more named args
Value: [1e-6 to 1e-2]
2022-05-16 18:06:14 -04:00
Quinn Dougherty
1d2bb556de Minor CR comments
Value: [1e-6 to 1e-3]
2022-05-16 15:39:40 -04:00
Quinn Dougherty
81b2c74ac8 klDivergence with prior
Value: [1e-4 to 5e-23]
2022-05-16 13:18:01 -04:00
Quinn Dougherty
d00b82807c Merge remote-tracking branch 'origin/develop' into score-dist-on-scalar-resolution 2022-05-16 12:06:46 -04:00
Quinn Dougherty
3c3c88fb7b ...Resolution => ..Answer 2022-05-16 12:06:21 -04:00
Quinn Dougherty
30ab62e9b8 backed out of mutually recursive dispatch
Value: [1e-5 to 1e-3]
2022-05-16 12:03:37 -04:00
Ozzie Gooen
606f24ff24 Cleanup and addition of toInternalSampleArray 2022-05-15 21:34:36 -04:00
Ozzie Gooen
e0f505c8ea Add logistic distribution 2022-05-15 21:10:13 -04:00
Ozzie Gooen
432e5b9bca Formatted code 2022-05-15 19:42:43 -04:00
Ozzie Gooen
6156ae65d1 Cleanup 2022-05-15 19:42:10 -04:00
Ozzie Gooen
7216f8079f First attempt at adding bernoulli 2022-05-15 18:27:25 -04:00
Ozzie Gooen
15965b0b05 First simple version of samplesMap 2022-05-15 17:24:54 -04:00
Ozzie Gooen
4676026aa0 Ran formatter 2022-05-15 10:58:29 -04:00
Ozzie Gooen
47d7ef49cf Merged with master 2022-05-15 10:54:16 -04:00
Ozzie Gooen
b2b51c8f46 Added sampleN to interface 2022-05-15 10:52:35 -04:00
Quinn Dougherty
8710248a22 Merge remote-tracking branch 'origin/develop' into score-dist-on-scalar-resolution 2022-05-13 16:41:00 -04:00
Sam Nolan
95d0212ffc Remove redundant defaultEnv 2022-05-13 20:23:41 +00:00
Sam Nolan
80e05ea5be Pass environment down to GenericDist 2022-05-13 20:16:52 +00:00
Quinn Dougherty
bdbb86aa9e logScore on records now interprets almost every which way we're
interested in

Value: [1e-3 to 9e-1]
2022-05-13 16:15:04 -04:00
Quinn Dougherty
b4a1137019 Implemented correct math underlying logScoreWithPointResolution
Value: [1e-2 to 7e-1]

Realized that I need to switch argument order, put `prior` last maybe.
2022-05-13 15:43:59 -04:00
Quinn Dougherty
3eef57f855 proof of concept for records as arguments
Value: [1e-3 to 8e-1]
2022-05-13 13:18:52 -04:00
Quinn Dougherty
2ab395b4e5 Some minor CR
Value: [1e-10 to 1e-4]
2022-05-12 16:03:29 -04:00
Quinn Dougherty
65751e590a Fixed logScoreAgainstImproperPrior by finding how it was None
Value: [1e-4 to 8e-2]
2022-05-12 15:26:51 -04:00
Quinn Dougherty
51310819a1 logScore now in interface.
Value: [1e-4 to 1e-1]
2022-05-12 14:16:52 -04:00
Quinn Dougherty
978e149913 Initialized logScore and logScoreAgainstImproperPrior
Value: [1e-5 to 6e-3]
2022-05-12 13:11:51 -04:00
Quinn Dougherty
eee9a46c37 Improved comment for enrich
Value: [1e-9 to 1e-6]
2022-05-12 11:16:51 -04:00
Quinn Dougherty
f5e3701a79 Clean up for CR
Value: [1e-7 to 43-4]
2022-05-12 09:51:20 -04:00
Quinn Dougherty
26afc96495 Tests are as good as I can get them
Value: [1e-4 to 1e-2]
2022-05-11 15:12:36 -04:00
Sam Nolan
c13f49a7bc Lint fix 2022-05-11 14:19:45 -04:00
Sam Nolan
a3402a42a4 Add default environment as export 2022-05-11 14:19:45 -04:00
Sam Nolan
b2a972605d (rebase): Function charting 2022-05-11 14:19:36 -04:00
5c9f57a24a fix: Attain parity with previous implementation
This is achieved by not adding more points in between i
the points are already pretty close
2022-05-11 12:56:56 -04:00
599c14b32c tweak: Pass off to Quinn 2022-05-11 12:39:03 -04:00
4df4597ed3 fix: "Enrich" (add more x points) when integrating
in order to get more numerical precision.
Note: not complete yet.

Value: [1e-3 to 3e-1]
2022-05-11 12:23:36 -04:00
Quinn Dougherty
0b8da034c6 klDivergence on mixed distributions works for one test case
Value: [1e-4 to 5e-2]
2022-05-10 19:59:50 -04:00
Ozzie Gooen
3cca106079
Merge pull request #504 from quantified-uncertainty/function-charts
Function charting
2022-05-10 18:57:18 -04:00
Quinn Dougherty
b7e18b4f9d Simplified tree in squiggle-lang/src/rescript/Distributions
Value: [1e-8 to 1e-4]
2022-05-10 16:43:37 -04:00
Quinn Dougherty
465383205a Fixed lint
Value: [1e-10 to 1e-6]
2022-05-10 16:34:03 -04:00
Quinn Dougherty
216ede45b2 Fixed Bisect
Value: [1e-5 to 1e-3]
2022-05-10 16:27:34 -04:00
Sam Nolan
ccb6938ad4 Lint fix 2022-05-10 16:24:08 +00:00
Sam Nolan
930340e2f1 Add default environment as export 2022-05-10 16:20:31 +00:00
Quinn Dougherty
f7690c33e0 Some cleanup
Value: [1e-4 to 1e-2]
2022-05-10 11:56:13 -04:00
Sam Nolan
e058e315ad Function charting 2022-05-10 15:52:13 +00:00
Quinn Dougherty
15f1ebb429 KLDivergence on discretes is passing
Value: [1e-3 to 2e-1]
2022-05-10 11:27:59 -04:00
Quinn Dougherty
ccd55ef8f1 good evening, not working yet, but out of time for the night
Value: [1e-6 to 1e-4]
2022-05-09 19:17:27 -04:00
Quinn Dougherty
b2d80eef86 Removed negative infinity error handling
Value: [1e-5 to 1e-3]
2022-05-09 18:28:35 -04:00
Quinn Dougherty
59edd7122e wrapped error in function
Value: [1e-5 to 1e-3]
2022-05-09 15:24:46 -04:00
Quinn Dougherty
814a5f2c58 mx polymorphism
Value: [1e-3 to 2e-2]
2022-05-09 15:19:56 -04:00
Ozzie Gooen
d07c3e7e81
Merge pull request #495 from quantified-uncertainty/merge-bindings
Merge bindings function
2022-05-09 14:12:24 -04:00
Quinn Dougherty
06352357a2 response to CR
Value: [1e-5 to 5e-3]
2022-05-09 11:14:33 -04:00
Sam Nolan
2860f28e32 Merge bindings function
Value: [0.0001 to 0.005]
2022-05-09 14:18:50 +00:00
Quinn Dougherty
28cb6b9c88 Final cleanup, but typescript is still borked
Value: [1e-8 to 1e-6]
2022-05-06 15:09:00 -04:00
Quinn Dougherty
722bfc6366 All three tests pass
- `uniform` `toPointSet` method has been changed for numerical
stability.

Value: [1e-1 to 1.75e0]
2022-05-06 13:58:15 -04:00
d9a40c973a feat: Get KL divergence working except in case of numerical errors ()
- Quinn was of great help here.
- I also left some dead code, which still has to be cleaned up
- There are still very annoying numerical errors, so I left one test
failing. These are due to how the interpolation is done
- Quinn to pick up from here

Value: [0.6 to 2]
2022-05-06 12:26:51 -04:00
5dd272fb0c tweak: Add tests for combineAlongSupportOfSecondArgument 2022-05-06 11:45:11 -04:00
cc3db79a2a feat: kl function but no dealing with errors yet 2022-05-06 10:49:04 -04:00
b393af8762 tweak: start building new function from scratch 2022-05-06 10:04:41 -04:00
87d6f8d4f6 fix: change integrand check order in KL divergence code 2022-05-06 09:49:42 -04:00
Quinn Dougherty
fd17da83b8 Merge remote-tracking branch 'origin/develop' into log-score-attempt 2022-05-05 20:42:39 -04:00
Quinn Dougherty
38d1c7aa61 Cleanup with option<(float, float, float)>
Value: [1e-5 to 1e-3]
2022-05-05 20:42:05 -04:00
Quinn Dougherty
dcf56d7bc6 combineAlongSupportOfSecondArgument implemented, tests still failing
Value: [1e-4 to 4e-2]
2022-05-05 20:02:12 -04:00
Quinn Dougherty
b49865d3aa progress on klDivergence (still working)
Value: [1e-5 to 1e-2]
2022-05-05 15:37:28 -04:00
Umur Ozkul
99f54f596c ternary operator (tested) 2022-05-04 22:36:34 +02:00
Umur Ozkul
888b615445 Merge branch 'reducer-dev-F-ifthenelse' into ternary
packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res
packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res
packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_Builder.res
packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_ToExpression.res
2022-05-04 21:51:15 +02:00
Quinn Dougherty
6211d3cfb0 Some sorta klDivergence conclusion
Value: [1e-6 to 1e-3]
2022-05-04 14:55:49 -04:00
Umur Ozkul
85b8333a09 Merge branch 'develop' into Umur-reducer-dev 2022-05-04 20:45:48 +02:00
Umur Ozkul
ad220ed2b4 foreign function interface 2022-05-04 20:44:46 +02:00
Quinn Dougherty
898547f3a3 klDivergence is now LogarithmWithThreshold 2022-05-04 13:53:32 -04:00
Quinn Dougherty
cfa83e552d Merge remote-tracking branch 'origin/develop' into log-score-attempt 2022-05-04 13:05:40 -04:00
Quinn Dougherty
c95c56cfb8 Added logScaleWithThreshold(eps) and completed renaming to
`klDivergence`

Value: [1e-5 to 1e-3]
2022-05-04 13:02:58 -04:00
Ozzie Gooen
268f138dcf
Merge pull request #478 from quantified-uncertainty/reducer-dev
Reducer dev: map, reduce, reduceReverse, keep
2022-05-04 12:27:03 -04:00
Quinn Dougherty
236be470d5 Merge remote-tracking branch 'origin/develop' into log-score-attempt 2022-05-04 12:22:33 -04:00
Quinn Dougherty
3fcc82442d Completed renaming to KLDivergence
Value: [1e-8 to 1e-4]
2022-05-04 12:21:30 -04:00
Quinn Dougherty
683439c7e5 Changed Ok(0) to Error(NegativeInfinityError).
Value: [1e-7 to 1e-5]
2022-05-04 11:59:46 -04:00
Quinn Dougherty
32f141abdc Renamed LogScoring to KLDivergence
Value: [1e-7 to 1e-4]
2022-05-04 11:54:23 -04:00
Sam Nolan
930c2d2b67 Add Gamma distribution 2022-05-04 15:53:41 +00:00
Quinn Dougherty
627616558a Made multiplicative factor in Scoring file rather than with bind
calls

Value: [1e-5 to 7.5e-4]
2022-05-04 11:48:20 -04:00
Quinn Dougherty
f5f5be2cfb ?? build broke, had to add a ModuleName. prefix to a constructor
Value: [1e-7 to 1e-5]
2022-05-04 11:43:44 -04:00
Umur Ozkul
ea465c6047 Merge branch 'develop' into Umur-reducer-dev 2022-05-04 17:35:03 +02:00
Umur Ozkul
5de6aa8e0d map reduce reduceReverse reverse keep 2022-05-04 17:32:25 +02:00
Umur Ozkul
ae48bd6420 pass reducer to dispatch
to define functions that has lambda arguments, dispatching requires a
reducer
2022-05-04 15:33:51 +02:00
Umur Ozkul
33ee0b27d5 remove inspect performance completely
Redesign required on the function interface
2022-05-04 15:14:34 +02:00
Quinn Dougherty
d5c9705811 Corrected log score
Value: [5e-5 to 2e-2]
2022-05-03 14:00:34 -04:00
Ozzie Gooen
94a1155264 Formatted rescript 2022-05-03 11:30:00 -04:00
Ozzie Gooen
c2155ef746 Merge branch 'develop' into documentation-refactors-april
* develop: (72 commits)
  cases to handle with new parser. lambdas in arrays and records
  Note duplicate parameters
  Note infinite recursion
  Note infinite recursion
  Add array string and function viewers
  Recurse showTypes
  Pass showTypes and showControls in playground
  do not export private modules from Reducer module
  Allows hiding controls
  sam's monkeying
  fixed function f not bound
  Refactor and rename lambda in partial
  Make error message more descriptive
  Refactor and shrink effect code
  Make a tooltip to restrict users from log scales
  Add Patrial storybook and update partial bindings async
  Lint js
  Format and fix CI bugs
  Hotfix playground chart
  Real log scales
  ...
2022-05-03 11:07:12 -04:00
Ozzie Gooen
b28df258e1 Ran formatter 2022-05-03 11:06:53 -04:00
Quinn Dougherty
cec4bbd334 fixed build
Value: [1e-6 to 1e-4]
2022-05-03 10:20:01 -04:00
Quinn Dougherty
6c815a62ff Merge remote-tracking branch 'origin/develop' into log-score-attempt 2022-05-03 10:17:17 -04:00
Quinn Dougherty
5d6de7b487 Response to CR
Value: [1e-4 to 4e-3]
2022-05-03 10:15:48 -04:00
Quinn Dougherty
ca95c7cef8 base 2 log => natural log (on the advice of Nuno)
Value: [1e-4 to 2e-1]
2022-05-02 17:46:43 -04:00
Umur Ozkul
11d4a3bc8b do not export private modules from Reducer module 2022-05-02 23:42:11 +02:00
Umur Ozkul
e92fc792a2 Merge branch 'develop' into Umur-reducer-dev 2022-05-02 23:21:26 +02:00
Quinn Dougherty
a986aac0a2 Merge remote-tracking branch 'origin/develop' into log-score-attempt 2022-05-02 17:16:09 -04:00
Quinn Dougherty
2d84805f88 Added infinity error; fixed infinities in logs
Value: [1e-3 to 3e-2]
2022-05-02 17:15:23 -04:00
Umur Ozkul
6a3b35eb4a fixed function f not bound 2022-05-02 23:12:57 +02:00
Sam Nolan
cc70047904 Lint js 2022-05-02 19:04:16 +00:00
Sam Nolan
f4085e93ad Real log scales 2022-05-02 18:29:59 +00:00
Quinn Dougherty
db3acbf96c Added extra multiplicative factor in logScore integrand
Value: [8e-2 to 7e-1]

migrated intregrand from `log(predicted / answer)` to `answer *
log(predicted / answer)`
2022-05-02 13:40:34 -04:00
Umur Ozkul
5a0b436932 No 666 2022-05-02 18:00:47 +02:00
Quinn Dougherty
d595285078 make lint happy
Value: [1e-9 to 1e-5]
2022-05-02 11:55:42 -04:00
Quinn Dougherty
e2762a0f62 Make typechecker happy
Value: [1e-7 to 1e-3]
2022-05-02 11:55:13 -04:00
Quinn Dougherty
58c885f963 Merge remote-tracking branch 'origin/develop' into log-score-attempt 2022-05-02 11:34:29 -04:00
Sam Nolan
0890607493 Merge branch 'reducer-dev' of github.com:quantified-uncertainty/squiggle into reducer-dev 2022-05-02 14:53:32 +00:00
Sam Nolan
946b38fa27 Fix Typescript build errors 2022-05-02 14:53:16 +00:00
Umur Ozkul
9e41f0399f RENotAFunction 2022-05-02 15:55:02 +02:00
Umur Ozkul
ba104e4dfe Catching unreduced values. This is not a lazy language 2022-05-02 15:55:02 +02:00
Umur Ozkul
c68138e5f6 arity error 2022-05-02 14:19:04 +02:00
Umur Ozkul
806ff93983 Merge branch 'Umur-reducer-dev' into reducer-dev 2022-05-02 12:35:58 +02:00