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
Umur Ozkul
711b230ecb
Merge branch 'develop' into Umur-reducer-dev
2022-05-02 12:34:23 +02:00
Umur Ozkul
c0fad8c668
define lambdaValue record as payload
2022-05-02 12:27:07 +02:00
Ozzie Gooen
f41f6617df
Merge branch 'develop' into documentation-refactors-april
...
* develop:
Clean up the props, removing unused and making some optional
lint
hotfix: brackets in `components/README.md`
17 increment
hotfix: deleted `browser` field of `package.json`s
Mixture last argument can be float
2022-05-01 15:04:04 -04:00
Ozzie Gooen
18af09ab04
Added delta function to produce delta distributions
2022-05-01 09:00:56 -04:00
Ozzie Gooen
ad16c08e9c
Merge pull request #444 from quantified-uncertainty/mixture-last-arg-fix
...
Mixture last argument can be float
2022-04-30 14:52:58 -04:00
Quinn Dougherty
f8f6a1ecc6
hotfix: deleted browser
field of package.json
s
...
Value: [1e-9 to 1e-5]
2022-04-30 13:57:41 -04:00
Ozzie Gooen
fd957ef401
Mixture last argument can be float
2022-04-30 13:43:46 -04:00
Quinn
dabe76fed4
Merge pull request #443 from quantified-uncertainty/publish-script
...
`lang v0.2.8` and `components v0.2.16`
2022-04-30 13:03:47 -04:00
Ozzie Gooen
e8b8b6cd80
Merge pull request #425 from quantified-uncertainty/scalePower
...
Scale power
2022-04-30 11:55:28 -04:00
Quinn Dougherty
9fe7034c51
v0.2.8: fromSamples
and jsImports
2022-04-30 11:33:03 -04:00
Quinn Dougherty
ae7e5744dc
Merge remote-tracking branch 'origin/develop' into fromsamples
2022-04-30 09:45:25 -04:00
Ozzie Gooen
3249f69155
Small cleanup to fromSamples
2022-04-29 21:41:09 -04:00
Sam Nolan
83e3759342
Merge branch 'develop' into reducer-dev
2022-04-29 22:51:00 +00:00
Quinn Dougherty
8217801de3
magic numbers in bandwidth; fromSamples
implementation
...
Value: [1e-3 to 4e-2]
2022-04-29 18:38:55 -04:00
Sam Nolan
b710289096
Rename parameters to imports
2022-04-29 20:29:42 +00:00
Sam Nolan
74df093a42
Cleanup TS code (and fix rescript build warning)
2022-04-29 20:10:39 +00:00
Quinn Dougherty
8b30eb9f05
Added to convertRaw* stuff
...
Value: [1e-4 to 1e-3]
2022-04-29 15:25:29 -04:00
Sam Nolan
237cdf12f9
Remove accidental log
2022-04-29 19:13:30 +00:00
Sam Nolan
39be07cac0
Add parameters to components interface
2022-04-29 19:02:43 +00:00
Quinn Dougherty
f05d089524
Fixed most tests
...
Value: [1e-5 to 1e-3]
2022-04-29 15:02:24 -04:00
Sam Nolan
d4f929367d
JS parameters in squiggle lang
2022-04-29 18:46:44 +00:00
Quinn Dougherty
0e9996256e
Lint for Umur
...
Value: [1e-8 to 1e-6]
2022-04-29 14:42:34 -04:00
Quinn Dougherty
2c452163b6
I believe I have functionality in place for new run
command, but I
...
could be wrong. Pushing so Sam can review
Value: [1e-5 to 9e-3]
2022-04-29 14:41:30 -04:00
Umur Ozkul
bbe8eced29
format
2022-04-29 19:31:34 +02:00
Umur Ozkul
992dd92d9b
merge develop
2022-04-29 19:10:40 +02:00
Umur Ozkul
3bbc5e7149
Add evaluate partial for back compatibility
2022-04-29 19:03:58 +02:00
Umur Ozkul
351381339c
bug fixed
...
logs removed
2022-04-29 18:19:52 +02:00
Umur Ozkul
8e318a8aa9
refactor reducer
...
removed some extra array references
rename Builder to ExpressionBuilder
Expression Builder
Trash Warning
remove parsePartial/Outer, add context to lambda
format
module Bindings
simplify types
module Macro
reduceValueList
do macro call
result map
bindings stop replacing on macro calls
Macro Test
doBindStatement
bind a statement
bindings tested. TODO bind shadowing in lambda
block tests defined
block tests defined
blocks tested
macro lambda test defined
2022-04-29 16:40:32 +02:00
Sam Nolan
454ac0c252
Add bindings to Squiggle Editor
2022-04-29 13:50:57 +00:00
Ozzie Gooen
900aeeae29
Expose integralSum to Squiggle
2022-04-28 21:31:15 -04:00
Ozzie Gooen
282fa7726b
Added scalePower and scaleLog
2022-04-28 21:14:03 -04:00
Ozzie Gooen
ced3af5813
First attempt at LogScore
2022-04-28 20:24:13 -04:00
Quinn
5f78399760
Merge pull request #416 from quantified-uncertainty/shape-validators
...
XYShape validator
2022-04-28 18:51:31 -04:00
Sam Nolan
b72e7b42c4
Merge pull request #420 from quantified-uncertainty/dictionary-view
...
Add Dictionary Viewer and Recursive Array viewer
2022-04-28 16:58:34 -04:00
Ozzie Gooen
f7afbf9c39
Merged with develop
2022-04-28 16:51:02 -04:00
Ozzie Gooen
94d4a38540
Refactored errors for XYShape
2022-04-28 16:49:51 -04:00
Sam Nolan
b9c1f8d727
Move around declarations to be a bit more readable
2022-04-28 20:26:40 +00:00
Sam Nolan
00f862725c
Add Dictionary Viewer and Recursive Array viewer
2022-04-28 18:59:15 +00:00
Ozzie Gooen
5dd0292b52
Added tests for XYShape validator
2022-04-28 14:52:44 -04:00
Quinn
658c458c62
Merge pull request #418 from quantified-uncertainty/irrationale
...
Removed rationale (#410 )
2022-04-28 13:42:01 -04:00
Quinn Dougherty
4ff14db6f3
response to CR
...
Value: [1e-3 to 4e-3]
2022-04-28 13:34:57 -04:00
Quinn Dougherty
5b1ee7f0a6
Removed rationale ( #410 )
...
Value: [2e-1 to 6.5e-1]
2022-04-28 13:19:15 -04:00
Ozzie Gooen
1cca9bde38
Merged with develop
2022-04-28 12:49:33 -04:00
Ozzie Gooen
03cd887084
Adding better error messages to XYShape validator
2022-04-28 12:47:04 -04:00
Ozzie Gooen
64c720209d
Merge pull request #415 from quantified-uncertainty/fix-unused-warnings
...
Add functions to implementation file to fix warnings
2022-04-28 12:00:02 -04:00
Sam Nolan
c9301085b9
Add functions to implementation file to fix warnings
2022-04-28 15:50:12 +00:00
Ozzie Gooen
e1551cb1d7
Merge pull request #409 from quantified-uncertainty/splidcontinuousDiscrete-refactor
...
Refactor of splitContinuousAndDiscrete to allow for customization
2022-04-28 11:41:06 -04:00
Ozzie Gooen
d1ffac492c
Draft of Validates for XYShape
2022-04-28 11:39:29 -04:00
Ozzie Gooen
dde28e54f0
Restructuring of E Sorted
2022-04-28 10:17:29 -04:00
Ozzie Gooen
934ce78399
Algebraic Strategy should use MC when inputs include sample set dists
2022-04-28 09:08:53 -04:00
Ozzie Gooen
ab4dcc233c
Minor revisions from CR
2022-04-28 08:09:31 -04:00
Ozzie Gooen
2eec389b55
Added docstrings and cleanup
2022-04-28 07:56:23 -04:00
Ozzie Gooen
335d0b5d04
Cleaned tests
2022-04-28 07:36:53 -04:00
Ozzie Gooen
5025f2d55f
Refactor of splitContinuousAndDiscrete to allow for more customization
2022-04-27 18:34:37 -04:00
Umur Ozkul
7b052ee3c3
format
2022-04-27 22:24:06 +02:00
Umur Ozkul
5c1ce71a40
fix TypescriptInterface.res
2022-04-27 22:09:25 +02:00
Umur Ozkul
d33f430073
Merge branch 'Umur-develop' into Umur-reducer-dev
2022-04-27 22:08:35 +02:00
Umur Ozkul
54f8b10a95
Reducer: Environment (Give environement to all function dispatches) - closes #169
2022-04-27 22:00:42 +02:00
Ozzie Gooen
b2189777d5
Linted
2022-04-27 15:21:27 -04:00
Ozzie Gooen
dfa404f0d0
Merged with develop
2022-04-27 15:06:15 -04:00
Quinn Dougherty
7b87f64658
Issue 325
...
Value: [1e-3 to 3e-2]
2022-04-27 13:59:33 -04:00
Quinn Dougherty
a22fbb1afd
lint
...
Value: [1e-7 to 1e-6]
2022-04-27 12:57:49 -04:00
Ozzie Gooen
6045fe5e62
Organized AlgebraicCombination functionality into submodules
2022-04-27 12:48:46 -04:00
Quinn Dougherty
aabb53957e
rm warnings 26 and 27
...
Value: [1e-5 to 1e-3]
2022-04-27 12:41:07 -04:00
Quinn Dougherty
21d4c1b928
rm warning number 26
...
Value: [1e-4 to 5e-3]
2022-04-27 12:39:41 -04:00
Quinn Dougherty
b8a2ecc7f0
Merge remote-tracking branch 'origin/develop' into normalize-improvements
2022-04-27 12:38:08 -04:00
Sam Nolan
0353674dcb
Merge develop into loss-testing
2022-04-27 15:25:26 +00:00
Ozzie Gooen
d104494f02
First attempt at refactoring algebraicCombination code
2022-04-27 11:13:10 -04:00
Quinn Dougherty
4f2dda4625
CR comment about toString
.
...
Value: [0.001 to 0.04]
2022-04-27 09:45:48 -04:00
Quinn Dougherty
938a10766c
Response to CR
...
Value: [0.005 to 0.43]
2022-04-26 20:30:38 -04:00
Quinn Dougherty
f0d9404a68
merge develop into issue326
2022-04-26 18:43:12 -04:00
Quinn Dougherty
2553229d28
The real 326
...
Value: [0.04 to 0.3]
2022-04-26 18:41:57 -04:00
Sam Nolan
93c06f85b0
Merge branch 'develop' into loss-testing
2022-04-26 17:19:33 -04:00
Sam Nolan
1ef766a6c8
Merge pull request #388 from quantified-uncertainty/issue387
...
Input validation for cauchy
2022-04-26 17:09:28 -04:00
Quinn Dougherty
b9c8a7e2c7
Input validation for cauchy
...
Value: [0.01 to 0.08]
Sam gets most of the credit
2022-04-26 16:58:36 -04:00
Quinn Dougherty
6f00716722
deleted comment
...
Value: [0.001 to 0.01]
2022-04-26 16:39:52 -04:00
Quinn Dougherty
5469435dc5
Merge remote-tracking branch 'origin/develop' into issue326
2022-04-26 16:07:56 -04:00
Quinn Dougherty
c53e56e773
The proper issue326 (again)
...
Value: [1 to 3.6]
2022-04-26 16:06:51 -04:00
Sam Nolan
752f2a1ea5
Add other distributions and operations into benchmarking
2022-04-26 16:05:16 -04:00
Sam Nolan
ba412f2df6
Fix resolution issue
2022-04-26 14:15:37 -04:00
Sam Nolan
7302a3ec10
Give isNormalised lower bound
2022-04-26 13:28:08 -04:00
Sam Nolan
350e420884
Add isNormalized to Continuous
2022-04-26 13:25:45 -04:00
Sam Nolan
e47deb8433
Translate pmf to pdf for kde
2022-04-26 12:22:31 -04:00
Quinn Dougherty
e2da81812f
Merge remote-tracking branch 'origin/develop' into issue326
2022-04-26 09:56:25 -04:00
Ozzie Gooen
d84420b1ff
Merge branch 'develop' into normalize-improvements
...
* develop:
hotfix: codecov stuff in `.npmignore`
Rename flip argument to be more descriptive
Fix pointwise not commuting for subtraction
Fix missing paramater in test
Rename AlgebraicShapeCombination test case
Fixed package versions in `website/package.json`
Refactor and rename checkOrdered
Moved dependencies to devDependencies; updated versions
rm react-codejar
Mistake in #371
Fix build issues in components
Move dependencies to devDependencies
Ensure xyShape is ordered by x coordinates when multiplying by negatives
⬆️ Bump @types/node from 17.0.25 to 17.0.26
⬆️ Bump antd from 4.19.5 to 4.20.0
Turned error into actual error
Show correct errors early on when log(distribution) has bad arguments
Fix subtraction not commuting under pointsets
2022-04-25 21:59:45 -04:00
Ozzie Gooen
2c1aff25d3
Added basic functins to SampleSetDist
2022-04-25 21:46:40 -04:00
Quinn Dougherty
5ef8cf5dde
Fixed implementation
...
Value: [0.4 to 2]
2022-04-25 21:04:11 -04:00
Quinn Dougherty
3367b82eef
mode
to determine dist mode to operate in
...
Value: [1.2 to 4.6]
2022-04-25 20:55:16 -04:00
Ozzie Gooen
dc127a884a
Merge pull request #359 from quantified-uncertainty/log-inputs-errors
...
Show correct errors early on when log(distribution) has bad arguments
2022-04-25 20:50:26 -04:00
Sam Nolan
6bfecf2204
Rename flip argument to be more descriptive
2022-04-25 15:55:25 -04:00
Sam Nolan
62653d55b4
Fix pointwise not commuting for subtraction
2022-04-25 15:46:56 -04:00
Sam Nolan
cf44e6d3c7
Merge branch 'develop' into commutative-error
2022-04-25 15:08:57 -04:00
Sam Nolan
f9c02ba626
Refactor and rename checkOrdered
2022-04-25 14:50:45 -04:00
Umur Ozkul
7d4e3072b8
commite related issue note
2022-04-25 18:35:15 +02:00
Umur Ozkul
6878523186
cancel performance hook
2022-04-25 18:27:04 +02:00
Sam Nolan
d7151907d3
Ensure xyShape is ordered by x coordinates when multiplying by negatives
...
Value: [0.00001 to 0.0005]
2022-04-25 11:44:50 -04:00
Umur Ozkul
ac8827da28
ternary with bindings (failed)
2022-04-25 17:15:28 +02:00
Sam Nolan
fe493af0b9
Merge branch 'develop' into commutative-error
2022-04-25 11:00:45 -04:00
Umur Ozkul
cbc2b73b20
Evaluate ternary operator (tested)
2022-04-25 16:19:56 +02:00
Sam Nolan
d60aaa57f7
Get tests to pass for Reducer code
...
Value: [0.0001 to 0.04]
2022-04-25 10:10:07 -04:00
Sam Nolan
7e4477aeda
Format Reducer code
...
Value: [0.0000001 to 0.0005]
2022-04-25 10:00:27 -04:00
Umur Ozkul
c810c4576d
reducer semantics ternary (tested)
2022-04-25 15:30:27 +02:00
Umur Ozkul
4d801c0b10
ternary operator mathjs parse (tested)
2022-04-25 15:11:50 +02:00
Umur Ozkul
3788cb0c9a
fix variant warnings
2022-04-25 10:52:13 +02:00
Umur Ozkul
8d92941736
Merge branch 'develop' into Umur-reducer-dev
2022-04-25 09:28:53 +02:00
Umur Ozkul
6a87e8db28
index.ts FAILURE!!!!
2022-04-25 09:20:27 +02:00
Umur Ozkul
c5e08cfdb6
modify lambda
2022-04-25 09:17:38 +02:00
Umur Ozkul
eba087329f
called lamda with arguments (tested)
2022-04-25 08:49:17 +02:00
Umur Ozkul
1fb9218a94
refactor passToFunction
2022-04-25 08:19:18 +02:00
Umur Ozkul
d214bddc82
lambda expressions bound to function call symbols
2022-04-25 06:30:25 +02:00
Umur Ozkul
7b080ff4c2
bind function calls
2022-04-25 03:01:58 +02:00
Umur Ozkul
e3ef08839f
Function definition evaluated
2022-04-25 02:48:49 +02:00
Umur Ozkul
1f989de11c
lambda binding
2022-04-25 01:53:37 +02:00
Umur Ozkul
5d88fae40c
internalCode
2022-04-25 01:16:41 +02:00
Umur Ozkul
fe4e355fbe
format
2022-04-24 18:42:54 +02:00
Ozzie Gooen
260d159500
Make sure pointSetDist toPointSet is normalized
2022-04-23 18:29:58 -04:00
Ozzie Gooen
51e2cf167c
Turned error into actual error
2022-04-23 18:07:26 -04:00
Ozzie Gooen
1102ceb4ec
Show correct errors early on when log(distribution) has bad arguments
2022-04-23 17:51:41 -04:00
Sam Nolan
8cb138b84a
Fix convolution for negative multiplication
2022-04-23 17:48:00 -04:00
Sam Nolan
ee6551a694
Prevent negative standard deviation in symbolic multiplication
...
Introduced in #242
2022-04-23 16:57:06 -04:00
Sam Nolan
9090c44284
Fix subtraction not commuting under pointsets
2022-04-23 15:58:42 -04:00
Umur Ozkul
88b6d49ad3
function definition parse (tested)
2022-04-23 21:13:43 +02:00
Sam Nolan
dfd2f83c9d
Merge pull request #345 from quantified-uncertainty/invalid-ops
...
Change NaN operations to results
2022-04-23 14:51:50 -04:00
Sam Nolan
df4b734a49
Rename invalidOperationError
2022-04-23 14:35:49 -04:00
Sam Nolan
b44a955338
Fix bundle errors
2022-04-23 14:16:11 -04:00
Sam Nolan
7e8c16b923
Rename Other to OtherError
2022-04-23 14:13:38 -04:00
Sam Nolan
c7e601e15b
Remove NaN from pointwise operations
2022-04-23 14:09:06 -04:00
Ozzie Gooen
21975f2c0b
Fixed the linting of reducer files
2022-04-23 12:25:33 -04:00
Umur Ozkul
a915e68049
MathJs functionAssingmentNode parsed, comments passed (tested)
...
Just found out that comments were already done
2022-04-23 18:07:47 +02:00
Sam Nolan
98bf4f81c7
Rename assertOk to toExn
2022-04-23 10:30:03 -04:00
Sam Nolan
9fb7148290
Refactor mapY and mapYResult in mixed to remove duplication
2022-04-23 10:17:07 -04:00
Sam Nolan
ad593e659b
Move error types to types modules
2022-04-23 09:56:47 -04:00
Sam Nolan
79af95ed78
Remove unneeded prefix to error
2022-04-23 09:47:48 -04:00
Umur Ozkul
99906446c5
resi declaration consistency
2022-04-23 15:40:04 +02:00
Umur Ozkul
e456726e53
Merge branch 'reducer-dev-F-debugging' into Umur-reducer-dev
2022-04-23 15:21:11 +02:00
Sam Nolan
9c92d93ca4
Fix bad validation math
2022-04-22 17:21:45 -04:00
Sam Nolan
508f673873
Change NaN operations to results
...
- Also deleting old GenericDist_Types
- Also removing some string errors
2022-04-22 16:27:17 -04:00
Umur Ozkul
875f0519ac
fixed - PR#333 kill W in evaluatePartialWBindings
...
renamed to evaluatePartialUsingExternalBindings
2022-04-22 22:19:59 +02:00
Umur Ozkul
2c7e6c750b
fix PR#333 - kill W in evalaluateWBindings
...
renamed to evaluateUsingExternalBindings
2022-04-22 22:15:06 +02:00
Umur Ozkul
a4aee41aa4
Merge branch 'develop' into reducer-dev
2022-04-22 21:19:11 +02:00
Umur Ozkul
b683e720f1
PR#333
2022-04-22 21:16:27 +02:00
Sam Nolan
2845bd3e39
Use a more conservative convolution policy
2022-04-22 12:43:18 -04:00
Sam Nolan
ad8be5273f
Merge branch 'develop' into reducer-dev
2022-04-22 11:04:43 -04:00
Sam Nolan
cb8ff92d4e
Fix webpack bundle errors
2022-04-22 10:48:34 -04:00
Umur Ozkul
9ce5ed53d2
inspectPerformance (tested)
2022-04-22 16:18:00 +02:00
Umur Ozkul
417f0060b6
inspect and inspect with label (tested)
2022-04-22 15:43:37 +02:00
Umur Ozkul
2c5c5095b8
moved externalBindings to ReducerInterface
2022-04-22 04:51:31 +02:00
Sam Nolan
cfb969f2b3
Remove rescript warning 102
2022-04-21 18:42:15 -04:00
Sam Nolan
6eddb5a4af
Remove warning 20
2022-04-21 18:19:38 -04:00
Sam Nolan
e1bf47b6b3
Remove old parser and warning 27
2022-04-21 18:09:06 -04:00
Umur Ozkul
2aa3a5ac48
format
2022-04-22 00:02:27 +02:00
Umur Ozkul
5038e2c691
eval partial tested
2022-04-21 23:55:23 +02:00
Sam Nolan
10d9d8bc37
Fix warning 41
2022-04-21 17:30:39 -04:00
Umur Ozkul
a02bc27852
eval partial tested
2022-04-21 21:33:12 +02:00
Umur Ozkul
46f3ee3d2c
parse partial tested
2022-04-21 19:16:09 +02:00
Umur Ozkul
a3a7b9b269
remove unused case
2022-04-21 18:22:36 +02:00
Umur Ozkul
f272568b97
Merge branch 'develop' into reducer-dev
...
packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res
2022-04-21 18:20:54 +02:00
Ozzie Gooen
e83d5b111d
Merge pull request #323 from quantified-uncertainty/fix-reducer-warnings
...
Fix rescript warnings
2022-04-20 14:17:28 -04:00
Sam Nolan
c2b93831e3
Fix rescript warnings
2022-04-20 13:51:27 -04:00
Quinn Dougherty
806ba86446
fixed lint
2022-04-20 12:13:31 -04:00
Quinn
c101cdac18
update signature for result
2022-04-20 11:54:17 -04:00
Quinn
cbd93b7e79
back out of double Ok
2022-04-20 11:50:08 -04:00
Quinn
4631c183d9
wrap #Cauchy
in Ok
2022-04-20 11:49:41 -04:00
Quinn
5875880c06
nested Ok
because cauchy
requires no input validation
2022-04-20 11:44:33 -04:00
Quinn
0540fef63a
Update ReducerInterface_GenericDistribution.res
2022-04-20 11:39:00 -04:00
Quinn
017cbe7274
hotfix: cauchy
in binary dist constructors
2022-04-20 11:22:10 -04:00
Umur Ozkul
da37536b4b
Merge branch 'develop' into reducer-dev
2022-04-17 20:38:20 +02:00
Umur Ozkul
e2015e1098
Outer and Partial: test helpers defined
2022-04-17 20:07:21 +02:00
Umur Ozkul
0585aa33a9
parseOuter, parsePartial
2022-04-17 19:47:05 +02:00
Umur Ozkul
b1e2b27cee
partials compile. TODO tests
2022-04-17 19:24:39 +02:00
Ozzie Gooen
cf9c12f786
Merge pull request #258 from quantified-uncertainty/handle-arrays-in-components
...
Playground improvements with new types
2022-04-15 19:18:49 -04:00
Ozzie Gooen
69fb8be1f1
Ran prettier on index.ts, improved playground showing in website
2022-04-15 18:00:31 -04:00
Ozzie Gooen
20f93539ad
Merged with develop
2022-04-15 16:32:22 -04:00
Ozzie Gooen
fe2be53d04
Merge pull request #295 from quantified-uncertainty/add-isNormalized
...
Added isNormalized function, for testing
2022-04-15 16:30:56 -04:00
Ozzie Gooen
9febf3f182
Changed isNormalize in response to CR
2022-04-15 16:28:51 -04:00
Ozzie Gooen
2ed7d03005
Added formatting
2022-04-15 14:10:17 -04:00
Ozzie Gooen
2df6a7f537
Removed Js.log
2022-04-15 13:59:25 -04:00
Ozzie Gooen
73b950078d
Added isNormalized function, for testing
2022-04-15 13:58:00 -04:00
8743b235d6
fix: typo
2022-04-15 12:54:04 -04:00
Umur Ozkul
7ab69a1708
issue 234
...
Define partial code
2022-04-15 14:48:58 +02:00
Umur Ozkul
3f95ca455b
imports #234
2022-04-15 08:56:48 +02:00
1677d63375
fix: std of lognormal symbolic division
2022-04-14 21:54:06 -04:00
Ozzie Gooen
4918ee790a
Merged with develop
2022-04-14 20:18:20 -04:00
6d82adca25
Merge branch 'develop' into audit-2022-04-14-SymbolicDist.res
2022-04-14 16:50:37 -04:00
bd3f2c99d1
tweak: add explanation for magic number
2022-04-14 16:25:15 -04:00
e5655dc2d1
fix: formatting
2022-04-14 16:20:23 -04:00
69148bb350
fix: Rescript bugs
2022-04-14 16:17:59 -04:00
Ozzie Gooen
8854eed91e
Merge pull request #242 from quantified-uncertainty/analytic-normal
...
Analytic normal
2022-04-14 16:11:36 -04:00
ec9c67f090
feat: Audit SymbolicDist.res
...
- Fix buggy lognormal multiplication code
- Add precision to 90% confidence intervals code
- Simplified lognormal code
- Added sources for many of the manipulations
2022-04-14 16:03:54 -04:00
Umur Ozkul
53c44cdc9d
refactor macro definitions
2022-04-14 18:17:45 +02:00
Umur Ozkul
1fa1867470
Merge branch 'develop' into reducer-dev
2022-04-14 17:04:54 +02:00
Umur Ozkul
35f7077248
remove unused code
2022-04-14 17:02:01 +02:00
Umur Ozkul
fb63d44ab9
PR#226
2022-04-14 17:00:12 +02:00
Umur Ozkul
9b4f397859
remove unnecessary rec
2022-04-14 03:10:45 +02:00
Umur Ozkul
de379b6c04
Merge branch 'develop' into reducer-dev
2022-04-14 03:03:08 +02:00
Umur Ozkul
daf2a27182
PR#226, add missing variants to switch statements
...
Code is passing unit tests however there were missing variands. Fixed
2022-04-14 02:40:59 +02:00
Ozzie Gooen
478bbf5740
First attempt at handling arrays and records
2022-04-13 19:37:59 -04:00
Quinn Dougherty
b0ff2c19f5
yarn format
2022-04-13 19:18:08 -04:00
Quinn Dougherty
165427f137
refactored to a higher level of abstraction
2022-04-13 10:30:23 -04:00
Quinn Dougherty
e9e6cab099
silenced warning about toString
not having switch case for ArgumentError
2022-04-13 10:26:10 -04:00
Sam Nolan
948a8dd651
Add analytic solutions for normal and lognormal
2022-04-13 15:11:14 +10:00
Quinn Dougherty
b6e423a6e3
fixed bug after rebase: hope it doesn't cause problems
2022-04-13 01:08:51 -04:00
Quinn Dougherty
de81928ea9
Ran yarn format
2022-04-13 01:05:09 -04:00
Quinn Dougherty
af0577f85e
test count: 386
2022-04-13 01:05:09 -04:00
Quinn Dougherty
59fcd6a26c
intermediate commit to checkout something else
2022-04-13 01:05:08 -04:00
Quinn Dougherty
dd53c7554b
(rebase): begin setup for big redo
2022-04-13 01:05:08 -04:00
Quinn Dougherty
9d857bf79b
(rebase): documented ratio of lognormals
2022-04-13 01:05:08 -04:00
Quinn Dougherty
a64cd75ead
inv and cdf
2022-04-13 01:05:08 -04:00
Quinn Dougherty
6a4d615d3d
(rebase): (rebase): (rebase): **refactor**: rm duplicated genericDist
and error
declarations
2022-04-13 01:04:53 -04:00
Sam Nolan
348b1c9ac6
Add normal distribution analytical simplifications
2022-04-13 14:36:30 +10:00
Sam Nolan
117c08bfa9
Fix unweighted average of distributions
2022-04-13 12:03:04 +10:00
Sam Nolan
38135f0c81
Merge branch 'develop' into mix-distributions
2022-04-13 11:22:43 +10:00
Quinn Dougherty
b17f638483
EBindings
-> T.EBindings
2022-04-12 20:48:53 -04:00
Quinn Dougherty
4f95c019eb
yarn format
2022-04-12 20:22:19 -04:00
Sam Nolan
e234951d62
Hotfix bundle failure
2022-04-13 10:14:11 +10:00
Sam Nolan
f2f885f269
Hotfix Typescript checker failing
2022-04-13 10:07:33 +10:00
Umur Ozkul
fea990de2d
Sam's patch PR#226
2022-04-13 01:34:06 +02:00
Umur Ozkul
d1ea15e4f9
fix ts export
2022-04-12 17:12:19 +02:00
Umur Ozkul
1b4422bb90
revise lisp references - close umuro/squiggle#50
2022-04-12 16:26:55 +02:00
Umur Ozkul
05b5efce18
remove -> in switch cases. close umuro/squiggle#59
...
squiggle
2022-04-12 16:15:27 +02:00
Umur Ozkul
4fe72b8fb4
remove Reduce_Expression.rsi.
...
Too many changes. Hot target. Preventing development
2022-04-12 15:47:46 +02:00
Umur Ozkul
9c7f930549
Merge branch 'develop' into reducer-dev
...
packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.resi
2022-04-12 15:46:48 +02:00
Sam Nolan
f102d70d80
Add mixture alias
2022-04-12 17:45:44 +10:00
Sam Nolan
60a345dd6d
Implement mx for distributions
2022-04-12 17:39:38 +10:00
Sam Nolan
d316ad0a07
Merge branch 'develop' into reducer-playground
2022-04-12 16:45:14 +10:00
Sam Nolan
e5f8b6c7d3
Fix build errors for components and lang
2022-04-12 16:21:32 +10:00
Sam Nolan
440bfabffa
Run prettier on monorepo + fix crashing playground
2022-04-12 15:41:36 +10:00
Umur Ozkul
352cccaab8
Merge branch 'develop' into reducer-dev
2022-04-12 01:47:07 +02:00
Umur Ozkul
87116d12d5
reformat
2022-04-11 16:51:15 +02:00
Umur Ozkul
3a8e6a8f60
Merge branch 'staging' into reducer-dev
2022-04-11 16:42:37 +02:00
Umur Ozkul
660c0c70ae
variables and statements
...
format only reducer
reformat lint
multi-line test
spelling
multi-line semantic mapping
todo multi-line eval
multi-line tests todo
change context to bindings
simplify tests
rename exception test methods
bindings is an expression value
make bindings callable
reformat
Emphasize the nature of Lisp AST
Initial definition of macros
make functions private
fixed functionNode type casting
macro call skeleton
sort ReducerInterface
fix test
macros skeleton
bindings is not a value
assignment semantics
let semantics defined
format
reformat
reformat
TODO function calls and list hd variables are confused
reformat
tmp
works
reformat
reformat
add test
reformat
add test
2022-04-11 16:31:10 +02:00
Sam Nolan
26433c5289
Fix failing tests based on new toString
2022-04-11 16:31:54 +10:00
Sam Nolan
cb07f5f68a
A playground based on reducer
2022-04-11 16:16:29 +10:00
Quinn Dougherty
3689caa1fc
finally nailed the triggers! (I hope)
2022-04-11 01:08:54 -04:00
Quinn Dougherty
d4b00b15c1
debugging triggers again
2022-04-11 01:05:47 -04:00
Quinn Dougherty
19d5fa109b
rescript format
on DistPlus.res
2022-04-11 00:59:47 -04:00
Quinn Dougherty
e4e8e4b847
ran rescript format
on ProgramEvaluator.res
2022-04-11 00:23:15 -04:00
Sam Nolan
61b589d0bd
Change typescript interface to reducer
2022-04-11 13:16:31 +10:00
Sam Nolan
6565d97f53
Rename eval to evaluate
...
eval is a JS keyword
2022-04-11 11:18:38 +10:00
Sam Nolan
d6c541036f
Run prettier + add missing pointWiseAdd signature
2022-04-11 11:08:34 +10:00
Sam Nolan
e5baf23950
Run prettier in squiggle-lang
2022-04-11 10:51:43 +10:00
Sam Nolan
1825b1f250
Type the lang typescript interface
2022-04-11 10:48:45 +10:00
Ozzie Gooen
c94a70b93a
Fixed tests
2022-04-09 21:56:05 -04:00
Ozzie Gooen
5b0efbb3a8
Bandwidth -> SampleSetDist_Bandwidth
2022-04-09 21:31:34 -04:00
Ozzie Gooen
4338f482ef
Added genType to SampleSetDist to make pass tests, other minor fixes
2022-04-09 21:24:44 -04:00
Ozzie Gooen
9ad73fe69b
Power should be ** to be consistent
2022-04-09 20:36:33 -04:00
Ozzie Gooen
db104694fd
Cleaned up resultStringToResultError
2022-04-09 20:34:21 -04:00
Ozzie Gooen
f17a842c52
Cleanup from previous refactor
2022-04-09 20:27:03 -04:00
Ozzie Gooen
fa3d874a4e
Start of refactor for toPointSetDist
2022-04-09 20:21:02 -04:00
Ozzie Gooen
61aaca3e2f
Gave SampleSetDist a private type
2022-04-09 18:10:06 -04:00