Merge branch 'master' of github.com:0xdata/h2o

Author: tomkraljevic

src/main/java/hex/glm/GLM2.java

@@ -336,7 +336,6 @@ else if(glmt._beta[i] > 0)
       double [] newBeta = glmt._beta != null?glmt._beta.clone():MemoryManager.malloc8d(glmt._xy.length);
       double [] newBetaDeNorm = null;
       ADMMSolver slvr = new ADMMSolver(lambda[_lambdaIdx],alpha[0], _addedL2);
-      slvr._n = glmt._n;
       slvr.solve(glmt._gram,glmt._xy,glmt._yy,newBeta);
       _addedL2 = slvr._addedL2;
       if(Utils.hasNaNsOrInfs(newBeta)){

src/main/java/hex/glm/LSMSolver.java

@@ -168,7 +168,6 @@ static final double[] shrink(double[] x, double[] z, double kappa) {
 
 
   public static final class ADMMSolver extends LSMSolver {
-  public long _n;
     //public static final double DEFAULT_LAMBDA = 1e-5;
     public static final double DEFAULT_ALPHA = 0.5;
     public double _orlx = 1;//1.4; // over relaxation param
@@ -223,7 +222,7 @@ public boolean solve(Gram gram, double [] xy, double yy, double[] z, double objV
       final int N = xy.length;
       Arrays.fill(z, 0);
       if(_lambda>0 || _addedL2 > 0)
-        gram.addDiag(_lambda*(1-_alpha)/_n + _addedL2);
+        gram.addDiag(_lambda*(1-_alpha) + _addedL2);
       double rho = _rho;
       if(_alpha > 0 && _lambda > 0){
         if(Double.isNaN(_rho)) rho = _lambda*_alpha;//gram.diagMin()+1e-5;// find rho value as min diag element + constant