From be24cad0085b1aa8e65ed55d055307e0049fca9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Tue, 4 Feb 2014 10:01:17 +0000
Subject: [PATCH] - Make evaluator init() return themselves
---
src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java | 5 +++--
src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java | 5 +++--
.../inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
index 4839ba87..76781e3a 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004-2011, 2013
+ * Copyright (C) INRIA, 2004-2011, 2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -84,7 +84,7 @@ public class PRecEvaluator extends BasicEvaluator implements Evaluator {
super(((BasicAlignment)align1).toURIAlignment(), ((BasicAlignment)align2).toURIAlignment());
}
- public void init(){
+ public PRecEvaluator init() {
precision = 1.;
recall = 1.;
overall = 0.;
@@ -94,6 +94,7 @@ public class PRecEvaluator extends BasicEvaluator implements Evaluator {
nbfound = 0;
nbcorrect = 0;
result = 1.;
+ return this;
}
/**
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
index 7faad399..eb583552 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2009-2013
+ * Copyright (C) INRIA, 2009-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -119,7 +119,7 @@ public class SemPRecEvaluator extends PRecEvaluator implements Evaluator {
convertToObjectAlignments( al1, al2 );
}
- public void init( Properties params ){
+ public SemPRecEvaluator init( Properties params ){
super.init();
nbexpectedentailed = 0;
nbfoundentailed = 0;
@@ -128,6 +128,7 @@ public class SemPRecEvaluator extends PRecEvaluator implements Evaluator {
if ( sem != null ) {
semantics = Semantics.valueOf( sem );
}
+ return this;
}
/**
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java
index ce4b1e50..9cb0416c 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id: WeightedPRecEvaluator.java 1494 2010-07-23 14:43:36Z euzenat $
*
- * Copyright (C) INRIA, 2004-2013
+ * Copyright (C) INRIA, 2004-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -86,7 +86,7 @@ public class WeightedPREvaluator extends BasicEvaluator implements Evaluator {
super(((BasicAlignment)align1).toURIAlignment(), ((BasicAlignment)align2).toURIAlignment());
}
- public void init(){
+ public WeightedPREvaluator init(){
precision = 1.;
recall = 0.;
overall = 0.;
@@ -97,6 +97,7 @@ public class WeightedPREvaluator extends BasicEvaluator implements Evaluator {
nbcorrect1 = 0.;
nbcorrect2 = 0.;
result = 1.;
+ return this;
}
/**
--
GitLab