Skip to content

Readd effective counts#20

Merged
marscher merged 3 commits intomarkovmodel:develfrom
marscher:readd_effective_counts
Jul 14, 2015
Merged

Readd effective counts#20
marscher merged 3 commits intomarkovmodel:develfrom
marscher:readd_effective_counts

Conversation

@marscher
Copy link
Copy Markdown
Member

This commit was actually added by @franknoe just before @trendelkampschroer and me pulled out the msm subpackage.

Note that the tests will fail until we have the new dtrajs package.

@franknoe
Copy link
Copy Markdown
Contributor

huh, but this was the first commit in dev_release_1.3, so how could that have been missed? Didn't you extract msmtools from the dev_release_1.3 branch?

@marscher
Copy link
Copy Markdown
Member Author

yes we did this on an up to date dev_release branch. I do not know why this had happened.

@marscher
Copy link
Copy Markdown
Member Author

I've double checked all subpackages of msm, if they are up2date with dev_release branch right now and only this function was missing.

@franknoe
Copy link
Copy Markdown
Contributor

Before deleting something, can we make sure that we don't miss anything
here? The effective count stuff consists of multiple commits, starting from

markovmodel/PyEMMA@b279765

to

markovmodel/PyEMMA@ed6779e

and then another correction happened in

markovmodel/PyEMMA@a8bb502

Am 14/07/15 um 16:35 schrieb Martin K. Scherer:

yes we did this on an up to date dev_release branch. I do not know why
this had happened.


Reply to this email directly or view it on GitHub
#20 (comment).


Prof. Dr. Frank Noe
Head of Computational Molecular Biology group
Freie Universitaet Berlin

Phone: (+49) (0)30 838 75354
Web: research.franknoe.de

Mail: Arnimallee 6, 14195 Berlin, Germany

@franknoe
Copy link
Copy Markdown
Contributor

note that this function uses pyemma.util.statistics, which is currently
not included in msmtools

Am 14/07/15 um 16:36 schrieb Martin K. Scherer:

I've double checked all subpackages of msm, if they are up2date with
dev_release branch right now and only this function was missing.


Reply to this email directly or view it on GitHub
#20 (comment).


Prof. Dr. Frank Noe
Head of Computational Molecular Biology group
Freie Universitaet Berlin

Phone: (+49) (0)30 838 75354
Web: research.franknoe.de

Mail: Arnimallee 6, 14195 Berlin, Germany

@marscher
Copy link
Copy Markdown
Member Author

marscher commented Jul 14, 2015 via email

@marscher
Copy link
Copy Markdown
Member Author

Am 14.07.2015 um 16:40 schrieb Frank Noe:

Before deleting something, can we make sure that we don't miss anything
here?
I've copied over the latest state from dev_release, so all those fixed
are contained.

@franknoe
Copy link
Copy Markdown
Contributor

I don't know yet. Copy it into msmtools.util for now.

Am 14/07/15 um 16:43 schrieb Martin K. Scherer:

good point. Will the statistics module be contained in the new util git
repo?


Reply to this email directly or view it on GitHub
#20 (comment).


Prof. Dr. Frank Noe
Head of Computational Molecular Biology group
Freie Universitaet Berlin

Phone: (+49) (0)30 838 75354
Web: research.franknoe.de

Mail: Arnimallee 6, 14195 Berlin, Germany

@franknoe
Copy link
Copy Markdown
Contributor

If we create a base module, let's first only put pyemma._base in there
and things in pyemma.util we're sure that we need to keep in a general
repo. I have the impression that some pyemma.util things are not really
used anymore.

Am 14/07/15 um 16:43 schrieb Martin K. Scherer:

good point. Will the statistics module be contained in the new util git
repo?


Reply to this email directly or view it on GitHub
#20 (comment).


Prof. Dr. Frank Noe
Head of Computational Molecular Biology group
Freie Universitaet Berlin

Phone: (+49) (0)30 838 75354
Web: research.franknoe.de

Mail: Arnimallee 6, 14195 Berlin, Germany

@marscher
Copy link
Copy Markdown
Member Author

Am 14.07.2015 um 16:47 schrieb Frank Noe:

If we create a base module, let's first only put pyemma._base in there
and things in pyemma.util we're sure that we need to keep in a general
repo. I have the impression that some pyemma.util things are not really
used anymore.
Despite deprecated code it also contains code, which we do not want to
share (eg the logging and config modules).

@franknoe
Copy link
Copy Markdown
Contributor

Am 14/07/15 um 16:48 schrieb Martin K. Scherer:

Am 14.07.2015 um 16:47 schrieb Frank Noe:

If we create a base module, let's first only put pyemma._base in there
and things in pyemma.util we're sure that we need to keep in a general
repo. I have the impression that some pyemma.util things are not really
used anymore.
Despite
"except for"
deprecated code it also contains code, which we do not want to
share (eg the logging and config modules).
Logging is actually used in _base.estimator


Reply to this email directly or view it on GitHub
#20 (comment).


Prof. Dr. Frank Noe
Head of Computational Molecular Biology group
Freie Universitaet Berlin

Phone: (+49) (0)30 838 75354
Web: research.franknoe.de

Mail: Arnimallee 6, 14195 Berlin, Germany

@marscher
Copy link
Copy Markdown
Member Author

The logging initialization also depends on the pyemma config file. I do not see how to easily untangle this.

@marscher
Copy link
Copy Markdown
Member Author

but I'm getting off topic right now. I will copy over the statistics module right now.

@marscher marscher force-pushed the readd_effective_counts branch from 632d750 to 9c26b49 Compare July 14, 2015 15:25
@marscher marscher force-pushed the readd_effective_counts branch from 9c26b49 to 0d79b2b Compare July 14, 2015 15:38
@marscher marscher force-pushed the readd_effective_counts branch from 7ec7fbd to aaf43fb Compare July 14, 2015 15:49
marscher added a commit that referenced this pull request Jul 14, 2015
@marscher marscher merged commit a64cf4c into markovmodel:devel Jul 14, 2015
@marscher marscher deleted the readd_effective_counts branch July 14, 2015 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants