Commit Graph

365 Commits

Author SHA1 Message Date
Sebastian Kosch
d9cb164e5d Fix conflicts 2020-07-18 21:45:47 -07:00
Sebastian Kosch
d9141f6b2b Change extrapolation handling in Continuous.combinePointwise to explicit distributionType param 2020-07-18 21:43:27 -07:00
Sebastian Kosch
f3922761f4 Ozzie's suggestions 2020-07-18 21:34:55 -07:00
Ozzie Gooen
6d71722d34 Moved a bit of code to the SamplingDistribution file 2020-07-17 23:00:17 +01:00
Ozzie Gooen
f09caaae5e Change back to use combinationByRendering for this PR 2020-07-17 14:14:26 +01:00
Ozzie Gooen
1dfea41ab8 Formatted AlgebraicShapeCombination and added |> ignore statements 2020-07-17 11:29:51 +01:00
Ozzie Gooen
b3ccabae73 Tiny refactor to use Shape methods directly 2020-07-17 11:29:18 +01:00
Sebastian Kosch
9cdcc85d6c Fix broken filter in Discrete.truncate; switch to epsilon_float in Continuous.truncate 2020-07-16 20:50:12 -07:00
Sebastian Kosch
5fb5d2639f Remove normalizedToDiscrete and normalizedToContinuous 2020-07-16 20:39:28 -07:00
Sebastian Kosch
3e17b0a463 Add XYShape.stepwiseToLinear 2020-07-16 20:29:34 -07:00
Sebastian Kosch
954fcf4344 Fix merge conflicts 2020-07-16 18:45:40 -07:00
Sebastian Kosch
dca5b21f3a Move integralCache into shapes; clean up interpolator functions for PointwiseCombinations 2020-07-16 18:14:42 -07:00
Sebastian Kosch
49e379c8aa Fix discrete+continuous integration issue by cleaning up PointwiseCombination.combine 2020-07-13 16:32:45 -07:00
Sebastian Kosch
f8060458be Fix multimodals containing both discrete and continuous 2020-07-13 12:44:45 -07:00
Sebastian Kosch
fed98763d5 Add distToFloat functions 2020-07-13 12:05:00 -07:00
Ozzie Gooen
cecbe4fcc3 Removed a bunch of now-unused files 2020-07-13 00:05:21 +01:00
Ozzie Gooen
2da6f00211 Attached inputs to editor 2020-07-12 23:54:52 +01:00
Sebastian Kosch
d119db88a1 Allow algebraic multiplication 2020-07-12 15:53:53 -07:00
Ozzie Gooen
e5f38af43e First attempt at sampling 2020-07-11 16:41:35 +01:00
Ozzie Gooen
84b6d7176c Tried to fix changes from skosch 2020-07-09 11:46:28 +01:00
Ozzie Gooen
6cb825d228
Merge branch 'epic-expression-tree' into seb/epic-fixes 2020-07-09 11:29:22 +01:00
Sebastian Kosch
35048fec0d Experimental: continuous/discrete multiplication 2020-07-08 19:18:20 -07:00
Ozzie Gooen
892f0a0b25 Removed continuousShape from SymbolicDist 2020-07-08 17:30:36 +01:00
Ozzie Gooen
366523ce80 Pulled out Continuous to its own file 2020-07-08 17:00:13 +01:00
Ozzie Gooen
99d89a9f78 Pulled out Distplus and DistPlusTime to separate files 2020-07-08 16:52:41 +01:00
Ozzie Gooen
0e7f290ff2 Minor formatting 2020-07-08 14:08:34 +01:00
Ozzie Gooen
248545ee34 Added evaluateAndRetry function 2020-07-08 13:52:47 +01:00
Ozzie Gooen
9d0ecda297 Moved data to evaluationParams 2020-07-08 11:39:03 +01:00
Ozzie Gooen
da52444e8e Minor document formatting 2020-07-08 10:37:39 +01:00
Sebastian Kosch
2ddf0c02cb Add linear-time continuous XYShape combine function 2020-07-07 15:24:30 -07:00
Sebastian Kosch
8d09cf9beb Fix rendering of uniforms; add normalization constant in convolution code 2020-07-06 23:43:25 -07:00
Sebastian Kosch
89e07dad86 Fix truncation 2020-07-06 21:08:56 -07:00
Ozzie Gooen
4cf7a69d3e Formatted ExpressionTreeEvaluator.re 2020-07-06 19:50:22 +01:00
Ozzie Gooen
56a9bda82a Reapplied truncation changes that previously fixed things 2020-07-06 19:49:59 +01:00
Sebastian Kosch
0d5a0f5aeb ShapeConvolution -> AlgebraicShapeCombination 2020-07-03 17:15:37 -07:00
Sebastian Kosch
730dbddaf9 Fix multiplication of variances in ShapeConvolution 2020-07-03 17:13:26 -07:00
Sebastian Kosch
ca9f725ae7 Remove Leaf and Operation wrapper types 2020-07-03 14:55:27 -07:00
Ozzie Gooen
a649a6bca2 Added ExpressionTreeExamples in showcase 2020-07-02 23:52:58 +01:00
Ozzie Gooen
a681135f3d AlgebraicCombinations -> ShapeConvolution 2020-07-02 19:01:20 +01:00
Ozzie Gooen
9f30b6d75c Added back MathjsWrapper, which I accidentally lost 2020-07-02 18:29:04 +01:00
Ozzie Gooen
41eca03618 Set up new expressionTree directory 2020-07-02 18:12:03 +01:00
Ozzie Gooen
19e9eaee83 Minor renaming 2020-07-02 14:33:41 +01:00
Ozzie Gooen
96df9ced85 Moved rendering code from TreeNode to SymbolicDist 2020-07-02 14:30:01 +01:00
Ozzie Gooen
99c0803953 Moved truncateString work to separate section 2020-07-02 13:24:49 +01:00
Ozzie Gooen
4663700f67 Moved out distToFloatOps to better places 2020-07-02 12:25:04 +01:00
Ozzie Gooen
101824e500 Minor renames, and moved attemptAlgebraicOperation to SymbolicDist 2020-07-02 12:14:16 +01:00
Ozzie Gooen
491ac15f7b Separated Operation toString 2020-07-02 10:40:21 +01:00
Ozzie Gooen
43ba49dd12 Minor MathJsParser cleanup 2020-07-01 23:47:49 +01:00
Ozzie Gooen
05097bf28a Simplifications for MathJsParser 2020-07-01 23:05:35 +01:00
Ozzie Gooen
baaff19750 Moving operations functionality into new SymbolicTypes.re file 2020-07-01 22:01:58 +01:00