Merged version 1.6.9

jpmml · Dec 26, 2024 · 71a5256 · 71a5256
2 parents e391e49 + 16374aa
commit 71a5256
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 12 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.7** (20 November, 2024).
+The current version is **1.6.8** (8 December, 2024).
 
 ```xml
 <dependency>
 	<groupId>org.jpmml</groupId>
 	<artifactId>pmml-model</artifactId>
-	<version>1.6.7</version>
+	<version>1.6.8</version>
 </dependency>
 ```
 

diff --git a/...pmml/time_series/TimeSeriesAlgorithm.java → ...a/org/dmg/pmml/time_series/Algorithm.java b/...pmml/time_series/TimeSeriesAlgorithm.java → ...a/org/dmg/pmml/time_series/Algorithm.java
@@ -8,5 +8,5 @@
 
 @XmlTransient
 abstract
-public class TimeSeriesAlgorithm extends PMMLObject {
+public class Algorithm extends PMMLObject {
 }
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="6"
+			implementation="7"
 		/>
 
 		<jaxb:globalBindings>
@@ -167,7 +167,7 @@ Copyright (c) 2014 Villu Ruusmann
 
 		<jaxb:bindings node="//xsd:element[@name='ARIMA']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_0)</annox:annotateClass>
-			<inheritance:extends>org.dmg.pmml.time_series.TimeSeriesAlgorithm</inheritance:extends>
+			<inheritance:extends>org.dmg.pmml.time_series.Algorithm</inheritance:extends>
 			<jpmml-model:subpackage
 				name="time_series"
 			/>
@@ -189,6 +189,18 @@ 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='ARIMA']/xsd:complexType/xsd:attribute[@name='transformation']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="Transformation"
+			/>
+		</jaxb:bindings>
+
+		<jaxb:bindings node="//xsd:element[@name='ARIMA']/xsd:complexType/xsd:attribute[@name='predictionMethod']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="PredictionMethod"
+			/>
+		</jaxb:bindings>
+
 		<jaxb:bindings node="//xsd:element[@name='ARIMA']/xsd:complexType/xsd:sequence/xsd:element[@ref='DynamicRegressor']">
 			<annox:annotateProperty>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_4)</annox:annotateProperty>
 		</jaxb:bindings>
@@ -986,11 +998,25 @@ Copyright (c) 2014 Villu Ruusmann
 
 		<jaxb:bindings node="//xsd:element[@name='DynamicRegressor']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_4)</annox:annotateClass>
+			<inheritance:implements>org.dmg.pmml.HasFieldReference&lt;DynamicRegressor&gt;</inheritance:implements>
+			<inheritance:implements>org.dmg.pmml.HasTargetFieldReference&lt;DynamicRegressor&gt;</inheritance:implements>
 			<jpmml-model:subpackage
 				name="time_series"
 			/>
 		</jaxb:bindings>
 
+		<jaxb:bindings node="//xsd:element[@name='DynamicRegressor']/xsd:complexType/xsd:attribute[@name='transformation']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="Transformation"
+			/>
+		</jaxb:bindings>
+
+		<jaxb:bindings node="//xsd:element[@name='DynamicRegressor']/xsd:complexType/xsd:attribute[@name='futureValuesMethod']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="FutureValuesMethod"
+			/>
+		</jaxb:bindings>
+
 		<jaxb:bindings node="//xsd:element[@name='euclidean']/xsd:complexType">
 			<inheritance:extends>org.dmg.pmml.Distance</inheritance:extends>
 		</jaxb:bindings>
@@ -1004,7 +1030,7 @@ Copyright (c) 2014 Villu Ruusmann
 
 		<jaxb:bindings node="//xsd:element[@name='ExponentialSmoothing']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_0)</annox:annotateClass>
-			<inheritance:extends>org.dmg.pmml.time_series.TimeSeriesAlgorithm</inheritance:extends>
+			<inheritance:extends>org.dmg.pmml.time_series.Algorithm</inheritance:extends>
 			<jpmml-model:subpackage
 				name="time_series"
 			/>
@@ -1107,7 +1133,7 @@ Copyright (c) 2014 Villu Ruusmann
 
 		<jaxb:bindings node="//xsd:element[@name='GARCH']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_4)</annox:annotateClass>
-			<inheritance:extends>org.dmg.pmml.time_series.TimeSeriesAlgorithm</inheritance:extends>
+			<inheritance:extends>org.dmg.pmml.time_series.Algorithm</inheritance:extends>
 			<jpmml-model:subpackage
 				name="time_series"
 			/>
@@ -1369,6 +1395,12 @@ Copyright (c) 2014 Villu Ruusmann
 			/>
 		</jaxb:bindings>
 
+		<jaxb:bindings node="//xsd:element[@name='InterceptVector']/xsd:complexType/xsd:attribute[@name='type']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="Type"
+			/>
+		</jaxb:bindings>
+
 		<jaxb:bindings node="//xsd:element[@name='Interval']/xsd:complexType/xsd:attribute[@name='closure']/xsd:simpleType">
 			<jaxb:typesafeEnumClass
 				name="Closure"
@@ -1560,6 +1592,12 @@ Copyright (c) 2014 Villu Ruusmann
 			/>
 		</jaxb:bindings>
 
+		<jaxb:bindings node="//xsd:element[@name='MaximumLikelihoodStat']/xsd:complexType/xsd:attribute[@name='method']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="Method"
+			/>
+		</jaxb:bindings>
+
 		<jaxb:bindings node="//xsd:element[@name='Mean']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_3)</annox:annotateClass>
 			<jpmml-model:subpackage
@@ -2031,6 +2069,12 @@ Copyright (c) 2014 Villu Ruusmann
 			/>
 		</jaxb:bindings>
 
+		<jaxb:bindings node="//xsd:element[@name='OutlierEffect']/xsd:complexType/xsd:attribute[@name='type']/xsd:simpleType">
+			<jaxb:typesafeEnumClass
+				name="Type"
+			/>
+		</jaxb:bindings>
+
 		<jaxb:bindings node="//xsd:element[@name='OutputField']/xsd:complexType">
 			<inheritance:extends>org.dmg.pmml.Field&lt;OutputField&gt;</inheritance:extends>
 			<inheritance:implements>org.dmg.pmml.HasDiscreteDomain&lt;OutputField&gt;</inheritance:implements>
@@ -2810,7 +2854,7 @@ Copyright (c) 2014 Villu Ruusmann
 
 		<jaxb:bindings node="//xsd:element[@name='SeasonalTrendDecomposition']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_0)</annox:annotateClass>
-			<inheritance:extends>org.dmg.pmml.time_series.TimeSeriesAlgorithm</inheritance:extends>
+			<inheritance:extends>org.dmg.pmml.time_series.Algorithm</inheritance:extends>
 			<jpmml-model:subpackage
 				name="time_series"
 			/>
@@ -3080,20 +3124,32 @@ Copyright (c) 2014 Villu Ruusmann
 
 		<jaxb:bindings node="//xsd:element[@name='SpectralAnalysis']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_0)</annox:annotateClass>
-			<inheritance:extends>org.dmg.pmml.time_series.TimeSeriesAlgorithm</inheritance:extends>
+			<inheritance:extends>org.dmg.pmml.time_series.Algorithm</inheritance:extends>
 			<jpmml-model:subpackage
 				name="time_series"
 			/>
 		</jaxb:bindings>
 
 		<jaxb:bindings node="//xsd:element[@name='StateSpaceModel']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_4)</annox:annotateClass>
-			<inheritance:extends>org.dmg.pmml.time_series.TimeSeriesAlgorithm</inheritance:extends>
+			<inheritance:extends>org.dmg.pmml.time_series.Algorithm</inheritance:extends>
 			<jpmml-model:subpackage
 				name="time_series"
 			/>
 		</jaxb:bindings>
 
+		<jaxb:bindings node="//xsd:element[@name='StateSpaceModel']/xsd:complexType/xsd:sequence/xsd:element[@ref='MeasurementMatrix']">
+			<annox:annotateProperty>org.jpmml.model.annotations.NullSafeGetter</annox:annotateProperty>
+		</jaxb:bindings>
+
+		<jaxb:bindings node="//xsd:element[@name='StateSpaceModel']/xsd:complexType/xsd:sequence/xsd:element[@ref='StateVector']">
+			<annox:annotateProperty>org.jpmml.model.annotations.NullSafeGetter</annox:annotateProperty>
+		</jaxb:bindings>
+
+		<jaxb:bindings node="//xsd:element[@name='StateSpaceModel']/xsd:complexType/xsd:sequence/xsd:element[@ref='TransitionMatrix']">
+			<annox:annotateProperty>org.jpmml.model.annotations.NullSafeGetter</annox:annotateProperty>
+		</jaxb:bindings>
+
 		<jaxb:bindings node="//xsd:element[@name='StateVector']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_4)</annox:annotateClass>
 			<jpmml-model:subpackage
@@ -3538,6 +3594,7 @@ Copyright (c) 2014 Villu Ruusmann
 
 		<jaxb:bindings node="//xsd:element[@name='TimeSeries']/xsd:complexType">
 			<annox:annotateClass>org.jpmml.model.annotations.Added(org.dmg.pmml.Version.PMML_4_0)</annox:annotateClass>
+			<inheritance:implements>org.dmg.pmml.HasFieldReference&lt;TimeSeries&gt;</inheritance:implements>
 			<jpmml-model:subpackage
 				name="time_series"
 			/>

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, 6}, PMMLObject.getSchemaVersion());
+		assertArrayEquals(new int[]{4, 4, 1, 7}, PMMLObject.getSchemaVersion());
 	}
 }
diff --git a/pmml-xjc/src/main/java/org/jpmml/xjc/VisitorPlugin.java b/pmml-xjc/src/main/java/org/jpmml/xjc/VisitorPlugin.java
@@ -164,7 +164,7 @@ public int compare(ClassOutline left, ClassOutline right){
 			{"Similarity", "Measure"},
 			{"SparseArray<?>"},
 			{"regression.Term"},
-			{"time_series.TimeSeriesAlgorithm"}
+			{"time_series.Algorithm"}
 		};
 
 		for(String[] abstractClass : abstractClasses){