[skip ci] reverts

Author: Baunsgaard

src/main/java/org/apache/sysds/runtime/matrix/operators/ScalarOperator.java

@@ -93,15 +93,4 @@ protected static boolean isSparseSafeStatic(ValueFunction fn) {
 			|| fn instanceof Builtin && ((Builtin)fn).getBuiltinCode()==BuiltinCode.LOG_NZ)
 			|| fn instanceof BitwShiftL || fn instanceof BitwShiftR;
 	}
-
-	@Override
-	public String toString(){
-		StringBuilder sb = new StringBuilder();
-		sb.append(this.getClass().getSimpleName());
-		sb.append(" ");
-		sb.append(fn);
-		sb.append(" Value: ");
-		sb.append(_constant);
-		return sb.toString();
-	}
 }

src/main/java/org/apache/sysds/runtime/util/DataConverter.java

@@ -880,10 +880,7 @@ private static String dfFormat(DecimalFormat df, double value) {
 		if (Double.isNaN(value) || Double.isInfinite(value)){
 			return Double.toString(value);
 		} else {
-			if(value == (long) value)
-				return Long.toString(((long)(value)));
-			else 
-				return df.format(value);
+			return df.format(value);
 		}
 	}
 
@@ -1131,7 +1128,7 @@ public static String toString(FrameBlock fb, boolean sparse, String separator, S
 		sb.append("nrow = " + fb.getNumRows() + ", ");
 		sb.append("ncol = " + fb.getNumColumns() + lineseparator);
 
-		// print column names
+		//print column names
 		sb.append("#"); sb.append(separator);
 		for( int j=0; j<colLength; j++ ) {
 			sb.append(fb.getColumnNames()[j]);

src/main/java/org/apache/sysds/runtime/util/HDFSTool.java

@@ -524,6 +524,15 @@ public static String metaDataToString(ValueType vt, ValueType[] schema, DataType
 
 		return mtd.toString(4); // indent with 4 spaces	
 	}
+
+	public static double[][] readMatrixFromHDFS(String dir, FileFormat fmt, long rlen, long clen, int blen)
+		throws IOException, DMLRuntimeException
+	{
+		MatrixReader reader = MatrixReaderFactory.createMatrixReader(fmt);
+		long estnnz = (rlen <= 0 || clen <= 0) ? -1 : rlen * clen;
+		MatrixBlock mb = reader.readMatrixFromHDFS(dir, rlen, clen, blen, estnnz);
+		return DataConverter.convertToDoubleMatrix(mb);
+	}
 
 	public static double[] readColumnVectorFromHDFS(String dir, FileFormat fmt, long rlen, long clen, int blen)
 		throws IOException, DMLRuntimeException

src/test/java/org/apache/sysds/test/component/compress/TestBase.java

@@ -28,7 +28,6 @@
 import org.apache.sysds.runtime.compress.CompressionSettings;
 import org.apache.sysds.runtime.compress.CompressionSettingsBuilder;
 import org.apache.sysds.runtime.compress.colgroup.AColGroup.CompressionType;
-import org.apache.sysds.runtime.compress.lib.CLALibReshape;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
 import org.apache.sysds.test.TestUtils;
 import org.apache.sysds.test.component.compress.TestConstants.MatrixTypology;
@@ -58,10 +57,6 @@ public class TestBase {
 	// Input
 	protected MatrixBlock mb;
 
-	static {
-		CLALibReshape.COMPRESSED_RESHAPE_THRESHOLD = 10;
-	}
-
 	public TestBase(SparsityType sparType, ValueType valType, ValueRange valueRange,
 		CompressionSettingsBuilder compressionSettings, MatrixTypology MatrixTypology, OverLapping ov,
 		Collection<CompressionType> ct) {
@@ -103,8 +98,8 @@ public TestBase(SparsityType sparType, ValueType valType, ValueRange valueRange,
 						Math.min((max - min), 10), max, min, sparsity, seed, false);
 					break;
 				case UNBALANCED_SPARSE:
-					mb = CompressibleInputGenerator.getUnbalancedSparseMatrix(rows, cols, Math.min((max - min), 10), max,
-						min, seed);
+					mb = CompressibleInputGenerator.getUnbalancedSparseMatrix(rows, cols, Math.min((max - min), 10),
+						max, min, seed);
 					cols = mb.getNumColumns();
 					break;
 				case ONE_HOT:

src/test/java/org/apache/sysds/test/component/compress/dictionary/CombineTest.java

@@ -176,6 +176,7 @@ public void twoBothSidesFilter() {
 			IDictionary b = Dictionary.create(new double[] {1.4, 1.5});
 			HashMapLongInt filter = new HashMapLongInt(3);
 			filter.putIfAbsent(0, 0);
+
 			IDictionary c = DictionaryFactory.combineFullDictionaries(a, 1, b, 1, filter);
 
 			assertEquals(1, c.getNumberOfValues(2));

src/test/java/org/apache/sysds/test/component/compress/util/CountTest.java

@@ -42,7 +42,6 @@ public void sort1() {
 
 		try {
 			DCounts hs = h.sort();
-			
 			assertEquals(4, hs.count);
 		}
 		catch(Exception e) {

src/test/java/org/apache/sysds/test/component/frame/array/FrameArrayTests.java

@@ -2577,7 +2577,6 @@ public static String[] generateRandomHash32OptNUnique(int size, int seed, int nU
 		return ret;
 	}
 
-
 	public static Character[] generateRandomCharacterNUniqueLengthOpt(int size, int seed, int nUnique) {
 		Character[] rands = generateRandomCharacterOpt(nUnique, seed);