diff --git a/src/fr/inrialpes/exmo/align/impl/BasicParameters.java b/src/fr/inrialpes/exmo/align/impl/BasicParameters.java index 4023a8ab9680b04022cb07d2fec4eaf5376c146c..1852c89725a2c9c3dca4133dd9a079bc82abaa1f 100644 --- a/src/fr/inrialpes/exmo/align/impl/BasicParameters.java +++ b/src/fr/inrialpes/exmo/align/impl/BasicParameters.java @@ -48,14 +48,14 @@ import org.semanticweb.owl.align.Parameters; * By default and for means of communication, parameter names and values * are Strings (even if their type is Object). * - * [JE:2010] A note about unchecked warnings + * A note about unchecked warnings * java.util.Properties is declared as hashtable<Object,Object> * However all its accessors can only put String as key in the hashtable * But propertyNames returns Enumeration and not Enumeration<String> * Using keySet will not change anything, because it will be Set<Object> * Java 6 introduces Set<String> stringPropertyNames() !! * - * [JE:2010] This class implements Parameters for compatibility purposes. + * This class implements Parameters for compatibility purposes. * Parameters is only "morally" deprecated in the Alignment API, but it is * not used anymore. * diff --git a/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java index ce023eb33c520ebbfc73d212d3c2cda609524312..5fb62cbcafdd73663d0e189454b927b62a08cb64 100644 --- a/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java +++ b/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java @@ -60,8 +60,7 @@ import java.net.URI; * Otherwise, it would basically be: * SUM_c\in correct( P( c ) ) / nbexpected * - * NOTE (JE:2010): This should be adapated for other notions of Precision and Recall - * This is fully possible and will be done with + * NOTE: This should be adapated for other notions of Precision and Recall * */ @@ -87,7 +86,7 @@ public class PRGraphEvaluator extends GraphEvaluator { * Compute precision and recall graphs. */ public Vector<Pair> eval( Properties params ) { // throws AlignmentException - points = new Vector<Pair>(STEP+1); // 2010evaluate the size + points = new Vector<Pair>(STEP+1); if ( params != null && params.getProperty( "oldstyle" ) != null ) { return evalOldStyle(); diff --git a/src/fr/inrialpes/exmo/align/impl/eval/ThresholdGraphEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/ThresholdGraphEvaluator.java index 2cde197978cdc089ce5785a2fbfc4f1e86105953..a5226c3a7919378339258d66b21b264ab8e52706 100644 --- a/src/fr/inrialpes/exmo/align/impl/eval/ThresholdGraphEvaluator.java +++ b/src/fr/inrialpes/exmo/align/impl/eval/ThresholdGraphEvaluator.java @@ -75,7 +75,7 @@ public class ThresholdGraphEvaluator extends GraphEvaluator { * */ public Vector<Pair> eval( Properties params ) { // throws AlignmentException - points = new Vector<Pair>(STEP+1); // 2010evaluate the size + points = new Vector<Pair>(STEP+1); opt = 0.; int nbcorrect = 0; int nbfound = 0; diff --git a/src/fr/inrialpes/exmo/align/parser/RDFParser.java b/src/fr/inrialpes/exmo/align/parser/RDFParser.java index 3c940b76007e64d114749f7ebad89098b4e2efcf..5a0c2ec46c044ad57043f2dee2bb9b72586ad73c 100644 --- a/src/fr/inrialpes/exmo/align/parser/RDFParser.java +++ b/src/fr/inrialpes/exmo/align/parser/RDFParser.java @@ -149,16 +149,12 @@ public class RDFParser { public static void initSyntax() { if ( rDFModel == null ) { rDFModel = ModelFactory.createDefaultModel(); - // The register is always initialised? for ( SyntaxElement el : SyntaxElement.values() ) { - // JE2010 This is incorrect because there can be Resources (classes) - // and/or Property ... They may all be resources... if ( el.isProperty == true ) { el.resource = rDFModel.createProperty( el.id() ); } else { el.resource = rDFModel.createResource( el.id() ); } - //register.put( el.getName(), el ); } } } @@ -441,7 +437,7 @@ public class RDFParser { rdfType.equals( SyntaxElement.PROPERTY_VALUE_COND.resource ) ) { result = parseProperty( node ); } else if ( rdfType.equals( SyntaxElement.RELATION_EXPR.resource ) || - rdfType.equals( SyntaxElement.RELATION_DOMAIN_COND.resource ) || // JE 2010: no chance + rdfType.equals( SyntaxElement.RELATION_DOMAIN_COND.resource ) || // no chance rdfType.equals( SyntaxElement.RELATION_CODOMAIN_COND.resource ) ) { result = parseRelation( node ); } else if ( rdfType.equals( SyntaxElement.INSTANCE_EXPR.resource ) ) { diff --git a/src/fr/inrialpes/exmo/align/parser/XMLParser.java b/src/fr/inrialpes/exmo/align/parser/XMLParser.java index e4b42ed60117c5c6fca6094972deed4472e18d41..529040d5ecb1b6bfe10304292511e74e77eb6a72 100644 --- a/src/fr/inrialpes/exmo/align/parser/XMLParser.java +++ b/src/fr/inrialpes/exmo/align/parser/XMLParser.java @@ -303,7 +303,6 @@ public class XMLParser extends DefaultHandler { extensions = null; cl1 = null; cl2 = null; - // JE 2010: test that it works with SE [SEEMS TO WORK] } else if (pName.equals( SyntaxElement.MAP.name )) {//"map" try { alignment.init( onto1, onto2 );