Merged version 1.6.11

jpmml · Jan 10, 2025 · 53ab74e · 53ab74e
2 parents e38e1b7 + 6ce578b
commit 53ab74e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -36,13 +36,13 @@ Java Class Model API for Predictive Model Markup Language (PMML).
 
 JPMML-Model library JAR files (together with accompanying Java source and Javadocs JAR files) are released via [Maven Central Repository](https://repo1.maven.org/maven2/org/jpmml/).
 
-The current version is **1.6.9** (26 December, 2024).
+The current version is **1.6.10** (4 January, 2025).
 
 ```xml
 <dependency>
 	<groupId>org.jpmml</groupId>
 	<artifactId>pmml-model</artifactId>
-	<version>1.6.9</version>
+	<version>1.6.10</version>
 </dependency>
 ```
 

diff --git a/pmml-model/src/main/schema/pmml.xjb b/pmml-model/src/main/schema/pmml.xjb
@@ -9,7 +9,7 @@ Copyright (c) 2014 Villu Ruusmann
 
 		<jpmml-model:serialVersionUID
 			major="4" minor="4" patch="1"
-			implementation="7"
+			implementation="8"
 		/>
 
 		<jaxb:globalBindings>
@@ -1507,6 +1507,12 @@ Copyright (c) 2014 Villu Ruusmann
 			<annox:annotateProperty>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_4)</annox:annotateProperty>
 		</jaxb:bindings>
 
+		<jaxb:bindings node="//xsd:element[@name='Lag']/xsd:complexType/xsd:attribute[@name='aggregate']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="Aggregate"
+			/>
+		</jaxb:bindings>
+
 		<jaxb:bindings node="//xsd:element[@name='Lambda']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_3)</annox:annotateClass>
 			<jpmml-model:subpackage
@@ -2148,8 +2154,26 @@ Copyright (c) 2014 Villu Ruusmann
 		<jaxb:bindings node="//xsd:element[@name='OutputField']/xsd:complexType/xsd:attribute[@name='isMultiValued']">
 			<annox:annotateProperty>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_0)</annox:annotateProperty>
 			<annox:annotateProperty>org.jpmml.model.annotations.Deprecated(org.dmg.pmml.Version.PMML_4_2)</annox:annotateProperty>
+			<jaxb:property
+				name="multiValued"
+			/>
 		</jaxb:bindings>
 
+		<jaxb:bindings node="//xsd:element[@name='OutputField']/xsd:complexType/xsd:attribute[@name='isMultiValued']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="MultiValued"
+			>
+			<jaxb:typesafeEnumMember
+				name="ZERO"
+				value="0"
+			/>
+			<jaxb:typesafeEnumMember
+				name="ONE"
+				value="1"
+			/>
+			</jaxb:typesafeEnumClass>
+		</jaxb:bindings>
+
 		<jaxb:bindings node="//xsd:element[@name='OutputField']/xsd:complexType/xsd:attribute[@name='optype']">
 			<annox:annotateProperty>org.jpmml.model.annotations.NullSafeGetter</annox:annotateProperty>
 			<annox:annotateProperty>org.jpmml.model.annotations.ValueConstructorParameter</annox:annotateProperty>

diff --git a/pmml-model/src/main/xsl/refinements.xsl b/pmml-model/src/main/xsl/refinements.xsl
@@ -33,6 +33,17 @@ Copyright (c) 2022 Villu Ruusmann
 	<!--
 	Replace xs:string with enum
 	-->
+	<xsl:template match="xs:element[@name='OutputField']/xs:complexType/xs:attribute[@name='isMultiValued']">
+		<xs:attribute name="isMultiValued" default="0">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="0"/>
+					<xs:enumeration value="1"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xsl:template>
+
 	<xsl:template match="xs:element[@name='SetPredicate']/xs:complexType/xs:attribute[@name='operator']">
 		<xs:attribute name="operator" fixed="supersetOf">
 			<xs:simpleType>

diff --git a/pmml-model/src/test/java/org/dmg/pmml/PMMLObjectTest.java b/pmml-model/src/test/java/org/dmg/pmml/PMMLObjectTest.java
@@ -11,6 +11,6 @@ public class PMMLObjectTest {
 
 	@Test
 	public void getSchemaVersion(){
-		assertArrayEquals(new int[]{4, 4, 1, 7}, PMMLObject.getSchemaVersion());
+		assertArrayEquals(new int[]{4, 4, 1, 8}, PMMLObject.getSchemaVersion());
 	}
 }