Refactoring TypeInference

datumbox · Apr 17, 2015 · 6acf286 · 6acf286
1 parent 195c25d
commit 6acf286
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 43 deletions.
diff --git a/src/main/java/com/datumbox/common/dataobjects/Dataset.java b/src/main/java/com/datumbox/common/dataobjects/Dataset.java
@@ -104,7 +104,7 @@ public static Dataset parseCSVFile(Reader reader, Map<String, TypeInference.Data
                         String column = entry.getKey();
                         TypeInference.DataType dataType = entry.getValue();
 
-                        Object value = TypeInference.parse(row.get(column), dataType); //parse the string value according to the DataType
+                        Object value = TypeInference.DataType.parse(row.get(column), dataType); //parse the string value according to the DataType
                         if (yColumnName.equals(column)) {
                             y = value;
                         } 

diff --git a/src/main/java/com/datumbox/common/dataobjects/TypeInference.java b/src/main/java/com/datumbox/common/dataobjects/TypeInference.java
@@ -32,6 +32,49 @@ public enum DataType {
         ORDINAL(Short.class), //ordinal variable => the value is short
         NUMERICAL(Number.class), //numberical variable => the value is any numeric except of short
         CATEGORICAL(Object.class); //categorical variable => the value is anything else
+
+        /**
+         * Takes a String and tries to translate it to the provided DataType.
+         * The result value is always casted to Object.
+         * 
+         * @param s
+         * @param dataType
+         * @return 
+         */
+        protected static Object parse(String s, DataType dataType) {
+            if(s==null || s.isEmpty() || s.toLowerCase().equals("null")) {
+                return null;
+            }
+
+            if(dataType == DataType.BOOLEAN) {
+                switch (s.toLowerCase()) {
+                    case "1":
+                    case "true":
+                    case "yes":
+                        return Boolean.TRUE;
+                    case "0":
+                    case "false":
+                    case "no":
+                        return Boolean.FALSE;
+                    default:
+                        return null;
+                }
+            }
+            else if (dataType == DataType.ORDINAL) {
+                return Short.valueOf(s);
+            }
+            else if (dataType == DataType.NUMERICAL) {
+                return Double.valueOf(s);
+            }
+            else if (dataType == DataType.CATEGORICAL) {
+                return s;
+            }
+            else {
+                //can happen if null DataType is provided
+                throw new RuntimeException("Unknown Datatype");
+            }
+        }
+
 
         private final Class klass;
 
@@ -45,53 +88,12 @@ private DataType(Class klass) {
          * @param v
          * @return 
          */
-        public boolean isInstance(Object v) {
+        private boolean isInstance(Object v) {
             return klass.isInstance(v);
         }
 
     }
 
-    /**
-     * Takes a String and tries to translate it to the provided DataType.
-     * The result value is always casted to Object.
-     * 
-     * @param s
-     * @param dataType
-     * @return 
-     */
-    public static Object parse(String s, DataType dataType) {
-        if(s==null || s.isEmpty() || s.toLowerCase().equals("null")) {
-            return null;
-        }
-
-        if(dataType == DataType.BOOLEAN) {
-            switch (s.toLowerCase()) {
-                case "1":
-                case "true":
-                case "yes":
-                    return Boolean.TRUE;
-                case "0":
-                case "false":
-                case "no":
-                    return Boolean.FALSE;
-                default:
-                    return null;
-            }
-        }
-        else if (dataType == DataType.ORDINAL) {
-            return Short.valueOf(s);
-        }
-        else if (dataType == DataType.NUMERICAL) {
-            return Double.valueOf(s);
-        }
-        else if (dataType == DataType.CATEGORICAL) {
-            return s;
-        }
-        else {
-            //can happen if null DataType is provided
-            throw new RuntimeException("Unknown Datatype");
-        }
-    }
 
     /**
      * Detects the DataType of a particular value.