Commit Graph

478 Commits

Author SHA1 Message Date
Ozzie Gooen
8839f1d9c7 Added FunctionRegistry test and got simple polymorphism working 2022-07-14 22:14:23 -07:00
Ozzie Gooen
78e9e48626 Moved env to GenericDist, and used it 2022-07-13 09:37:39 -07:00
Quinn Dougherty
e9968288fd Merge remote-tracking branch 'origin/develop' into scoring-cleanup-three 2022-07-11 15:34:50 -04:00
Quinn Dougherty
20114d9a84 Made new test call polymorphic constructor #ToFloat 2022-07-11 14:23:58 -04:00
Quinn Dougherty
d682f28faf Merge remote-tracking branch 'origin/develop' into scoring-cleanup-three 2022-07-11 14:20:00 -04:00
Umur Ozkul
532a878911 define function returning result 2022-07-11 17:46:50 +02:00
Umur Ozkul
d25e052b61 rename to Reducer_Module_test 2022-07-11 17:04:21 +02:00
Ozzie Gooen
6e968c492b
Merge pull request #786 from quantified-uncertainty/reducer-modules
Module.defineFFI
2022-07-05 21:26:20 -04:00
Umur Ozkul
b3ac8848d2 comment 2022-07-05 15:27:56 +02:00
Umur Ozkul
e0b2632028 format 2022-07-05 06:20:57 +02:00
Umur Ozkul
746ca695af fix test 2022-07-05 06:17:26 +02:00
Umur Ozkul
742fc10e0d comment 2022-07-05 05:54:56 +02:00
Umur Ozkul
6edacc78e4 foo test 2022-07-05 05:16:00 +02:00
Quinn Dougherty
7889332052 polymorphic variants to neatly constrain types 2022-07-04 11:24:30 -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
acb0d3b9ee removed \TwoScalars\ material 2022-06-26 12:28:04 -04:00
Quinn Dougherty
3e67180fe1 Merge remote-tracking branch 'origin/develop' into scoring-cleanup-three 2022-06-24 08:48:07 -04:00
Umur Ozkul
e192fe5790 PR comments 2022-06-24 12:15:38 +02: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
7138645c57 Merge remote-tracking branch 'refs/remotes/origin/develop' into develop 2022-06-23 04:02:01 +00: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
Quinn Dougherty
13ba7d1a5e Merge remote-tracking branch 'origin/develop' into scoring-cleanup-three 2022-06-22 22:06:16 -04:00
Umur Ozkul
95d3bf6eaa merge Reducer 2022-06-23 04:03:50 +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
Quinn Dougherty
40f4db5eb1 fixed all tests by switching to integer. it does not make sense. 2022-06-22 17:51:14 -04:00
Quinn Dougherty
507d8e9f98 regenerated yarn.lock; moved fc.float to fc.double in symbolic_test.ts 2022-06-21 16:14:45 -04:00
Quinn Dougherty
444596aac4 some of the problems solved 2022-06-21 15:43:17 -04:00
Quinn Dougherty
d80ea676c5 fixed tests after pair; error'd out mixed case 2022-06-21 12:23:58 -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
f5366540f7 Merge remote-tracking branch 'origin/develop' into scoring-cleanup-three 2022-06-20 08:50:59 -04:00
Ozzie Gooen
7ceae18611 Normalize after trunctae 2022-06-14 16:54:59 -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
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
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
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
02c06b638e module access to expression 2022-06-09 14:57:25 +02:00
Umur Ozkul
5f6feb26ba Module parse tested 2022-06-09 14:39:06 +02:00
Ozzie Gooen
b675b33dfe Refactored reducerInterface files 2022-06-06 14:42:49 -07: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
Umur Ozkul
00d7304b4b format 2022-05-29 17:56:37 +02:00
Umur Ozkul
ac3fa859c0 Replace $$_block__$$ with {}
More redable language tests
2022-05-29 17:55:01 +02:00
Umur Ozkul
ce5f12360a fixed #597 2022-05-28 15:52:35 +02: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
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
Umur Ozkul
5caad73586 Merge branch 'develop' into reducer-dev 2022-05-23 20:40:56 +02:00
Ozzie Gooen
faf4718f4d Merged with develop 2022-05-23 13:49:39 -04:00
Ozzie Gooen
054e379593 Fixed test 2022-05-23 13:47:54 -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
107bce506f generic unit support 2022-05-23 17:51:38 +02:00
Umur Ozkul
4628140069 numbers with units (tested) 2022-05-23 08:13:51 +02: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
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
Umur Ozkul
feb0284a89 format 2022-05-20 18:20:00 +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
Umur Ozkul
6b2e509aea pipes, binary, unary and post operators test 2022-05-19 23:35:15 +02:00
Umur Ozkul
75c913fac3 fixes #522 2022-05-19 20:45:15 +02:00
Umur Ozkul
ffedc5dbb3 multi-line tests 2022-05-19 20:38:10 +02:00
Umur Ozkul
a51e4be528 format 2022-05-19 20:25:18 +02:00
Umur Ozkul
c496ae5cdd multi-line tests 2022-05-19 18:19:09 +02:00
Umur Ozkul
638548c37b multi-line comment 2022-05-19 18:04:51 +02:00
Umur Ozkul
7ccb1d8108 multi-line tests 2022-05-19 17:59:25 +02:00
Umur Ozkul
3371c51e94 post operators test 2022-05-19 17:47:26 +02:00
Umur Ozkul
56f0c9c290 lambda tests 2022-05-19 17:40:30 +02:00
Umur Ozkul
7bfe286f42 multiplicative tests 2022-05-19 17:32:14 +02:00
Umur Ozkul
0753311b93 logical tests 2022-05-19 17:14:16 +02:00
Umur Ozkul
470a6add42 update ternary 2022-05-19 16:45:50 +02:00
Umur Ozkul
4ce1ab1172 added subtract test 2022-05-19 15:21:49 +02: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
ab88b0d012 Merged with develop 2022-05-16 20:14:29 -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
6156ae65d1 Cleanup 2022-05-15 19:42:10 -04:00
Quinn Dougherty
12c0959f38 factored mixture construction into function
Value: [1e-6 to 1e-4]
2022-05-12 11:14:59 -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
e1e5e3305d Gained precision
Value: [1e-3 to 2e-2]
2022-05-11 15:46:57 -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
Quinn Dougherty
95fe117ef0 Factored continuous part of normal and uniform kldivergence into it's
own function

Value: [1e-4 to 1e-3]
2022-05-11 14:19:45 -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
Quinn Dougherty
29c1956e88 Response to CR
Value: [1e-6 to 1e-4]
2022-05-10 14:03:42 -04:00
Quinn Dougherty
f7690c33e0 Some cleanup
Value: [1e-4 to 1e-2]
2022-05-10 11:56:13 -04: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
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
bcf620337a Some Cleanup
Btw, Nuño gets a lot of credit for the last commit!

Value: [1e-2 to 8e-2]
2022-05-06 14:21:53 -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
Quinn Dougherty
fd17da83b8 Merge remote-tracking branch 'origin/develop' into log-score-attempt 2022-05-05 20:42:39 -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
Quinn Dougherty
32a881d06a Call Jstat for mean instead of calculate it
Value: [1e-8 to 1e-4]
2022-05-05 10:38:33 -04:00
Quinn Dougherty
dd942fe29e cleanup; CR
Value: [1e-9 to 1e-5]
2022-05-04 18:19:47 -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
Umur Ozkul
8aa4248996 spelling 2022-05-04 21:23:40 +02: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
cfa83e552d Merge remote-tracking branch 'origin/develop' into log-score-attempt 2022-05-04 13:05:40 -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
Sam Nolan
930c2d2b67 Add Gamma distribution 2022-05-04 15:53:41 +00:00
Quinn Dougherty
0baeedfb46 pointwiseSubtract test; logscale test
Value: [1e-5 to 5e-4]
2022-05-04 11:42:51 -04:00
Umur Ozkul
5de6aa8e0d map reduce reduceReverse reverse keep 2022-05-04 17:32:25 +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
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
Umur Ozkul
88428c74af cases to handle with new parser. lambdas in arrays and records 2022-05-03 00:44:38 +02:00
Quinn Dougherty
20adc4e25a describe and test strings. 2022-05-02 18:40:34 -04:00
Umur Ozkul
c5ae846df4 Note duplicate parameters 2022-05-03 00:30:41 +02:00
Quinn Dougherty
96ed0b44bb skip the bad test
Value: [1e-6 to 5e-4]
2022-05-02 18:29:47 -04:00
Umur Ozkul
78f46daed8 Note infinite recursion 2022-05-03 00:18:23 +02:00
Umur Ozkul
d26eaa2523 Note infinite recursion 2022-05-03 00:16:29 +02:00
Umur Ozkul
11d4a3bc8b do not export private modules from Reducer module 2022-05-02 23:42:11 +02:00
Umur Ozkul
490e4908e1 sam's monkeying 2022-05-02 23:18:36 +02: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
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
Umur Ozkul
f5d3da4c73 tests 2022-05-02 15:55:02 +02: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
711b230ecb Merge branch 'develop' into Umur-reducer-dev 2022-05-02 12:34:23 +02:00
Umur Ozkul
1e673e54c3 function tricks test defined (Sam's trials) 2022-05-02 12:27:07 +02:00
Umur Ozkul
087596ec43 function trics 2022-05-02 11:44:09 +02:00
Umur Ozkul
6796db82b4 note weird distribution test 2022-05-02 11:44:09 +02:00
Umur Ozkul
e262f76d98 spelling 2022-05-02 11:20:08 +02:00
Umur Ozkul
76b3adddc4 rename to exampleStatementY 2022-05-02 11:12:12 +02:00
Quinn Dougherty
ae7e5744dc Merge remote-tracking branch 'origin/develop' into fromsamples 2022-04-30 09:45:25 -04:00
Quinn Dougherty
ba0baf31c6 Fixed a (now skipped) test
[1e-5 to 1e-4]
2022-04-29 18:45:12 -04:00