From 4981bdfb0c80ea998bc83cf94b83e4ae8814d64b Mon Sep 17 00:00:00 2001
From: amazaspshaumyan <sha-amazasp@yandex.ru>
Date: Sat, 6 Jun 2015 18:14:38 -0700
Subject: [PATCH]  new comments

---
 Linear Regression MapReduce/.DS_Store         | Bin 0 -> 6148 bytes
 .../LinearRegressionTS.py                     |  26 ++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 Linear Regression MapReduce/.DS_Store

diff --git a/Linear Regression MapReduce/.DS_Store b/Linear Regression MapReduce/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/Linear Regression MapReduce/LinearRegressionTS.py b/Linear Regression MapReduce/LinearRegressionTS.py
index 8db2e63..1c8ae8b 100644
--- a/Linear Regression MapReduce/LinearRegressionTS.py	
+++ b/Linear Regression MapReduce/LinearRegressionTS.py	
@@ -47,11 +47,9 @@ def __str__(self):
         return err
     
 
-
 ############################## Map Reduce Job #################################
 
 
-
 class LinearRegressionTS(MRJob):
     '''
     Calculates sample covariance matix of explanatory variables (x_t_x) and 
@@ -95,8 +93,8 @@ class LinearRegressionTS(MRJob):
     def __init__(self,*args, **kwargs):
         super(LinearRegressionTS, self).__init__(*args, **kwargs)
         n = self.options.dimension
-        self.x_t_x = np.zeros([n,n])
-        self.x_t_y = np.zeros(n)
+        self.x_t_x  = np.zeros([n,n])
+        self.x_t_y  = np.zeros(n)
         self.counts = 0
         
     #--------------------------- feature extraction --------------------------#
@@ -146,17 +144,17 @@ def mapper_lr(self,_,line):
         if self.options.bias is "True":
             features.append(1.0)
         x = np.array(features)
-        self.x_t_x+=np.outer(x, x)
-        self.x_t_y+=y*x
-        self.counts+=1
+        self.x_t_x  += np.outer(x, x)
+        self.x_t_y  += y*x
+        self.counts += 1
         
     def mapper_lr_final(self):
         '''
         Transforms numpy arrays x_t_x and x_t_y into json-encodable list format
         and sends to reducer
         '''
-        yield 1,("x_t_x", [list(row) for row in self.x_t_x])
-        yield 1,("x_t_y", [xy for xy in self.x_t_y])
+        yield 1,("x_t_x",  [list(row) for row in self.x_t_x])
+        yield 1,("x_t_y",  [xy for xy in self.x_t_y])
         yield 1,("counts", self.counts)
         
     def reducer_lr(self,key,values):
@@ -170,19 +168,19 @@ def reducer_lr(self,key,values):
         x_t_x = np.zeros([n,n]); x_t_y = np.zeros(n) 
         for val in values:
             if val[0]=="x_t_x":
-                x_t_x+=np.array(val[1])
+                x_t_x           +=   np.array(val[1])
             elif val[0]=="x_t_y":
-                x_t_y+=np.array(val[1])
+                x_t_y           +=   np.array(val[1])
             elif val[0]=="counts":
-                observations+=val[1]
+                observations    +=   val[1]
         betas = cholesky_solution_linear_regression(x_t_x,x_t_y)
         yield None,[e for e in betas]
             
     def steps(self):
         '''Defines map-reduce steps '''
-        return [MRStep(mapper = self.mapper_lr,
+        return [MRStep(mapper       = self.mapper_lr,
                        mapper_final = self.mapper_lr_final,
-                       reducer = self.reducer_lr)]
+                       reducer      = self.reducer_lr)]
                        
 if __name__=="__main__":
     LinearRegressionTS.run()