Some more cleanup

Author: janniklinde

src/main/java/org/apache/sysds/hops/rewriter/RewriterRuleCreator.java

@@ -41,7 +41,13 @@ public synchronized void forEachRule(Consumer<RewriterRule> consumer) {
 	}
 
 	public boolean registerRule(RewriterRule rule, Function<RewriterStatement, RewriterStatement> canonicalFormConverter, final RuleContext ctx) {
-		return registerRule(rule, RewriterCostEstimator.estimateCost(rule.getStmt1(), ctx), RewriterCostEstimator.estimateCost(rule.getStmt2(), ctx), false, canonicalFormConverter);
+		try {
+			return registerRule(rule, RewriterCostEstimator.estimateCost(rule.getStmt1(), ctx), RewriterCostEstimator.estimateCost(rule.getStmt2(), ctx), false, canonicalFormConverter);
+		} catch (Exception e) {
+			System.err.println("Error while registering a rule: " + rule);
+			e.printStackTrace();
+			return false;
+		}
 	}
 
 	public synchronized boolean registerRule(RewriterRule rule, long preCost, long postCost, boolean validateCorrectness, Function<RewriterStatement, RewriterStatement> canonicalFormCreator) {

src/main/java/org/apache/sysds/hops/rewriter/estimators/RewriterCostEstimator.java

@@ -733,12 +733,6 @@ private static RewriterStatement propagateCostFunction(RewriterStatement stmt, f
 		RewriterStatement argList = RewriterStatement.argList(ctx, includedCosts);
 		RewriterStatement add = new RewriterInstruction().as(UUID.randomUUID().toString()).withInstruction("+").withOps(argList).consolidate(ctx);
 		add.unsafePutMeta("_assertions", assertions);
-
-		//System.out.println("Cost0: " + add.toParsableString(ctx));
-		//System.out.println("Assertions: " + assertions);
-
-		// TODO: Validate that this is not needed
-		//add = RewriterUtils.buildCanonicalFormConverter(ctx, false).apply(add);
 		return add;
 	}
 
@@ -976,8 +970,6 @@ private static RewriterStatement computeScalarOpCost(RewriterInstruction instr,
 			case "const(MATRIX,FLOAT)":
 			case "_nnz(MATRIX)":
 				return RewriterStatement.literal(ctx, 0L);
-			case "_EClass(INT)":
-				throw new IllegalArgumentException();
 		}
 
 		long opCost = atomicOpCost(instr.trueInstruction());