- set most init interface to return the object; updated credit

html/credits.html

@@ -61,7 +61,7 @@ Raphael Voltz</dt><dd>provided some code snippets for
 <h2>Copyright owners</h2>
 
 <p>
-Copyright (C) 2003-2012 INRIA (most of the code)<br />
+Copyright (C) 2003-2014 INRIA (most of the code)<br />
 Copyright (C) 2004-2005 Université de Montréal (parts of the impl/ and ling/ directories)<br />
 Copyright (C) 2005 CNR Pisa. (parts of BasicAlignment)<br />
 Copyright (C) 2003 The University of Manchester (parts of the util/ directory)<br />

src/fr/inrialpes/exmo/align/impl/BasicAlignment.java

@@ -104,6 +104,7 @@ public class BasicAlignment implements Alignment {
      */
     public void init( Object onto1, Object onto2, Object cache ) throws AlignmentException {
 	init( onto1, onto2 );
+	// Should return it
     }
 
     @SuppressWarnings( "unchecked" )
@@ -115,6 +116,7 @@ public class BasicAlignment implements Alignment {
 	    this.onto1.setOntology( onto1 );
 	    this.onto2.setOntology( onto2 );
 	}
+	// Should return it
     }
 
     public static Properties getParameters() {

src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java

@@ -144,8 +144,10 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator {
 	return eval( params, (Object)null );
     }
     public double eval( Properties params, Object cache ) throws AlignmentException {
-	if ( params.getProperty( "noconfidence" ) != null ) withConfidence = false;
-	if ( params.getProperty( "relations" ) != null ) relsensitive = true;
+	if ( params != null ) {
+	    if ( params.getProperty( "noconfidence" ) != null ) withConfidence = false;
+	    if ( params.getProperty( "relations" ) != null ) relsensitive = true;
+	}
 	LoadedOntology<Object> o1 = (LoadedOntology<Object>)((ObjectAlignment)align1).getOntologyObject1();
 	LoadedOntology<Object> o2 = (LoadedOntology<Object>)((ObjectAlignment)align1).getOntologyObject2();
 	if ( !( o1 instanceof HeavyLoadedOntology ) || !( o2 instanceof HeavyLoadedOntology ) )

src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java

@@ -114,7 +114,7 @@ public class PRecEvaluator extends BasicEvaluator implements Evaluator {
     public double eval( Properties params ) throws AlignmentException {
 	init();
 	nbfound = align2.nbCells();
-	if ( params.getProperty("relations") != null ) relsensitive = true;
+	if ( params != null && params.getProperty("relations") != null ) relsensitive = true;
 
 	for ( Cell c1 : align1 ) {
 	    URI uri1 = c1.getObject2AsURI();

src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java

@@ -124,9 +124,11 @@ public class SemPRecEvaluator extends PRecEvaluator implements Evaluator {
 	nbexpectedentailed = 0;
 	nbfoundentailed = 0;
 	// Set the semantics to be used
-	String sem = params.getProperty( "semantics" );
-	if ( sem != null ) {
-	    semantics = Semantics.valueOf( sem );
+	if (  params != null ) {
+	    String sem = params.getProperty( "semantics" );
+	    if ( sem != null ) {
+		semantics = Semantics.valueOf( sem );
+	    }
 	}
 	return this;
     }

src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java

@@ -117,7 +117,7 @@ public class WeightedPREvaluator extends BasicEvaluator implements Evaluator {
     public double eval( Properties params ) throws AlignmentException {
 	init();
 	//for ( Cell c2 : align2 ) nbfound += c2.getStrength();
-	if ( params.getProperty("relations") != null ) relsensitive = true;
+	if ( params != null && params.getProperty("relations") != null ) relsensitive = true;
 
 	for ( Cell c1 : align1 ) {
 	    URI uri1 = c1.getObject2AsURI();