Close evaluator after every task

tachyonicClock · tachyonicClock · commit b36dacdbac25 · 2023-09-21T15:19:12.000+12:00
diff --git a/moa/src/main/java/moa/tasks/EvaluateConceptDrift.java b/moa/src/main/java/moa/tasks/EvaluateConceptDrift.java
@@ -231,9 +231,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (immediateResultStream != null) {
             immediateResultStream.close();
         }
-       /* if (outputPredictionResultStream != null) {
-            outputPredictionResultStream.close();
-        }*/
+        try {
+            evaluator.close();
+        } catch (Exception ex) {
+            throw new RuntimeException("Exception closing evaluator", ex);
+        }
         return learningCurve;
     }
 }
diff --git a/moa/src/main/java/moa/tasks/EvaluateModelMultiLabel.java b/moa/src/main/java/moa/tasks/EvaluateModelMultiLabel.java
@@ -156,6 +156,11 @@ public Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (outputPredictionResultStream != null) {
             outputPredictionResultStream.close();
         }
+        try {
+            evaluator.close();
+        } catch (Exception ex) {
+            throw new RuntimeException("Exception closing evaluator", ex);
+        }
         return new LearningEvaluation(evaluator, model);
     }
 }
diff --git a/moa/src/main/java/moa/tasks/EvaluateModelMultiTarget.java b/moa/src/main/java/moa/tasks/EvaluateModelMultiTarget.java
@@ -152,6 +152,11 @@ public Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (outputPredictionResultStream != null) {
             outputPredictionResultStream.close();
         }
+        try {
+            evaluator.close();
+        } catch (Exception ex) {
+            throw new RuntimeException("Exception closing evaluator", ex);
+        }
         return new LearningEvaluation(evaluator, model);
     }
 }
diff --git a/moa/src/main/java/moa/tasks/EvaluateModelRegression.java b/moa/src/main/java/moa/tasks/EvaluateModelRegression.java
@@ -152,6 +152,11 @@ public Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (outputPredictionResultStream != null) {
             outputPredictionResultStream.close();
         }
+        try {
+            evaluator.close();
+        } catch (Exception ex) {
+            throw new RuntimeException("Exception closing evaluator", ex);
+        }
         return new LearningEvaluation(evaluator, model);
     }
 }
diff --git a/moa/src/main/java/moa/tasks/EvaluatePrequentialMultiLabel.java b/moa/src/main/java/moa/tasks/EvaluatePrequentialMultiLabel.java
@@ -289,6 +289,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (outputPredictionResultStream != null) {
             outputPredictionResultStream.close();
         }
+        try {
+            evaluator.close();
+        } catch (Exception ex) {
+            throw new RuntimeException("Exception closing evaluator", ex);
+        }
         return learningCurve;
     }
 }
diff --git a/moa/src/main/java/moa/tasks/EvaluatePrequentialMultiTarget.java b/moa/src/main/java/moa/tasks/EvaluatePrequentialMultiTarget.java
@@ -277,6 +277,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (outputPredictionResultStream != null) {
             outputPredictionResultStream.close();
         }
+        try {
+            evaluator.close();
+        } catch (Exception ex) {
+            throw new RuntimeException("Exception closing evaluator", ex);
+        }
         return learningCurve;
     }
 }
diff --git a/moa/src/main/java/moa/tasks/EvaluatePrequentialMultiTargetSemiSuper.java b/moa/src/main/java/moa/tasks/EvaluatePrequentialMultiTargetSemiSuper.java
@@ -405,7 +405,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (outputPredictionResultStream != null) {
             outputPredictionResultStream.close();
         }
-
+        try {
+            evaluator.close();
+        } catch (Exception ex) {
+            throw new RuntimeException("Exception closing evaluator", ex);
+        }
         return learningCurve;
     }
 }
diff --git a/moa/src/main/java/moa/tasks/EvaluatePrequentialRegression.java b/moa/src/main/java/moa/tasks/EvaluatePrequentialRegression.java
@@ -272,6 +272,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (outputPredictionResultStream != null) {
             outputPredictionResultStream.close();
         }
+        try {
+            evaluator.close();
+        } catch (Exception ex) {
+            throw new RuntimeException("Exception closing evaluator", ex);
+        }
         return learningCurve;
     }
 }
diff --git a/moa/src/main/java/moa/tasks/meta/ALPrequentialEvaluationTask.java b/moa/src/main/java/moa/tasks/meta/ALPrequentialEvaluationTask.java
@@ -270,7 +270,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {
         if (immediateResultStream != null) {
             immediateResultStream.close();
         }
-		
+		try {
+			evaluator.close();
+		} catch (Exception ex) {
+			throw new RuntimeException("Exception closing evaluator", ex);
+		}
 		return new PreviewCollectionLearningCurveWrapper(learningCurve, this.getClass());
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -231,9 +231,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {`
`231`	`231`	`if (immediateResultStream != null) {`
`232`	`232`	`immediateResultStream.close();`
`233`	`233`	`}`
`234`		`- /* if (outputPredictionResultStream != null) {`
`235`		`- outputPredictionResultStream.close();`
`236`		`- }*/`
	`234`	`+ try {`
	`235`	`+ evaluator.close();`
	`236`	`+ } catch (Exception ex) {`
	`237`	`+ throw new RuntimeException("Exception closing evaluator", ex);`
	`238`	`+ }`
`237`	`239`	`return learningCurve;`
`238`	`240`	`}`
`239`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,11 @@ public Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {`
`156`	`156`	`if (outputPredictionResultStream != null) {`
`157`	`157`	`outputPredictionResultStream.close();`
`158`	`158`	`}`
	`159`	`+ try {`
	`160`	`+ evaluator.close();`
	`161`	`+ } catch (Exception ex) {`
	`162`	`+ throw new RuntimeException("Exception closing evaluator", ex);`
	`163`	`+ }`
`159`	`164`	`return new LearningEvaluation(evaluator, model);`
`160`	`165`	`}`
`161`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,11 @@ public Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {`
`152`	`152`	`if (outputPredictionResultStream != null) {`
`153`	`153`	`outputPredictionResultStream.close();`
`154`	`154`	`}`
	`155`	`+ try {`
	`156`	`+ evaluator.close();`
	`157`	`+ } catch (Exception ex) {`
	`158`	`+ throw new RuntimeException("Exception closing evaluator", ex);`
	`159`	`+ }`
`155`	`160`	`return new LearningEvaluation(evaluator, model);`
`156`	`161`	`}`
`157`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {`
`289`	`289`	`if (outputPredictionResultStream != null) {`
`290`	`290`	`outputPredictionResultStream.close();`
`291`	`291`	`}`
	`292`	`+ try {`
	`293`	`+ evaluator.close();`
	`294`	`+ } catch (Exception ex) {`
	`295`	`+ throw new RuntimeException("Exception closing evaluator", ex);`
	`296`	`+ }`
`292`	`297`	`return learningCurve;`
`293`	`298`	`}`
`294`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {`
`277`	`277`	`if (outputPredictionResultStream != null) {`
`278`	`278`	`outputPredictionResultStream.close();`
`279`	`279`	`}`
	`280`	`+ try {`
	`281`	`+ evaluator.close();`
	`282`	`+ } catch (Exception ex) {`
	`283`	`+ throw new RuntimeException("Exception closing evaluator", ex);`
	`284`	`+ }`
`280`	`285`	`return learningCurve;`
`281`	`286`	`}`
`282`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {`
`405`	`405`	`if (outputPredictionResultStream != null) {`
`406`	`406`	`outputPredictionResultStream.close();`
`407`	`407`	`}`
`408`		`-`
	`408`	`+ try {`
	`409`	`+ evaluator.close();`
	`410`	`+ } catch (Exception ex) {`
	`411`	`+ throw new RuntimeException("Exception closing evaluator", ex);`
	`412`	`+ }`
`409`	`413`	`return learningCurve;`
`410`	`414`	`}`
`411`	`415`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {`
`272`	`272`	`if (outputPredictionResultStream != null) {`
`273`	`273`	`outputPredictionResultStream.close();`
`274`	`274`	`}`
	`275`	`+ try {`
	`276`	`+ evaluator.close();`
	`277`	`+ } catch (Exception ex) {`
	`278`	`+ throw new RuntimeException("Exception closing evaluator", ex);`
	`279`	`+ }`
`275`	`280`	`return learningCurve;`
`276`	`281`	`}`
`277`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,11 @@ protected Object doMainTask(TaskMonitor monitor, ObjectRepository repository) {`
`270`	`270`	`if (immediateResultStream != null) {`
`271`	`271`	`immediateResultStream.close();`
`272`	`272`	`}`
`273`		`-`
	`273`	`+ try {`
	`274`	`+ evaluator.close();`
	`275`	`+ } catch (Exception ex) {`
	`276`	`+ throw new RuntimeException("Exception closing evaluator", ex);`
	`277`	`+ }`
`274`	`278`	`return new PreviewCollectionLearningCurveWrapper(learningCurve, this.getClass());`
`275`	`279`	`}`
`276`	`280`