diff --git a/src/fr/inrialpes/exmo/align/ling/JWNLAlignment.java b/src/fr/inrialpes/exmo/align/ling/JWNLAlignment.java index fb02f9a34a4550eea605844a57b162e046d93296..4703f83ad9950c718354e6338d34d0616f38dca0 100644 --- a/src/fr/inrialpes/exmo/align/ling/JWNLAlignment.java +++ b/src/fr/inrialpes/exmo/align/ling/JWNLAlignment.java @@ -42,8 +42,10 @@ import java.net.URI; * @version $Id: JWNLAlignment.java,v 1.0 2004/08/04 */ -public class JWNLAlignment extends DistanceAlignment implements AlignmentProcess -{ +public class JWNLAlignment extends DistanceAlignment implements AlignmentProcess { + + final static String WNVERS = "3.0"; + protected class SynonymMatrixMeasure extends MatrixMeasure { protected JWNLDistances Dist = null; @@ -53,8 +55,11 @@ public class JWNLAlignment extends DistanceAlignment implements AlignmentProcess public void init() throws AlignmentException { Dist.Initialize(); } + public void init( String wndict, String wnvers ) throws AlignmentException { + Dist.Initialize( wndict, wnvers ); + } public void init( String wndict ) throws AlignmentException { - Dist.Initialize( wndict ); + Dist.Initialize( wndict, WNVERS ); } public double measure( OWLClass cl1, OWLClass cl2 ) throws OWLException{ String s1 = cl1.getURI().getFragment(); @@ -96,7 +101,9 @@ public class JWNLAlignment extends DistanceAlignment implements AlignmentProcess public void align( Alignment alignment, Parameters params ) throws AlignmentException { loadInit( alignment ); SynonymMatrixMeasure sim = (SynonymMatrixMeasure)getSimilarity(); - sim.init( (String)params.getParameter("wndict") ); + String wnvers = (String)params.getParameter("wnvers"); + if ( wnvers == null ) wnvers = WNVERS; + sim.init( (String)params.getParameter("wndict"), wnvers ); sim.initialize( (OWLOntology)getOntology1(), (OWLOntology)getOntology2(), alignment ); getSimilarity().compute( params ); if ( params.getParameter("printMatrix") != null ) printDistanceMatrix(params); diff --git a/src/fr/inrialpes/exmo/align/ling/JWNLDistances.java b/src/fr/inrialpes/exmo/align/ling/JWNLDistances.java index 85d2aeb101d0d9c587e5e4da6f5e087480d319d4..b6e76f1d740f393a7c641052d80a8114957177ee 100644 --- a/src/fr/inrialpes/exmo/align/ling/JWNLDistances.java +++ b/src/fr/inrialpes/exmo/align/ling/JWNLDistances.java @@ -91,10 +91,10 @@ public class JWNLDistances { * directory */ public void Initialize() throws AlignmentException { - Initialize( (String)null ); + Initialize( (String)null, (String)null ); } - public void Initialize( String wordnetdir ) throws AlignmentException { + public void Initialize( String wordnetdir, String wordnetversion ) throws AlignmentException { InputStream pptySource = null; if ( wordnetdir == null ) { try { @@ -106,7 +106,7 @@ public class JWNLDistances { String properties = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; properties += "<jwnl_properties language=\"en\">"; properties += " <resource class=\"PrincetonResource\"/>"; - properties += " <version publisher=\"Princeton\" number=\"2.0\" language=\"en\"/>"; + properties += " <version publisher=\"Princeton\" number=\""+wordnetversion+"\" language=\"en\"/>"; properties += " <dictionary class=\"net.didion.jwnl.dictionary.FileBackedDictionary\">"; properties += " <param name=\"dictionary_element_factory\" value=\"net.didion.jwnl.princeton.data.PrincetonWN17FileDictionaryElementFactory\"/>"; properties += " <param name=\"file_manager\" value=\"net.didion.jwnl.dictionary.file_manager.FileManagerImpl\">";