Skip to content

Issue 1047 encore docs#1062

Merged
kain88-de merged 5 commits intoMDAnalysis:issue-1047-encore-docsfrom
wouterboomsma:issue-1047-encore-docs
Nov 3, 2016
Merged

Issue 1047 encore docs#1062
kain88-de merged 5 commits intoMDAnalysis:issue-1047-encore-docsfrom
wouterboomsma:issue-1047-encore-docs

Conversation

@wouterboomsma
Copy link
Contributor

Changes made in this Pull Request:
Changes to the documentation of Encore, both factual corrections and edits to improve sphinx rendering.

PR Checklist

  • Tests?
  • Docs?
  • CHANGELOG updated?
  • Issue raised/referenced?

Copy link
Member

@kain88-de kain88-de left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work only some very minor comments.

---------
Parameters
----------

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line doesn't line up with the previous.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tab-vs-space issue. Fixed in e7add80.

Returns:
---------
Returns
-------
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't line up with the previous line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tab-vs-space issue. Fixed in e7add80.

for the same method can be explored by adding different instances of
the same dimensionality reduction class. Provided methods are the
Stochastic Proximity Embedding (default) and the Principel Component
Stochastic Proximity Embedding (default) and the Principal Component
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A side question how does your PCA compare with the new PCA analysis?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good question. The fact that there are now two versions of PCA in MDAnalysis is a bit of an accident. After early discussions on how encore could best be integrated in MDAnalysis, there was some consensus on making the dimensionality reduction and clustering code more generally available within MDAnalysis. I therefore rewrote the code so that both clustering and dimensionality got their own front-end functions, and that particular clustering and dimensionality reduction algorithms could just be plugged in - for instance those from scikit-learn. PCA was just a natural example to include. Only after doing this work did I realized that someone had coded a PCA in the mean time.

They should probably be merged at some point, but @orbeckst suggested that we stick with the two versions for this release, and then take a step back and think about some refactoring.

So, long story short. I haven't compared the two implementations. But the one in Encore is just a direct interface to the one in scikit-learn.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So then you need to load everything into memory while the other implementation only needs to hold the current frame and can therefore estimate a PCA for even a TB trajectory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. That is at least one obvious difference.

@kain88-de kain88-de merged commit b99d493 into MDAnalysis:issue-1047-encore-docs Nov 3, 2016
abiedermann pushed a commit to abiedermann/mdanalysis that referenced this pull request Jan 5, 2017
* Fixes in Encore and MemoryReader documentation to make it render with sphinx.

* Edits in Encore and MemoryReader documentation.

* Renamed PrincipleComponentAnalysis to PrincipalComponentAnalysis. Minor edits in documentation.

* Changed spacing issues
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