Merge branch 'master' into multiple_grid_search

doc/about.rst

@@ -31,6 +31,7 @@ citations to the following paper:
     year={2011}
    }
 
+
 Funding
 -------
 
@@ -61,6 +62,7 @@ The `PSF <http://www.python.org/psf/>`_ helped find and manage funding for our
 `tinyclues <http://www.tinyclues.com/>`_ funded the 2011 international Granada
 sprint.
 
+
 Donating to the project
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -101,11 +103,8 @@ for code sprints, as well as towards the organization budget of the project [#f1
 .. [#f1] Regarding the organization budget in particular, we might use some of the donated funds to pay for other project expenses such as DNS, hosting or continuous integration services.
 
 
-
-
-
 The 2013' Paris international sprint
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 |center-div|   |telecom|   |tinyclues|   |afpy| |FNRS|
 
@@ -152,3 +151,18 @@ The 2013' Paris international sprint
   </div>
 
 *For more information on this sprint, see* `here <https://github.com/scikit-learn/administrative/blob/master/sprint_paris_2013/proposal.rst>`_
+
+
+Infrastructure support
+----------------------
+
+- We would like to thank `Rackspace <http://www.rackspace.com>`_ for providing
+  us with a free `Rackspace Cloud <http://www.rackspace.com/cloud/>`_ account to
+  automatically build the documentation and the example gallery from for the
+  development version of scikit-learn using `this tool
+  <https://github.com/scikit-learn/sklearn-docbuilder>`_.
+
+- We would also like to thank `Shining Panda
+  <https://www.shiningpanda-ci.com/>`_ for free CPU time on their Continuous
+  Integration server.
+

doc/install.rst

@@ -251,6 +251,20 @@ scikit-learn is available via `pkgsrc-wip <http://pkgsrc-wip.sourceforge.net/>`_
 
     http://pkgsrc.se/wip/py-scikit_learn
 
+Fedora
+------
+
+The Fedora package is called `python-scikit-learn` for the Python 2 version
+and `python3-scikit-learn` for the Python 3 version. Both versions can
+be installed using `yum`::
+
+    $ sudo yum install python-scikit-learn
+
+or::
+
+    $ sudo yum install python3-scikit-learn
+
+
 .. _install_bleeding_edge:
 
 Bleeding Edge

doc/whats_new.rst

@@ -125,6 +125,10 @@ Changelog
      to speed improvement of the tree, forest and gradient boosting tree
      modules. By `Arnaud Joly`_
 
+   - Changed the internal storage of decision trees to use a struct array.
+     This fixed some small bugs, while improving code and providing a small
+     speed gain. By `Joel Nothman`_.
+
    - Various enhancements to the  :mod:`sklearn.ensemble.gradient_boosting`
      module: a ``warm_start`` argument to fit additional trees,
      a ``max_leaf_nodes`` argument to fit GBM style trees,

sklearn/linear_model/ridge.py

@@ -287,11 +287,12 @@ def ridge_regression(X, y, alpha, sample_weight=1.0, solver='auto',
             try:
                 dual_coef = _solve_dense_cholesky_kernel(K, y, alpha,
                                                          sample_weight)
+
+                coef = safe_sparse_dot(X.T, dual_coef, dense_output=True).T
             except linalg.LinAlgError:
                 # use SVD solver if matrix is singular
                 solver = 'svd'
 
-            coef = safe_sparse_dot(X.T, dual_coef, dense_output=True).T
         else:
             try:
                 coef = _solve_dense_cholesky(X, y, alpha)