Skip to content

Commit

Permalink
FIX/MAINT: update my mail etc (scikit-learn#8375)
Browse files Browse the repository at this point in the history
* update mail etc

* fix utf8
  • Loading branch information
dengemann authored and ogrisel committed Feb 16, 2017
1 parent 8beaf32 commit 8694278
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Brian Holt <[email protected]> <[email protected]>
Christian Osendorfer <[email protected]>
Clay Woolam <[email protected]>
Danny Sullivan <[email protected]> <[email protected]>
Denis Engemann <d.engemann@fz-juelich.de>
Denis Engemann <d.engemann@fz-juelich.de> <[email protected]>
Denis Engemann <d.engemann@fz-juelich.de> <[email protected]>
Denis Engemann <d.engemann@fz-juelich.de> <dengemann <[email protected]>
Denis Engemann <denis-alexander.engemann@inria.fr>
Denis Engemann <denis-alexander.engemann@inria.fr> <[email protected]>
Denis Engemann <denis-alexander.engemann@inria.fr> <[email protected]>
Denis Engemann <denis-alexander.engemann@inria.fr> <dengemann <[email protected]>
Diego Molla <[email protected]> <diego@diego-desktop.(none)>
DraXus <[email protected]> draxus <[email protected]>
Edouard DUCHESNAY <[email protected]> <duchesnay@is143433.(none)>
Expand Down Expand Up @@ -61,7 +61,7 @@ Jake VanderPlas <[email protected]> <[email protected]>
Jake VanderPlas <[email protected]> <[email protected]>
James Bergstra <[email protected]>
Jaques Grobler <[email protected]> <[email protected]>
Jan Schl�ter <[email protected]>
Jan Schlüter <[email protected]>
Jean Kossaifi <[email protected]>
Jean Kossaifi <[email protected]> <[email protected]>
Jean Kossaifi <[email protected]> <[email protected]>
Expand Down
8 changes: 5 additions & 3 deletions doc/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2304,7 +2304,7 @@ Enhancements
:class:`cluster.MeanShift`, by `Mathieu Blondel`_.

- Vector and matrix multiplications have been optimised throughout the
library by :user:`Denis Engemann <dengemann>`, and `Alexandre Gramfort`_.
library by `Denis Engemann`_, and `Alexandre Gramfort`_.
In particular, they should take less memory with older NumPy versions
(prior to 1.7.2).

Expand All @@ -2317,7 +2317,7 @@ Enhancements

- Added svd_method option with default value to "randomized" to
:class:`decomposition.FactorAnalysis` to save memory and
significantly speedup computation by :user:`Denis Engemann <dengemann>`, and
significantly speedup computation by `Denis Engemann`_, and
`Alexandre Gramfort`_.

- Changed :class:`cross_validation.StratifiedKFold` to try and
Expand Down Expand Up @@ -2840,7 +2840,7 @@ Changelog
faster on sparse data (the speedup depends on the sparsity). By
`Lars Buitinck`_.

- Reduce memory footprint of FastICA by :user:`Denis Engemann <dengemann>` and
- Reduce memory footprint of FastICA by `Denis Engemann`_ and
`Alexandre Gramfort`_.

- Verbose output in :mod:`sklearn.ensemble.gradient_boosting` now uses
Expand Down Expand Up @@ -4986,3 +4986,5 @@ David Huard, Dave Morrill, Ed Schofield, Travis Oliphant, Pearu Peterson.
.. _Kathleen Chen: https://github.com/kchen17

.. _Vincent Pham: https://github.com/vincentpham1991

.. _Denis Engemann: http://denis-engemann.de
2 changes: 1 addition & 1 deletion sklearn/decomposition/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Author: Alexandre Gramfort <[email protected]>
# Olivier Grisel <[email protected]>
# Mathieu Blondel <[email protected]>
# Denis A. Engemann <d.engemann@fz-juelich.de>
# Denis A. Engemann <denis-alexander.engemann@inria.fr>
# Kyle Kastner <[email protected]>
#
# License: BSD 3 clause
Expand Down
2 changes: 1 addition & 1 deletion sklearn/decomposition/factor_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Author: Christian Osendorfer <[email protected]>
# Alexandre Gramfort <[email protected]>
# Denis A. Engemann <d.engemann@fz-juelich.de>
# Denis A. Engemann <denis-alexander.engemann@inria.fr>

# License: BSD3

Expand Down
2 changes: 1 addition & 1 deletion sklearn/decomposition/pca.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Author: Alexandre Gramfort <[email protected]>
# Olivier Grisel <[email protected]>
# Mathieu Blondel <[email protected]>
# Denis A. Engemann <d.engemann@fz-juelich.de>
# Denis A. Engemann <denis-alexander.engemann@inria.fr>
# Michael Eickenberg <[email protected]>
# Giorgio Patrini <[email protected]>
#
Expand Down
2 changes: 1 addition & 1 deletion sklearn/utils/tests/test_extmath.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Authors: Olivier Grisel <[email protected]>
# Mathieu Blondel <[email protected]>
# Denis Engemann <d.engemann@fz-juelich.de>
# Denis Engemann <denis-alexander.engemann@inria.fr>
#
# License: BSD 3 clause

Expand Down

0 comments on commit 8694278

Please sign in to comment.