[SYSTEMDS-3544]

revert renaming of valuetypes

Author: louislepage

src/main/java/org/apache/sysds/common/Types.java

@@ -76,7 +76,7 @@ public boolean isUnknown() {
 	 */
 	public enum ValueType {
 		UINT4, UINT8, // Used for parsing in UINT values from numpy.
-		FP32, FP64, INT32, INT64, BITSET, BOOLEAN, STRING, UNKNOWN,
+		FP32, FP64, INT32, INT64, BOOLEAN, STRING, UNKNOWN,
 		CHARACTER;
 
 		public boolean isNumeric() {
@@ -86,7 +86,7 @@ public boolean isUnknown() {
 			return this == UNKNOWN;
 		}
 		public boolean isPseudoNumeric() {
-			return isNumeric() || this == BITSET || this == CHARACTER;
+			return isNumeric() || this == BOOLEAN || this == CHARACTER;
 		}
 		public String toExternalString() {
 			switch(this) {
@@ -96,7 +96,6 @@ public String toExternalString() {
 				case UINT8:
 				case INT32:
 				case INT64:   return "INT";
-				case BITSET:  return "BITSET";
 				case BOOLEAN: return "BOOLEAN";
 				default:      return toString();
 			}
@@ -114,7 +113,6 @@ public static ValueType fromExternalString(String value) {
 				case "INT32":    return INT32;
 				case "INT64":
 				case "INT":      return INT64;
-				case "BITSET":  return BITSET;
 				case "BOOLEAN":  return BOOLEAN;
 				case "STRING":   return STRING;
 				case "CHARACTER": return CHARACTER;
@@ -197,7 +195,7 @@ else if(b == UNKNOWN)
 					default:
 						return a;
 				}
-				case BITSET:
+				case BOOLEAN:
 					return b; // always higher type in b;
 				case UNKNOWN:
 				default:

src/main/java/org/apache/sysds/hops/DataOp.java

@@ -396,7 +396,7 @@ protected double computeOutputMemEstimate( long dim1, long dim2, long nnz )
 					ret = OptimizerUtils.INT_SIZE; break;
 				case FP64:
 					ret = OptimizerUtils.DOUBLE_SIZE; break;
-				case BITSET:
+				case BOOLEAN:
 					ret = OptimizerUtils.BOOLEAN_SIZE; break;
 				case STRING: 
 					// by default, it estimates the size of string[100]