diff --git a/src/fr/inrialpes/exmo/align/impl/method/StringDistAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/StringDistAlignment.java index c13d7078be0669df15c09609f140def068d79ca2..39f1d6d3b5724fd9e8ba87f63a7d188b61632956 100644 --- a/src/fr/inrialpes/exmo/align/impl/method/StringDistAlignment.java +++ b/src/fr/inrialpes/exmo/align/impl/method/StringDistAlignment.java @@ -52,9 +52,6 @@ public class StringDistAlignment extends DistanceAlignment implements AlignmentP /** Creation **/ public StringDistAlignment() { setSimilarity( new MatrixMeasure() { - public double classMeasure( Object cl1, Object cl2 ) throws Exception { - return measure( cl1, cl2 ); - } public double measure( Object o1, Object o2 ) throws Exception { String s1 = ontology1().getEntityName( o1 ); String s2 = ontology2().getEntityName( o2 ); @@ -62,9 +59,12 @@ public class StringDistAlignment extends DistanceAlignment implements AlignmentP if ( s1 == null || s2 == null ) return 1.; Object[] params = { s1.toLowerCase(), s2.toLowerCase() }; if ( debug > 4 ) - System.err.println( "OB:"+ontology1().getEntityName( o1 )+" ++ "+ontology2().getEntityName( o2 )+" ==> "+dissimilarity.invoke( null, params )); + System.err.println( "OB:"+s1+" ++ "+s2+" ==> "+dissimilarity.invoke( null, params )); return ((Double)dissimilarity.invoke( null, params )).doubleValue(); } + public double classMeasure( Object cl1, Object cl2 ) throws Exception { + return measure( cl1, cl2 ); + } public double propertyMeasure( Object pr1, Object pr2 ) throws Exception{ return measure( pr1, pr2 ); } @@ -77,8 +77,6 @@ public class StringDistAlignment extends DistanceAlignment implements AlignmentP /* Processing */ public void align( Alignment alignment, Properties params ) throws AlignmentException { - loadInit( alignment ); - // Get function from params String f = (String)params.getProperty("stringFunction"); try { @@ -92,6 +90,11 @@ public class StringDistAlignment extends DistanceAlignment implements AlignmentP throw new AlignmentException( "Unknown method for StringDistAlignment : "+(String)params.getProperty("stringFunction"), e ); } + // JE2010: Strange: why does it is not equivalent to call + // super.align( alignment, params ) + // Load initial alignment + loadInit( alignment ); + // Initialize matrix getSimilarity().initialize( ontology1(), ontology2(), alignment );