From 74439bbea76e5cfc89f89eb3b441ac4de1b676c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Thu, 31 Jan 2008 09:08:26 +0000
Subject: [PATCH] - Suppressed commented code about OWLAPI ontologies
---
.../exmo/align/util/ExtGroupEval.java | 9 +----
src/fr/inrialpes/exmo/align/util/GenPlot.java | 14 +------
.../exmo/align/util/GenTriangle.java | 11 +-----
.../inrialpes/exmo/align/util/GroupAlign.java | 39 -------------------
.../inrialpes/exmo/align/util/GroupEval.java | 12 +-----
.../exmo/align/util/GroupOutput.java | 9 +----
6 files changed, 8 insertions(+), 86 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java b/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
index d0b020b8..0f9a31a5 100644
--- a/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2005, 2007 INRIA Rhône-Alpes
+ * Copyright (C) 2003-2005, 2007-2008 INRIA Rhône-Alpes
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -222,12 +222,7 @@ public class ExtGroupEval {
}
// Unload the ontologies.
loaded.clear();
- //try {
- // for ( Enumeration e = loaded.elements() ; e.hasMoreElements(); ){
- // OWLOntology o = (OWLOntology)e.nextElement();
- // o.getOWLConnection().notifyOntologyDeleted( o );
- // }
- //} catch (Exception ex) { System.err.println(ex); };
+
if ( ok == true ) return result;
else return (Vector)null;
}
diff --git a/src/fr/inrialpes/exmo/align/util/GenPlot.java b/src/fr/inrialpes/exmo/align/util/GenPlot.java
index 956fdf98..c8f89455 100644
--- a/src/fr/inrialpes/exmo/align/util/GenPlot.java
+++ b/src/fr/inrialpes/exmo/align/util/GenPlot.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2007 INRIA Rhône-Alpes
+ * Copyright (C) 2003-2008, INRIA Rhône-Alpes
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -26,8 +26,6 @@
*/
package fr.inrialpes.exmo.align.util;
-//import org.semanticweb.owl.model.OWLOntology;
-
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.Parameters;
@@ -244,12 +242,6 @@ public class GenPlot {
}
// Unload the ontologies.
loaded.clear();
- //try {
- // for ( Enumeration e = loaded.elements() ; e.hasMoreElements(); ){
- // OWLOntology o = (OWLOntology)e.nextElement();
- // o.getOWLConnection().notifyOntologyDeleted( o );
- // }
- //} catch (Exception ex) { System.err.println(ex); };
}
public PRGraphEvaluator eval( String alignName1, String alignName2 ) {
@@ -273,10 +265,6 @@ public class GenPlot {
// Unload the ontologies.
loaded.clear();
- //for ( Enumeration e = loaded.elements() ; e.hasMoreElements(); ){
- // OWLOntology o = (OWLOntology)e.nextElement();
- // o.getOWLConnection().notifyOntologyDeleted( o );
- //}
} catch (Exception ex) {
if ( debug > 1 ) {
ex.printStackTrace();
diff --git a/src/fr/inrialpes/exmo/align/util/GenTriangle.java b/src/fr/inrialpes/exmo/align/util/GenTriangle.java
index c6ad91cd..c7c019dc 100644
--- a/src/fr/inrialpes/exmo/align/util/GenTriangle.java
+++ b/src/fr/inrialpes/exmo/align/util/GenTriangle.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2007, INRIA Rhône-Alpes
+ * Copyright (C) 2003-2008, INRIA Rhône-Alpes
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -26,8 +26,6 @@
*/
package fr.inrialpes.exmo.align.util;
-//import org.semanticweb.owl.model.OWLOntology;
-
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.Parameters;
import org.semanticweb.owl.align.Evaluator;
@@ -243,12 +241,7 @@ public class GenTriangle {
}
// Unload the ontologies.
loaded.clear();
- //try {
- // for ( Enumeration e = loaded.elements() ; e.hasMoreElements(); ){
- // OWLOntology o = (OWLOntology)e.nextElement();
- // o.getOWLConnection().notifyOntologyDeleted( o );
- // }
- //} catch (Exception ex) { System.err.println(ex); };
+
if ( ok == true ) return result;
else return (Vector)null;
}
diff --git a/src/fr/inrialpes/exmo/align/util/GroupAlign.java b/src/fr/inrialpes/exmo/align/util/GroupAlign.java
index 3145617e..372c326d 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupAlign.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupAlign.java
@@ -41,15 +41,6 @@ import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.OntologyCache;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
-/** 3.0
-import org.semanticweb.owl.util.OWLManager;
-import org.semanticweb.owl.model.OWLOntology;
-import org.semanticweb.owl.model.OWLException;
-import org.semanticweb.owl.io.owl_rdf.OWLRDFParser;
-import org.semanticweb.owl.io.owl_rdf.OWLRDFErrorHandler;
-import org.semanticweb.owl.io.ParserException;
-*/
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintWriter;
@@ -104,9 +95,7 @@ public class GroupAlign {
String target = "onto.rdf";
URI uri1 = null;
String initName = null;
- //Hashtable loadedOntologies = null;
OntologyCache loadedOntologies = null;
- //OWLRDFErrorHandler handler = null;
int debug = 0;
String alignmentClassName = "fr.inrialpes.exmo.align.impl.method.StringDistAlignment";
String rendererClass = "fr.inrialpes.exmo.align.impl.renderer.RDFRendererVisitor";
@@ -120,7 +109,6 @@ public class GroupAlign {
public void run(String[] args) throws Exception {
LongOpt[] longopts = new LongOpt[13];
- //loadedOntologies = new Hashtable();
loadedOntologies = new OntologyCache();
params = new BasicParameters();
@@ -251,15 +239,7 @@ public class GroupAlign {
if ( debug > 0 ) System.err.println("Directory: "+subdir[i]);
align( subdir[i] );
// Unload the ontologies
- // (this is a pitty but helps avoiding memory full)
loadedOntologies.clear();
- /*
- try {
- for ( Enumeration e = loadedOntologies.elements() ; e.hasMoreElements(); ){
- OWLOntology o = (OWLOntology)e.nextElement();
- o.getOWLConnection().notifyOntologyDeleted( o );
- }
- } catch (Exception ex) { System.err.println(ex); };*/
} catch (Exception e) {
if ( debug > 1 ) e.printStackTrace(); }
}
@@ -271,8 +251,6 @@ public class GroupAlign {
// toURI(). is not very good
AlignmentProcess result = null;
Alignment init = null;
- //OWLOntology onto1 = null;
- //OWLOntology onto2 = null;
if ( urlprefix != null ){
prefix = urlprefix+"/"+dir.getName()+"/";
@@ -308,18 +286,13 @@ public class GroupAlign {
}
// Create alignment object
- //Object[] mparams = { (Object)onto1, (Object)onto2 };
Object[] mparams = {};
- //Class oClass = Class.forName("org.semanticweb.owl.model.OWLOntology");
- //Class[] cparams = { oClass, oClass };
Class[] cparams = {};
Class alignmentClass = Class.forName(alignmentClassName);
java.lang.reflect.Constructor alignmentConstructor =
alignmentClass.getConstructor(cparams);
result = (AlignmentProcess)alignmentConstructor.newInstance(mparams);
result.init( uri1, uri2 );
- //result.setFile1(uri11);
- //result.setFile2(uri2);
} catch (Exception ex) {
System.err.println("Cannot create alignment "+ alignmentClassName+ "\n"+ ex.getMessage());
throw ex;
@@ -364,18 +337,6 @@ public class GroupAlign {
writer.close();
}
- /*
- public OWLOntology loadOntology(URI uri)
- throws ParserException, OWLException {
- OWLOntology parsedOnt = null;
- OWLRDFParser parser = new OWLRDFParser();
- parser.setOWLRDFErrorHandler(handler);
- parser.setConnection(OWLManager.getOWLConnection());
- parsedOnt = parser.parseOntology(uri);
- loadedOntologies.put(uri.toString(), parsedOnt);
- return parsedOnt;
- }*/
-
public void usage() {
System.err.println("usage: GroupAlign [options]");
System.err.println("options are:");
diff --git a/src/fr/inrialpes/exmo/align/util/GroupEval.java b/src/fr/inrialpes/exmo/align/util/GroupEval.java
index 54657f3d..c36b6a59 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupEval.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2007, INRIA Rhône-Alpes
+ * Copyright (C) 2003-2008, INRIA Rhône-Alpes
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -26,8 +26,6 @@
*/
package fr.inrialpes.exmo.align.util;
-//import org.semanticweb.owl.model.OWLOntology;
-
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.Parameters;
import org.semanticweb.owl.align.Evaluator;
@@ -244,12 +242,7 @@ public class GroupEval {
}
// Unload the ontologies.
loaded.clear();
- //try {
- // for ( Enumeration e = loaded.elements() ; e.hasMoreElements(); ){
- // OWLOntology o = (OWLOntology)e.nextElement();
- // o.getOWLConnection().notifyOntologyDeleted( o );
- // }
- //} catch (Exception ex) { System.err.println(ex); };
+
if ( ok == true ) return result;
else return (Vector)null;
}
@@ -579,7 +572,6 @@ which the program does...
// http://acm.sus.mcgill.ca/20020323/work/acm-19/B.j
// What a pity that it is not in Java... (wait for 1.5)
public void printFormat(PrintStream w, double f){
- // JE: Must add the test is the value is Not a number, print NaN.
if ( f != f ) {
w.print("NaN");
} else {
diff --git a/src/fr/inrialpes/exmo/align/util/GroupOutput.java b/src/fr/inrialpes/exmo/align/util/GroupOutput.java
index 009a9b50..b7dd3085 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupOutput.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupOutput.java
@@ -27,8 +27,6 @@
*/
package fr.inrialpes.exmo.align.util;
-//import org.semanticweb.owl.model.OWLOntology;
-
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
@@ -254,12 +252,7 @@ public class GroupOutput {
}
// Unload the ontologies.
loaded.clear();
- //try {
- // for ( Enumeration e = loaded.elements() ; e.hasMoreElements(); ){
- // OWLOntology o = (OWLOntology)e.nextElement();
- // o.getOWLConnection().notifyOntologyDeleted( o );
- // }
- //} catch (Exception ex) { System.err.println(ex); };
+
return (double)result/(double)tests.length;
}
--
GitLab