[MINOR] Various cleanups of prints and formatting

Author: Baunsgaard

src/main/java/org/apache/sysds/runtime/compress/lib/CLALibDecompress.java

@@ -367,7 +367,6 @@ private static void decompressSparseMultiThread(MatrixBlock ret, List<AColGroup>
 			for(int i = 0; i < rlen; i += blklen)
 				tasks.add(new DecompressSparseTask(filteredGroups, ret, i, Math.min(i + blklen, rlen)));
 
-			LOG.error("tasks:" + tasks);
 			for(Future<Object> rt : pool.invokeAll(tasks))
 				rt.get();
 		}

src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkloadAnalyzer.java

@@ -32,7 +32,7 @@
 import org.apache.sysds.runtime.instructions.cp.ComputationCPInstruction;
 
 public class FederatedWorkloadAnalyzer {
-	protected static final Log LOG = LogFactory.getLog(FederatedWorkerHandler.class.getName());
+	protected static final Log LOG = LogFactory.getLog(FederatedWorkloadAnalyzer.class.getName());
 
 	/** Frequency value for how many instructions before we do a pass for compression */
 	private static final int compressRunFrequency = 10;
@@ -49,7 +49,6 @@ public FederatedWorkloadAnalyzer() {
 	}
 
 	public void incrementWorkload(ExecutionContext ec, long tid, Instruction ins) {
-		LOG.error("Increment Workload  " + tid + " " + ins + "\n" + this);
 		if(ins instanceof ComputationCPInstruction)
 			incrementWorkload(ec, tid, (ComputationCPInstruction) ins);
 		// currently we ignore everything that is not CP instructions

src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayWrapper.java

@@ -27,9 +27,9 @@
 
 public class ArrayWrapper implements Writable {
 
-	public Array<?> _a; 
+	public Array<?> _a;
 
-	public ArrayWrapper(Array<?> a){
+	public ArrayWrapper(Array<?> a) {
 		_a = a;
 	}
 
@@ -44,5 +44,5 @@ public void readFields(DataInput in) throws IOException {
 		int s = in.readInt();
 		_a = ArrayFactory.read(in, s);
 	}
-	
+
 }

src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java

@@ -36,7 +36,7 @@
 public class BooleanArray extends ABooleanArray {
 	protected boolean[] _data;
 
-	private BooleanArray(int nRow){
+	private BooleanArray(int nRow) {
 		this(new boolean[nRow]);
 	}
 

src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java

@@ -267,11 +267,6 @@ protected Array<Boolean> changeTypeBoolean(Array<Boolean> retA, int l, int u) {
 		return _a.changeTypeBoolean(retA, l, u);
 	}
 
-	// @Override
-	// protected Array<Double> changeTypeDouble() {
-	// 	return _a.changeTypeDouble();
-	// }
-
 	@Override
 	protected Array<Double> changeTypeDouble(Array<Double> retA, int l, int u) {
 		return _a.changeTypeDouble(retA, l, u);

src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java

@@ -496,13 +496,11 @@ else if(cc < 10)
 	}
 
 	protected void changeTypeIntegerNormal(Array<Integer> ret, int l, int u) {
-	
-			for(int i = l; i < u; i++) {
-				final String s = _data[i];
-				if(s != null)
-					ret.set(i, parseInt(s));
-			}
-		
+		for(int i = l; i < u; i++) {
+			final String s = _data[i];
+			if(s != null)
+				ret.set(i, parseInt(s));
+		}
 	}
 
 	protected int parseInt(String s) {

src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java

@@ -126,8 +126,8 @@ public static MultiColumnEncoder createEncoder(String spec, String[] colnames, i
 			rcIDs = unionDistinct(rcIDs, except(except(dcIDs, binIDs), haIDs));
 			// Error out if the first level encoders have overlaps
 			if (intersect(rcIDs, binIDs, haIDs, weIDs, bowIDs))
-				throw new DMLRuntimeException("More than one encoders (recode, binning, hashing, word_embedding, bag_of_words) on one column is not allowed");
-			
+				throw new DMLRuntimeException("More than one encoders (recode, binning, hashing, word_embedding, bag_of_words) on one column is not allowed:\n" + spec);
+
 			List<Integer> ptIDs = except(UtilFunctions.getSeqList(1, clen, 1), naryUnionDistinct(rcIDs, haIDs, binIDs, weIDs, bowIDs));
 			List<Integer> oIDs = new ArrayList<>(Arrays.asList(ArrayUtils
 				.toObject(TfMetaUtils.parseJsonIDList(jSpec, colnames, TfMethod.OMIT.toString(), minCol, maxCol))));

src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinAdasynRealDataTest.java

@@ -86,7 +86,8 @@ private void runAdasynTest(String data, String tfspec, boolean adasyn, double mi
 			runTest(true, false, null, -1);
 
 			double acc = readDMLMatrixFromOutputDir("R").get(new CellIndex(1,1));
-			Assert.assertTrue(acc >= minAcc);
+
+			Assert.assertTrue("Accuracy should be greater than min: " + acc + "  min: " + minAcc, acc >= minAcc);
 			Assert.assertEquals(0, Statistics.getNoOfExecutedSPInst());
 		}
 		finally {

src/test/java/org/apache/sysds/test/functions/federated/paramserv/EncryptedFederatedParamservTest.java

@@ -160,7 +160,6 @@ private void EncryptedfederatedParamserv(ExecMode mode, boolean modelAvg) {
 				threads.add(startLocalFedWorkerThread(port,
 						i==(_numFederatedWorkers-1) ? FED_WORKER_WAIT : FED_WORKER_WAIT_S));
 				ports.add(port);
-				System.out.println("Worker with port " + port + " started!");
 
 				if ( threads.get(i).isInterrupted() || !threads.get(i).isAlive() )
 					throw new DMLRuntimeException("Federated worker thread dead or interrupted! Port " + port);
@@ -215,7 +214,7 @@ private void EncryptedfederatedParamserv(ExecMode mode, boolean modelAvg) {
 
 			programArgs = programArgsList.toArray(new String[0]);
 			String log = runTest(null).toString();
-			System.out.println(log);
+
 			if (!heavyHittersContainsAllString("paramserv"))
 				fail("The following expected heavy hitters are missing: "
 					+ Arrays.toString(missingHeavyHitters("paramserv")));

src/test/java/org/apache/sysds/test/functions/federated/paramserv/FederatedParamservTest.java

@@ -154,7 +154,6 @@ private void federatedParamserv(ExecMode mode) {
 				int port = getRandomAvailablePort();
 				threads.add(startLocalFedWorkerThread(port, FED_WORKER_WAIT_S));
 				ports.add(port);
-				System.out.println("Worker with port " + port + " started!");
 
 				if ( threads.get(i).isInterrupted() || !threads.get(i).isAlive() )
 					throw new DMLRuntimeException("Federated worker thread dead or interrupted! Port " + port);