From b619c459cbcc7eff57901d9d9c6d6a0c469d2b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Thu, 9 Jul 2009 16:29:00 +0000
Subject: [PATCH] - put more Java 1.5 iterators
---
.../inrialpes/exmo/align/impl/eval/ExtPREvaluator.java | 5 ++---
.../exmo/align/impl/eval/SymMeanEvaluator.java | 10 +++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
index 6f2c2228..15a81331 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004-2008
+ * Copyright (C) INRIA, 2004-2009
*
* 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
@@ -113,8 +113,7 @@ public class ExtPREvaluator extends BasicEvaluator {
nbexpected = align1.nbCells();
nbfound = align2.nbCells();
- for ( Enumeration e = align1.getElements(); e.hasMoreElements();) {
- Cell c1 = (Cell)e.nextElement();
+ for ( Cell c1 : align1 ){
Set s2 = (Set)align2.getAlignCells1( c1.getObject1() );
if( s2 != null ){
for( Iterator it2 = s2.iterator(); it2.hasNext() && c1 != null; ){
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
index 112655f8..1ab84264 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA Rhône-Alpes, 2004-2005, 2007-2008
+ * Copyright (C) INRIA Rhône-Alpes, 2004-2005, 2007-2009
*
* 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
@@ -77,9 +77,7 @@ public class SymMeanEvaluator extends BasicEvaluator {
LoadedOntology onto1 = (LoadedOntology)((ObjectAlignment)align1).getOntologyObject1();
LoadedOntology onto2 = (LoadedOntology)((ObjectAlignment)align2).getOntologyObject1();
- //for ( Cell c1 : align1.getElements() ){
- for (Enumeration e = align1.getElements() ; e.hasMoreElements() ;) {
- Cell c1 = (Cell)e.nextElement();
+ for ( Cell c1 : align1 ){
if ( onto1.isClass( c1.getObject1() ) ) nbClassCell++;
else if ( onto1.isProperty( c1.getObject1() ) ) nbPropCell++;
else nbIndCell++;
@@ -94,9 +92,7 @@ public class SymMeanEvaluator extends BasicEvaluator {
} else {
indScore = indScore + 1 - Math.abs(c2.getStrength() - c1.getStrength());}}}}}
- //for( Cell c2: align2.getElements() ) {
- for (Enumeration e = align2.getElements() ; e.hasMoreElements() ;) {
- Cell c2 = (Cell)e.nextElement();
+ for( Cell c2: align2 ) {
if ( onto1.isClass( c2.getObject1() ) ) nbClassCell++ ;
else if ( onto1.isProperty( c2.getObject1() ) ) nbPropCell++;
else nbIndCell++;
--
GitLab