Commit Graph

885 Commits

Author SHA1 Message Date
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
5d8f07c1b4 Minor fixes 2022-05-25 10:55:03 -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
054e379593 Fixed test 2022-05-23 13:47:54 -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
dependabot[bot]
599bf248ea
⬆️ Bump ts-node from 10.7.0 to 10.8.0
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.7.0 to 10.8.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v10.7.0...v10.8.0)

---
updated-dependencies:
- dependency-name: ts-node
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-23 14:24:05 +00: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
Umur Ozkul
6b2e509aea pipes, binary, unary and post operators test 2022-05-19 23:35:15 +02: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
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
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
27609cd058 peggy as development dependency 2022-05-19 19:56:00 +02:00
Umur Ozkul
d332114bc1 peggy build command 2022-05-19 19:16:25 +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
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
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
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
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
78def2d3d2 Merge remote-tracking branch 'origin/develop' into score-dist-on-scalar-resolution 2022-05-13 13:44:02 -04:00
Quinn Dougherty
fbb79b261d hotfix: increment package version 2022-05-13 13:41:26 -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
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
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
48fcd526ce Made Node Packages page in docs just reference github readmes
Value: [1e-8 to 1e-4]
2022-05-10 17:06:44 -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