From a16efdddf1696f28f780464120912699fa3dd042 Mon Sep 17 00:00:00 2001 From: Martin Scherer Date: Mon, 16 May 2016 16:46:51 +0200 Subject: [PATCH] [doc] include MEMM notebooks --- doc/source/ipython.rst | 11 ++++++++++- pyemma-ipython | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/source/ipython.rst b/doc/source/ipython.rst index 2431470b7..73babb02b 100644 --- a/doc/source/ipython.rst +++ b/doc/source/ipython.rst @@ -46,6 +46,15 @@ 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 ---------------------------------------------- @@ -53,4 +62,4 @@ Estimation with fixed equilibrium distribution :maxdepth: 1 generated/doublewell - generated/alanine + generated/alanine \ No newline at end of file diff --git a/pyemma-ipython b/pyemma-ipython index 503a7b105..a832ae66c 160000 --- a/pyemma-ipython +++ b/pyemma-ipython @@ -1 +1 @@ -Subproject commit 503a7b10585d00707736a3415d12473745db7035 +Subproject commit a832ae66cfa212ccaafed2d34fbe1f5618e8f741