some cleanups

Author: Baunsgaard

src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDC.java

@@ -886,17 +886,17 @@ public AColGroup sort() {
 		// find default value position.
 		// todo use binary search for minor improvements.
 		final double def = _defaultTuple[0];
-		int defIdx = -1;
-		int nondefault = 0;
+		int defIdx = counts.length;
 		for(int i = 0; i < r.length; i++) {
-			if(defIdx == -1 && _dict.getValue(r[i], 0, 1) >= def) {
+			if(_dict.getValue(r[i], 0, 1) >= def) {
 				defIdx = i;
+				break;
 			}
-			nondefault += counts[i];
 		}
 
+		int nondefault = _data.size();
 		int defaultLength = _numRows - nondefault;
-		AMapToData m = MapToFactory.create(_data.size(), counts.length);
+		AMapToData m = MapToFactory.create(nondefault, counts.length);
 		int[] offsets = new int[nondefault];
 
 		int off = 0;

src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCFOR.java

@@ -632,17 +632,17 @@ public AColGroup sort() {
 
 		// find default value position.
 		// todo use binary search for minor improvements.
-		int defIdx = -1;
-		int nondefault = 0;
+		int defIdx = counts.length;
 		for(int i = 0; i < r.length; i++) {
-			if(defIdx == -1 && _dict.getValue(r[i], 0, 1) >= 0) {
+			if( _dict.getValue(r[i], 0, 1) >= 0) {
 				defIdx = i;
+				break;
 			}
-			nondefault += counts[i];
 		}
 
+		int nondefault = _data.size();
 		int defaultLength = _numRows - nondefault;
-		AMapToData m = MapToFactory.create(_data.size(), counts.length);
+		AMapToData m = MapToFactory.create(nondefault, counts.length);
 		int[] offsets = new int[nondefault];
 
 		int off = 0;

src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingle.java

@@ -732,10 +732,10 @@ public AColGroup sort() {
 		// find default value position.
 		// todo use binary search for minor improvements.
 		final double def = _defaultTuple[0];
-		int defIdx = -1;
+		int defIdx = counts.length;
 		int nondefault = 0;
 		for(int i = 0; i < r.length; i++) {
-			if(defIdx == -1 && _dict.getValue(r[i], 0, 1) >= def) {
+			if(defIdx == counts.length && _dict.getValue(r[i], 0, 1) >= def) {
 				defIdx = i;
 			}
 			nondefault += counts[i];

src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java

@@ -1062,10 +1062,10 @@ public AColGroup sort() {
 
 		// find default value position.
 		// todo use binary search for minor improvements.
-		int defIdx = -1;
+		int defIdx = counts.length;
 		int nondefault = 0;
 		for(int i = 0; i < r.length; i++) {
-			if(defIdx == -1 && _dict.getValue(r[i], 0, 1) >= 0) {
+			if(defIdx == counts.length && _dict.getValue(r[i], 0, 1) >= 0) {
 				defIdx = i;
 			}
 			nondefault += counts[i];

src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCZeros.java

@@ -1102,19 +1102,21 @@ public AColGroup sort() {
 
 		// find default value position.
 		// todo use binary search for minor improvements.
-		int defIdx = -1;
-		int nondefault = 0;
+		int defIdx = counts.length;
 		for(int i = 0; i < r.length; i++) {
-			if(defIdx == -1 && _dict.getValue(r[i], 0, 1) >= 0) {
+			if(_dict.getValue(r[i], 0, 1) >= 0) {
 				defIdx = i;
+				break;
 			}
-			nondefault += counts[i];
 		}
 
+
+		int nondefault = _data.size();
 		int defaultLength = _numRows - nondefault;
-		AMapToData m = MapToFactory.create(_data.size(), counts.length);
+		AMapToData m = MapToFactory.create(nondefault, counts.length);
 		int[] offsets = new int[nondefault];
 
+
 		int off = 0;
 		for(int i = 0; i < counts.length; i++) {
 			if(i < defIdx) {