Mapped PMML 'INT-NUMBER', 'PROB-NUMBER' and 'PERCENTAGE-NUMBER' data …

…types to Java primitive data types
jpmml · Mar 13, 2016 · 9acef92 · 9acef92
1 parent 9264a71
commit 9acef92
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 285 deletions.
diff --git a/pmml-model-gwt/src/main/resources/org/dmg/pmml/jre/javax/xml/bind/DatatypeConverter.java b/pmml-model-gwt/src/main/resources/org/dmg/pmml/jre/javax/xml/bind/DatatypeConverter.java
diff --git a/pmml-model/src/main/java/org/dmg/pmml/adapters/DecimalAdapter.java b/pmml-model/src/main/java/org/dmg/pmml/adapters/DecimalAdapter.java
diff --git a/pmml-model/src/main/java/org/dmg/pmml/adapters/IntegerAdapter.java b/pmml-model/src/main/java/org/dmg/pmml/adapters/IntegerAdapter.java
diff --git a/pmml-model/src/main/java/org/dmg/pmml/adapters/ValueUtil.java b/pmml-model/src/main/java/org/dmg/pmml/adapters/ValueUtil.java
diff --git a/pmml-model/src/main/schema/pmml.xjb b/pmml-model/src/main/schema/pmml.xjb
@@ -14,24 +14,6 @@ Copyright (c) 2009 University of Tartu
 			/>
 		</jaxb:schemaBindings>
 
-		<jaxb:globalBindings>
-			<xjc:javaType
-				name="java.lang.Integer"
-				xmlType="xs:integer"
-				adapter="org.dmg.pmml.adapters.IntegerAdapter"
-			/>
-			<xjc:javaType
-				name="java.lang.Integer"
-				xmlType="xs:nonNegativeInteger"
-				adapter="org.dmg.pmml.adapters.IntegerAdapter"
-			/>
-			<xjc:javaType
-				name="java.lang.Double"
-				xmlType="xs:decimal"
-				adapter="org.dmg.pmml.adapters.DecimalAdapter"
-			/>
-		</jaxb:globalBindings>
-
 		<jaxb:bindings node="//xsd:complexType[@name='COUNT-TABLE-TYPE']">
 			<annox:annotate>
 				<annox:annotate annox:class="org.jpmml.schema.Added" value="PMML_4_1"/>
@@ -2866,4 +2848,4 @@ Copyright (c) 2009 University of Tartu
 			/>
 		</jaxb:bindings>
 	</jaxb:bindings>
-</jaxb:bindings>
+</jaxb:bindings>
diff --git a/pmml-model/src/main/xsl/pmml.xsl b/pmml-model/src/main/xsl/pmml.xsl
@@ -159,4 +159,18 @@ Copyright (c) 2009 University of Tartu
 	<xsl:template match="xs:attribute[@type='xs:float' or @type='xs:double']/@type">
 		<xsl:attribute name="type">NUMBER</xsl:attribute>
 	</xsl:template>
-</xsl:stylesheet>
+
+	<!--
+	Replace xs:integer with xs:int
+	-->
+	<xsl:template match="xs:simpleType[@name='INT-NUMBER']/xs:restriction/@base">
+		<xsl:attribute name="base">xs:int</xsl:attribute>
+	</xsl:template>
+
+	<!--
+	Replace xs:decimal with xs:double
+	-->
+	<xsl:template match="xs:simpleType[@name='PROB-NUMBER' or @name='PERCENTAGE-NUMBER']/xs:restriction/@base">
+		<xsl:attribute name="base">xs:double</xsl:attribute>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/pmml-model/src/test/java/org/dmg/pmml/adapters/DecimalAdapterTest.java b/pmml-model/src/test/java/org/dmg/pmml/adapters/DecimalAdapterTest.java
diff --git a/pmml-model/src/test/java/org/dmg/pmml/adapters/IntegerAdapterTest.java b/pmml-model/src/test/java/org/dmg/pmml/adapters/IntegerAdapterTest.java
diff --git a/pmml-model/src/test/java/org/dmg/pmml/adapters/ValueUtilTest.java b/pmml-model/src/test/java/org/dmg/pmml/adapters/ValueUtilTest.java