[doc] include MEMM notebooks

markovmodel · May 16, 2016 · a16efdd · a16efdd
1 parent 67f0298
commit a16efdd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/doc/source/ipython.rst b/doc/source/ipython.rst
@@ -46,11 +46,20 @@ In this section we will give you in-depth tutorials on specific methods or conce
    generated/tpt
 
 
+Multi-Ensemble Markov state models
+----------------------------------
+
+.. toctree::
+   :maxdepth: 1
+
+   generated/PyEMMA.thermo.estimate_multi_temperatur_-_asymmetric_double_well
+   generated/PyEMMA.thermo.estimate_umbrella_sampling_-_asymmetric_double_well.rst
+
 Estimation with fixed equilibrium distribution
 ----------------------------------------------
 
 .. toctree::
    :maxdepth: 1
 
    generated/doublewell
-   generated/alanine
+   generated/alanine
diff --git a/pyemma-ipython b/pyemma-ipython
+0 −0		methods/multi_ensemble/doublewell/PyEMMA.thermo.estimate_multi_temperatur_-_asymmetric_double_well.ipynb
+0 −0		methods/multi_ensemble/doublewell/PyEMMA.thermo.estimate_umbrella_sampling_-_asymmetric_double_well.ipynb