diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-05-08 12:27:09 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-13 13:22:31 +0200 |
commit | b32202458cce6a00686fab7bac777b6cb9ee34de (patch) | |
tree | d4fb80f544a13442f56e5d7d30ec09e26c6f8fe3 /vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java | |
parent | e15d87688f4da812e93500598fa653164b47b9bd (diff) |
Merge
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java index 1f426942c5f..def3ab6b4ec 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorTypeParser.java @@ -56,21 +56,12 @@ public class TensorTypeParser { return new TensorType.Builder(valueType, dimensions).build(); } - public static TensorType.Value toValueType(String valueTypeString) { - switch (valueTypeString) { - case "double" : return TensorType.Value.DOUBLE; - case "float" : return TensorType.Value.FLOAT; - default : throw new IllegalArgumentException("Value type must be either 'double' or 'float'" + - " but was '" + valueTypeString + "'"); - } - } - private static TensorType.Value parseValueTypeSpec(String valueTypeSpec, String fullSpecString) { if ( ! valueTypeSpec.startsWith("<") || ! valueTypeSpec.endsWith(">")) throw formatException(fullSpecString, Optional.of("Value type spec must be enclosed in <>")); try { - return toValueType(valueTypeSpec.substring(1, valueTypeSpec.length() - 1)); + return TensorType.Value.fromId(valueTypeSpec.substring(1, valueTypeSpec.length() - 1)); } catch (IllegalArgumentException e) { throw formatException(fullSpecString, e.getMessage()); |