Fixed the serializability of GeneralRegressionModelEvaluator instances

vruusmann · vruusmann · commit f1fc85c6ee4a · 2020-09-21T19:17:28.000+03:00
diff --git a/pmml-evaluator/src/main/java/org/jpmml/evaluator/general_regression/GeneralRegressionModelEvaluator.java b/pmml-evaluator/src/main/java/org/jpmml/evaluator/general_regression/GeneralRegressionModelEvaluator.java
@@ -18,6 +18,7 @@
  */
 package org.jpmml.evaluator.general_regression;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -1021,7 +1022,7 @@ private <K, C extends ParameterCell> ListMultimap<K, C> groupCells(List<C> cells
 	}
 
 	static
-	private class Row {
+	private class Row implements Serializable {
 
 		private List<FactorHandler> factorHandlers = new ArrayList<>();
 
@@ -1110,11 +1111,15 @@ public List<CovariateHandler> getCovariateHandlers(){
 		}
 
 		abstract
-		private class PredictorHandler {
+		static
+		private class PredictorHandler implements Serializable {
 
 			private PPCell ppCell = null;
 
 
+			private PredictorHandler(){
+			}
+
 			private PredictorHandler(PPCell ppCell){
 				setPPCell(ppCell);
 
@@ -1142,11 +1147,15 @@ private void setPPCell(PPCell ppCell){
 			}
 		}
 
+		static
 		private class FactorHandler extends PredictorHandler {
 
 			private Object category = null;
 
 
+			private FactorHandler(){
+			}
+
 			private FactorHandler(PPCell ppCell){
 				super(ppCell);
 
@@ -1176,6 +1185,7 @@ private void setCategory(Object category){
 			}
 		}
 
+		static
 		private class ContrastMatrixHandler extends FactorHandler {
 
 			private Matrix matrix = null;
@@ -1185,6 +1195,9 @@ private class ContrastMatrixHandler extends FactorHandler {
 			private List<FieldValue> parsedCategories = null;
 
 
+			private ContrastMatrixHandler(){
+			}
+
 			private ContrastMatrixHandler(PPCell ppCell, Matrix matrix, List<Object> categories){
 				super(ppCell);
 
@@ -1250,11 +1263,15 @@ private void setCategories(List<Object> categories){
 			}
 		}
 
+		static
 		private class CovariateHandler extends PredictorHandler {
 
 			private Number exponent = null;
 
 
+			private CovariateHandler(){
+			}
+
 			private CovariateHandler(PPCell ppCell){
 				super(ppCell);
 
