Some more updates

Author: janniklinde

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

@@ -93,9 +93,15 @@ public class DMLCodeGenerator {
 		});
 
 		customEncoders.put("cast.FLOAT", (stmt, sb, tmpVars) -> {
-			sb.append("as.scalar(");
-			appendExpression(stmt.getChild(0), sb, tmpVars);
-			sb.append(')');
+			if (stmt.getChild(0).getResultingDataType(ctx).equals("MATRIX")) {
+				sb.append("as.scalar(");
+				appendExpression(stmt.getChild(0), sb, tmpVars);
+				sb.append(')');
+			} else {
+				sb.append("as.double(");
+				appendExpression(stmt.getChild(0), sb, tmpVars);
+				sb.append(')');
+			}
 
 			return true;
 		});

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

@@ -216,15 +216,18 @@ public static boolean validateRuleCorrectness(RewriterRule rule, final RuleConte
 	}
 
 	public static boolean validateRuleApplicability(RewriterRule rule, final RuleContext ctx) {
+		RewriterStatement _mstmt = rule.getStmt1();
 		if (ctx.metaPropagator != null)
-			ctx.metaPropagator.apply(rule.getStmt1());
+			ctx.metaPropagator.apply(_mstmt);
 
-		Set<RewriterStatement> vars = DMLCodeGenerator.getVariables(rule.getStmt1());
+		final RewriterStatement stmt1 = RewriterUtils.unfuseOperators(_mstmt, ctx);
+
+		Set<RewriterStatement> vars = DMLCodeGenerator.getVariables(stmt1);
 		Set<String> varNames = vars.stream().map(RewriterStatement::getId).collect(Collectors.toSet());
 		String code2Header = DMLCodeGenerator.generateDMLVariables(vars);
-		String code2 = code2Header + "\nresult = " + DMLCodeGenerator.generateDML(rule.getStmt1());
+		String code2 = code2Header + "\nresult = " + DMLCodeGenerator.generateDML(stmt1);
 
-		boolean isMatrix = rule.getStmt1().getResultingDataType(ctx).equals("MATRIX");
+		boolean isMatrix = stmt1.getResultingDataType(ctx).equals("MATRIX");
 
 		if (isMatrix)
 			code2 += "\nprint(lineage(result))";
@@ -291,7 +294,7 @@ public static boolean validateRuleApplicability(RewriterRule rule, final RuleCon
 
 			Map<RewriterStatement, RewriterStatement> createdObjects = new HashMap<>();
 
-			RewriterStatement stmt1ReplaceNCols = rule.getStmt1().nestedCopyOrInject(createdObjects, mstmt -> {
+			RewriterStatement stmt1ReplaceNCols = stmt1.nestedCopyOrInject(createdObjects, mstmt -> {
 				if (mstmt.isInstruction() && (mstmt.trueInstruction().equals("ncol") || mstmt.trueInstruction().equals("nrow")))
 					return RewriterStatement.literal(ctx, DMLCodeGenerator.MATRIX_DIMS);
 				return null;