Skip to content

Commit 54e62b2

Browse files
authored
Bump version and notebooks to 0.6.2 (#230)
1 parent 6346b7c commit 54e62b2

File tree

9 files changed

+185
-216
lines changed

9 files changed

+185
-216
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Changelog
22
=========
33

4-
dev
5-
---
4+
0.6.2 (2017-09-06)
5+
------------------
66

77
- Easier saving and loading of ElfiModel
88
- Renamed elfi.set_current_model to elfi.set_default_model

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ docs: ## generate Sphinx HTML documentation, including API docs
6969
$(MAKE) -C docs html
7070
# $(BROWSER) docs/_build/html/index.html
7171

72-
CONTENT_URL := http://research.cs.aalto.fi/pml/software/elfi/docs/0.6.1/
72+
CONTENT_URL := http://research.cs.aalto.fi/pml/software/elfi/docs/0.6.2/
7373

7474
notebook-docs: ## Conver notebooks to rst docs. Assumes you have them in `notebooks` directory.
7575
jupyter nbconvert --to rst ../notebooks/quickstart.ipynb --output-dir docs

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
**Version 0.6.1 released!** See the CHANGELOG and [notebooks](https://github.com/elfi-dev/notebooks).
1+
**Version 0.6.2 released!** See the CHANGELOG and [notebooks](https://github.com/elfi-dev/notebooks).
22

33
ELFI - Engine for Likelihood-Free Inference
44
===========================================

docs/quickstart.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ First ensure you have
77
Python 3.5 (or greater) and ELFI. After installation you can start using
88
ELFI:
99

10-
.. code:: python
10+
.. code:: ipython3
1111
1212
import elfi
1313
1414
ELFI includes an easy to use generative modeling syntax, where the
1515
generative model is specified as a directed acyclic graph (DAG). Let’s
1616
create two prior nodes:
1717

18-
.. code:: python
18+
.. code:: ipython3
1919
2020
mu = elfi.Prior('uniform', -2, 4)
2121
sigma = elfi.Prior('uniform', 1, 4)
@@ -30,7 +30,7 @@ summary statistics for the data. As an example, lets define the
3030
simulator as 30 draws from a Gaussian distribution with a given mean and
3131
standard deviation. Let's use mean and variance as our summaries:
3232

33-
.. code:: python
33+
.. code:: ipython3
3434
3535
import scipy.stats as ss
3636
import numpy as np
@@ -48,7 +48,7 @@ standard deviation. Let's use mean and variance as our summaries:
4848
Let’s now assume we have some observed data ``y0`` (here we just create
4949
some with the simulator):
5050

51-
.. code:: python
51+
.. code:: ipython3
5252
5353
# Set the generating parameters that we will try to infer
5454
mean0 = 1
@@ -73,7 +73,7 @@ Now we have all the components needed. Let’s complete our model by
7373
adding the simulator, the observed data, summaries and a distance to our
7474
model:
7575

76-
.. code:: python
76+
.. code:: ipython3
7777
7878
# Add the simulator node and observed data to the model
7979
sim = elfi.Simulator(simulator, mu, sigma, observed=y0)
@@ -89,15 +89,15 @@ model:
8989
If you have ``graphviz`` installed to your system, you can also
9090
visualize the model:
9191

92-
.. code:: python
92+
.. code:: ipython3
9393
9494
# Plot the complete model (requires graphviz)
9595
elfi.draw(d)
9696
9797
9898
9999
100-
.. image:: http://research.cs.aalto.fi/pml/software/elfi/docs/0.6.1/quickstart_files/quickstart_11_0.svg
100+
.. image:: http://research.cs.aalto.fi/pml/software/elfi/docs/0.6.2/quickstart_files/quickstart_11_0.svg
101101

102102

103103

@@ -108,7 +108,7 @@ We can try to infer the true generating parameters ``mean0`` and
108108
Rejection sampling and sample 1000 samples from the approximate
109109
posterior using threshold value 0.5:
110110

111-
.. code:: python
111+
.. code:: ipython3
112112
113113
rej = elfi.Rejection(d, batch_size=10000, seed=30052017)
114114
res = rej.sample(1000, threshold=.5)
@@ -127,13 +127,13 @@ posterior using threshold value 0.5:
127127
128128
Let's plot also the marginal distributions for the parameters:
129129

130-
.. code:: python
130+
.. code:: ipython3
131131
132132
import matplotlib.pyplot as plt
133133
res.plot_marginals()
134134
plt.show()
135135
136136
137137
138-
.. image:: http://research.cs.aalto.fi/pml/software/elfi/docs/0.6.1/quickstart_files/quickstart_16_0.png
138+
.. image:: http://research.cs.aalto.fi/pml/software/elfi/docs/0.6.2/quickstart_files/quickstart_16_0.png
139139

0 commit comments

Comments
 (0)