fixed a bug and code cleanup

ebx · Mar 9, 2016 · d378b6a · d378b6a
1 parent 2e25037
commit d378b6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/mltk/predictor/evaluation/AUC.java b/src/mltk/predictor/evaluation/AUC.java
@@ -20,7 +20,7 @@ private class DoublePairComparator implements Comparator<DoublePair> {
 		public int compare(DoublePair o1, DoublePair o2) {
 			int cmp = Double.compare(o1.v1, o2.v1);
 			if (cmp == 0) {
-				cmp = Double.compare(o2.v2, o2.v2);
+				cmp = Double.compare(o1.v2, o2.v2);
 			}
 			return cmp;
 		}

diff --git a/src/mltk/predictor/glm/ElasticNetLearner.java b/src/mltk/predictor/glm/ElasticNetLearner.java
@@ -1130,11 +1130,10 @@ protected void doOnePassBinomial(double[][] x, double[] theta, double[] y, final
 			double eta = VectorUtils.dotProduct(rTrain, v);
 
 			double newW = w[j] * theta[j] + eta;
-			double t = tl1;
-			if (newW > t) {
-				newW -= t;
-			} else if (newW < -t) {
-				newW += t;
+			if (newW > tl1) {
+				newW -= tl1;
+			} else if (newW < -tl1) {
+				newW += tl1;
 			} else {
 				newW = 0;
 			}
@@ -1167,11 +1166,10 @@ protected void doOnePassBinomial(int[][] indices, double[][] values, double[] th
 			}
 
 			double newW = w[j] * theta[j] + eta;
-			double t = tl1;
-			if (newW > t) {
-				newW -= t;
-			} else if (newW < -t) {
-				newW += t;
+			if (newW > tl1) {
+				newW -= tl1;
+			} else if (newW < -tl1) {
+				newW += tl1;
 			} else {
 				newW = 0;
 			}