# HG changeset patch
# User Frederic Bastien <nouiz@nouiz.org>
# Date 1315838955 14400
# Node ID 723e2d761985cce87b30f1ac2e063cb0b0ad34ba
# Parent  bf5c0f79716116ef065ff35c66de8a4a726b6029
auto white space fix.

diff -r bf5c0f797161 -r 723e2d761985 pylearn/algorithms/kernel_regression.py
--- a/pylearn/algorithms/kernel_regression.py	Mon Sep 12 10:48:33 2011 -0400
+++ b/pylearn/algorithms/kernel_regression.py	Mon Sep 12 10:49:15 2011 -0400
@@ -37,11 +37,11 @@
   small datasets.
 * the linear system is
       (M + lambda I_n) theta = (1, y)'
-  where theta = (b, alpha), I_n is the (n+1)x(n+1) matrix that is the identity 
-  except with a 0 at (0,0), M is the matrix with G in the sub-matrix starting 
-  at (1,1), 1's in column 0, except for a value of n at (0,0), and sum_i G_{i,j} 
+  where theta = (b, alpha), I_n is the (n+1)x(n+1) matrix that is the identity
+  except with a 0 at (0,0), M is the matrix with G in the sub-matrix starting
+  at (1,1), 1's in column 0, except for a value of n at (0,0), and sum_i G_{i,j}
   in the rest of row 0.
-  
+
 Note that this is gives an estimate of E[y|x,training_set] that is the
 same as obtained with a Gaussian process regression. The GP
 regression would also provide a Bayesian Var[y|x,training_set].
@@ -60,8 +60,8 @@
        outputs, errors = kernel_predictor.compute_outputs_and_errors(inputs,targets)
        errors = kernel_predictor.compute_errors(inputs,targets)
        mse = kernel_predictor.compute_mse(inputs,targets)
-       
-       
+
+
 
     The training_set must have fields "input" and "target".
     The test_set must have field "input", and needs "target" if
@@ -147,7 +147,7 @@
 
     def __init__(self):
         self.compile()
-        
+
 class KernelRegressionEquations(KernelPredictorEquations):
     #M = T.matrix() # (n_examples+1) x (n_examples+1)
     inputs = T.matrix() # n_examples x n_inputs
@@ -158,9 +158,9 @@
     #new_G = T.gemm(G,1.,inputs,inputs.T,1.)
     G = T.exp(-(row_vector(inputs_square)-2*T.dot(inputs,inputs.T)+col_vector(inputs_square))*inv_gamma2)
     sumG = T.sum(G,axis=0)
-    
+
     __compiled = False
-    
+
     @classmethod
     def compile(cls,linker='c|py'):
         if cls.__compiled:
@@ -200,7 +200,7 @@
     def compute_mse(self,inputs,targets):
         errors = self.compute_errors(inputs,targets)
         return numpy.sum(errors)/errors.size
-    
+
     def __call__(self,dataset,output_fieldnames=None,cached_output_dataset=False):
         assert dataset.hasFields(["input"])
         if output_fieldnames is None:
@@ -217,15 +217,14 @@
             f = self.compute_outputs_and_errors
         else:
             raise ValueError("unknown field(s) in output_fieldnames: "+str(output_fieldnames))
-        
+
         ds=ApplyFunctionDataSet(dataset,f,output_fieldnames)
         if cached_output_dataset:
             return CachedDataSet(ds)
         else:
             return ds
-        
+
 
 def kernel_predictor(inputs,params,*otherargs):
-  p = KernelPredictor(params,*otherargs[0])
-  return p.compute_outputs(inputs)
-  
+    p = KernelPredictor(params,*otherargs[0])
+    return p.compute_outputs(inputs)
diff -r bf5c0f797161 -r 723e2d761985 pylearn/algorithms/linear_regression.py
--- a/pylearn/algorithms/linear_regression.py	Mon Sep 12 10:48:33 2011 -0400
+++ b/pylearn/algorithms/linear_regression.py	Mon Sep 12 10:49:15 2011 -0400
@@ -26,8 +26,8 @@
        outputs, errors = linear_predictor.compute_outputs_and_errors(inputs,targets)
        errors = linear_predictor.compute_errors(inputs,targets)
        mse = linear_predictor.compute_mse(inputs,targets)
-       
-       
+
+
 
     The training_set must have fields "input" and "target".
     The test_set must have field "input", and needs "target" if
@@ -36,7 +36,7 @@
     The predictor parameters are obtained analytically from the training set.
 
     For each (input[t],output[t]) pair in a minibatch,::
-    
+
        output_t = b + W * input_t
 
     where b and W are obtained by minimizing::
@@ -109,7 +109,7 @@
 
     def __init__(self):
         self.compile()
-        
+
 class LinearRegressionEquations(LinearPredictorEquations):
     P = LinearPredictorEquations
     XtX = T.matrix() # (n_inputs+1) x (n_inputs+1)
@@ -119,7 +119,7 @@
     new_XtY = T.add(XtY,T.dot(extended_input.T,P.targets))
 
     __compiled = False
-    
+
     @classmethod
     def compile(cls, mode="FAST_RUN"):
         if cls.__compiled:
@@ -156,7 +156,7 @@
     def compute_mse(self,inputs,targets):
         errors = self.compute_errors(inputs,targets)
         return numpy.sum(errors)/errors.size
-    
+
     def __call__(self,dataset,output_fieldnames=None,cached_output_dataset=False):
         assert dataset.hasFields(["input"])
         if output_fieldnames is None:
@@ -173,17 +173,17 @@
             f = self.compute_outputs_and_errors
         else:
             raise ValueError("unknown field(s) in output_fieldnames: "+str(output_fieldnames))
-        
+
         ds=ApplyFunctionDataSet(dataset,f,output_fieldnames)
         if cached_output_dataset:
             return CachedDataSet(ds)
         else:
             return ds
-        
+
 
 def linear_predictor(inputs,params,*otherargs):
-  p = LinearPredictor(params)
-  return p.compute_outputs(inputs)
+    p = LinearPredictor(params)
+    return p.compute_outputs(inputs)
 
 #TODO : an online version
 class OnlineLinearRegression():#OnlineLearningAlgorithm):
@@ -195,7 +195,3 @@
     the last call to forget).
     """
     pass
-
-
-
-