From b36dacdbac25f0effe4660e25b5a22bdcbf0aa4e Mon Sep 17 00:00:00 2001 From: Anton Lee Date: Thu, 21 Sep 2023 15:19:12 +1200 Subject: [PATCH] Close evaluator after every task --- moa/src/main/java/moa/tasks/EvaluateConceptDrift.java | 8 +++++--- moa/src/main/java/moa/tasks/EvaluateModelMultiLabel.java | 5 +++++ moa/src/main/java/moa/tasks/EvaluateModelMultiTarget.java | 5 +++++ moa/src/main/java/moa/tasks/EvaluateModelRegression.java | 5 +++++ .../java/moa/tasks/EvaluatePrequentialMultiLabel.java | 5 +++++ .../java/moa/tasks/EvaluatePrequentialMultiTarget.java | 5 +++++ .../tasks/EvaluatePrequentialMultiTargetSemiSuper.java | 6 +++++- .../java/moa/tasks/EvaluatePrequentialRegression.java | 5 +++++ .../java/moa/tasks/meta/ALPrequentialEvaluationTask.java | 6 +++++- 9 files changed, 45 insertions(+), 5 deletions(-) diff --git a/moa/src/main/java/moa/tasks/EvaluateConceptDrift.java b/moa/src/main/java/moa/tasks/EvaluateConceptDrift.java index 322eb0b24..1086367cd 100644 --- 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; } } \ No newline at end of file diff --git a/moa/src/main/java/moa/tasks/EvaluateModelMultiLabel.java b/moa/src/main/java/moa/tasks/EvaluateModelMultiLabel.java index b1e118db7..010e9d25a 100644 --- 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 index df5d18631..ded4f6637 100644 --- 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 index 34b57232c..69dee8c18 100644 --- 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 index 8a5a198a9..21427a7e0 100644 --- 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 index 28f782665..083bc879c 100644 --- 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 index 52b24b4dd..1f973bd60 100644 --- 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 index 26a3c844c..25fb1b5fd 100644 --- 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 index a2813a1b6..fe8a5393f 100644 --- 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()); }