From f3e3fcdf713586f1d6c76dd6e74a4f39ba1471ed Mon Sep 17 00:00:00 2001
From: Gael varoquaux <gael.varoquaux@normalesup.org>
Date: Fri, 12 Nov 2010 10:57:41 +0100
Subject: [PATCH] MISC: Recover changes overidden by manual merge.
---
scikits/learn/pca.py | 4 ++--
scikits/learn/tests/test_pca.py | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/scikits/learn/pca.py b/scikits/learn/pca.py
index 9c752f0509..051879147c 100644
--- a/scikits/learn/pca.py
+++ b/scikits/learn/pca.py
@@ -80,7 +80,7 @@ def _infer_dimension_(spect, n, p):
return ll.argmax()
-
+################################################################################
class PCA(BaseEstimator):
"""Principal component analysis (PCA)
@@ -166,7 +166,7 @@ class PCA(BaseEstimator):
return Xr
-
+################################################################################
class ProbabilisticPCA(PCA):
""" Additional layer on top of PCA that add a probabilistic evaluation
"""
diff --git a/scikits/learn/tests/test_pca.py b/scikits/learn/tests/test_pca.py
index 187a6c16b1..e84e9e9c15 100644
--- a/scikits/learn/tests/test_pca.py
+++ b/scikits/learn/tests/test_pca.py
@@ -2,9 +2,6 @@ import numpy as np
from numpy.random import randn
from nose.tools import assert_true
-
-#from scikits.learn import datasets
-#from scikits.learn.pca import PCA, ProbabilisticPCA, _assess_dimension_, _infer_dimension_
from .. import datasets
from ..pca import PCA, ProbabilisticPCA, _assess_dimension_, _infer_dimension_
--
GitLab