markovmodel / variational

Basis sets, estimators and solvers for the variational approach of conformation dynamics. NOTE: the code has been merged with PyEMMA and is maintained there.
10 stars 5 forks source link

Added variational/solvers/qr_c #38

Closed fnueske closed 8 years ago

franknoe commented 8 years ago

Thank you! I suggest to also import qr_solve and sort_by_norm in the init:

https://github.com/markovmodel/variational/blob/devel_Feliks/variational/__init__.py

marscher commented 8 years ago

Please dont merge yet. @fnueske you've added the auto-generated c file by Cython. Please remove it again and add the name to .gitignore in that directory to prevent anybody from adding it again.

fnueske commented 8 years ago

Ok. I also noticed that the extension for qr_solver in setup.py was missing.

franknoe commented 8 years ago

No problem, I was going to wait anyway for the addition to the init.

Am 26/09/16 um 10:09 schrieb Martin K. Scherer:

Please dont merge yet. @fnueske https://github.com/fnueske you've added the auto-generated c file by Cython. Please remove it again and add the name to .gitignore in that directory to prevent anybody from adding it again.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/markovmodel/variational/pull/38#issuecomment-249598680, or mute the thread https://github.com/notifications/unsubscribe-auth/AGMeQmY6O9AVTv7ZFj0Mslf-PgW0wDkyks5qt-BHgaJpZM4KGnxz.


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

fnueske commented 8 years ago

@marscher Can I add the ".c"-extension to the .gitignore-file in the root directory or do you want me to create a separate .gitignore in qr_c?

franknoe commented 8 years ago

gitignore that particular file. In general we may want to have .c files.

Am 26/09/16 um 10:20 schrieb Feliks Nüske:

@marscher https://github.com/marscher Can I add the ".c"-extension to the .gitignore-file in the root directory or do you want me to create a separate .gitignore in qr_c?

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/markovmodel/variational/pull/38#issuecomment-249601726, or mute the thread https://github.com/notifications/unsubscribe-auth/AGMeQifbIFf2lFbEwkzTcF_EoOZs9NC5ks5qt-KlgaJpZM4KGnxz.


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 commented 8 years ago

If you add it in the root file, please qualify the path to it like this: / variational/solvers/qr_c/qr_solver.c

marscher commented 8 years ago

but actually it is better to add a new gitignore file for the case we refactor something.

fnueske commented 8 years ago

Done. Sorry, @marscher , I saw your last message too late.

franknoe commented 8 years ago

Thanks. Looks good to me, @marscher please merge if you agree.

marscher commented 8 years ago

Appveyor is lazy today...