(Ready for review): Switch combinator by femtomc · Pull Request #334 · probcomp/Gen.jl

Commits on Nov 17, 2020

Initial work on a Switch combinator.
femtomc
committed
3e4f695
Initial implementation of propose and generate.
femtomc
committed
bd4f830
Added implementaton of simulate.
femtomc
committed
374a7b0
Corrected some bugs with Bernoulli vs bernoulli.
femtomc
committed
5872593
Added assess implementation.
femtomc
committed
9c0a9f2

Commits on Nov 18, 2020

Split into two combinators: Switch and WithProbability implementations.
femtomc
committed
95baf07
Working on Switch update and regenerate.
femtomc
committed
29b7797
Added Switch update and regenerate.
femtomc
committed
3e6e307
Added Switch update and regenerate - working out kinks in update.
femtomc
committed
7929b86
update and regenerate appear to be computing the correct ratios. To confirm with Marco/Alex.
femtomc
committed
73618a1
Fixed generate index type bug.
femtomc
committed
252413f
Branch dispatch done using diff types.
femtomc
committed
ac3528e
Branch dispatch done using diff types.
femtomc
committed
eaf3327
Branch dispatch done using diff types.
femtomc
committed
6d58aac
Added custom methods in update for Switch which allow the merging of overlapping choice maps and the computation of the discard addresses in update.
femtomc
committed
e413e9c
Added custom methods in update for Switch which allow the merging of overlapping choice maps and the computation of the discard addresses in update.
femtomc
committed
435493f
Idiomatic check for EmptyChoiceMap.
femtomc
committed
32fec4f
Working on backprop - seems simple? Could it really be?
femtomc
committed
bb767e7
Extracting WithProb combinator into another PR.
femtomc
committed
a35e2e7

Commits on Nov 19, 2020

Commits on Nov 20, 2020

Commits on Nov 22, 2020

Renamed mix field of Switch generative function to branches to more accurately reflect the pattern.
femtomc
committed
0465965

Commits on Dec 5, 2020

Addressed review comments. Added docstrings where necessary. Corrected update_discard. Added test to test the discard functionality in a hierarchical model example.
femtomc
committed
43c7274

Navigation Menu

(Ready for review): Switch combinator - #334

(Ready for review): Switch combinator#334
marcoct merged 31 commits into
probcomp:masterfrom
femtomc:20201116_mrb_switch_combinator

Commits on Nov 17, 2020

Initial work on a Switch combinator.

Initial implementation of propose and generate.

Added implementaton of simulate.

Corrected some bugs with Bernoulli vs bernoulli.

Added assess implementation.

Commits on Nov 18, 2020

Split into two combinators: Switch and WithProbability implementations.

Working on Switch update and regenerate.

Added Switch update and regenerate.

Added Switch update and regenerate - working out kinks in update.

update and regenerate appear to be computing the correct ratios. To confirm with Marco/Alex.

Fixed generate index type bug.

Branch dispatch done using diff types.

Branch dispatch done using diff types.

Branch dispatch done using diff types.

Added custom methods in update for Switch which allow the merging of overlapping choice maps and the computation of the discard addresses in update.

Added custom methods in update for Switch which allow the merging of overlapping choice maps and the computation of the discard addresses in update.

Idiomatic check for EmptyChoiceMap.

Working on backprop - seems simple? Could it really be?

Extracting WithProb combinator into another PR.

Commits on Nov 19, 2020

Testing backprop.

Fixed backprop - was thinking in Zygote lang. Gradients appear to be propagating correctly now.

Merge branch 'master' of https://github.com/probcomp/Gen.jl into 20201116_mrb_switch_combinator

Added docstring and docs example.

Fixed numerous bugs uncovered while constructing test suite. One serious bug in semantics for regenerate - when switching branches, should generate with choice map constraints except those addresse…

Commits on Nov 20, 2020

Fixed numerous bugs uncovered while constructing test suite. One serious bug in semantics for regenerate - when switching branches, should generate with choice map constraints except those addresse…

Tests for everything but gradients - working on gradients now.

Last tests I need to write: accumulate_param_gradients!

Added accumulate_param_gradients! tests.

Reverted particle filter fix - will be handled in another issue.

Commits on Nov 22, 2020

Renamed mix field of Switch generative function to branches to more accurately reflect the pattern.

Commits on Dec 5, 2020

Addressed review comments. Added docstrings where necessary. Corrected update_discard. Added test to test the discard functionality in a hierarchical model example.