- changed the HeavyLoadedOntology interface

src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java

@@ -118,12 +118,12 @@ public class ClassStructAlignment extends DistanceAlignment implements Alignment
 	//  (sigma (att in c[i]) getAllignCell... )
 	//  / nbatts of c[i] + nbatts of c[j]
 	for ( i=0; i<nbclass1; i++ ){
-	    Set<Object> properties1 = honto1.getProperties( classlist1.get(i) );
+	    Set<Object> properties1 = honto1.getProperties( classlist1.get(i), true, true, true );
 	    int nba1 = properties1.size();
 	    if ( nba1 > 0 ) { // if not, keep old values...
 		//Set correspondences = new HashSet();
 		for ( j=0; j<nbclass2; j++ ){
-		    Set<Object> properties2 = honto2.getProperties( classlist2.get(j) );
+		    Set<Object> properties2 = honto2.getProperties( classlist2.get(j), true, true, true );
 		    int nba2 = properties1.size();
 		    double attsum = 0.;
 		    // check that there is a correspondance

src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java

@@ -186,13 +186,13 @@ public class NameAndPropertyAlignment extends DistanceAlignment implements Align
 		//  / nbatts of c[i] + nbatts of c[j]
 
 		for ( i=0; i<nbclass1; i++ ){
-		    Set<Object> properties1 = honto1.getProperties( classlist1.get(i) );
+		    Set<Object> properties1 = honto1.getProperties( classlist1.get(i), true, true, true );
 		    
 		    int nba1 = properties1.size();
 		    if ( nba1 > 0 ) { // if not, keep old values...
 			//Set correspondences = new HashSet();
 			for ( j=0; j<nbclass2; j++ ){
-			    Set<Object> properties2 = honto2.getProperties( classlist2.get(j) );
+			    Set<Object> properties2 = honto2.getProperties( classlist2.get(j), true, true, true );
 			    //int nba2 = properties1.size();
 			    //double attsum = 0.;
 			    // check that there is a correspondance

src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java

@@ -188,12 +188,12 @@ public class StrucSubsDistAlignment extends DistanceAlignment implements Alignme
 	    //  (sigma (att in c[i]) getAllignCell... )
 	    //  / nbatts of c[i] + nbatts of c[j]
 	    for ( i=0; i<nbclass1; i++ ){
-		Set<Object> properties1 = honto1.getProperties( classlist1.get(i) );
+		Set<Object> properties1 = honto1.getProperties( classlist1.get(i), true, true, true );
 		int nba1 = properties1.size();
 		if ( nba1 > 0 ) { // if not, keep old values...
 		    //Set correspondences = new HashSet();
 		    for ( j=0; j<nbclass2; j++ ){
-			Set<Object> properties2 = honto2.getProperties( classlist2.get(j) );
+			Set<Object> properties2 = honto2.getProperties( classlist2.get(j), true, true, true );
 			int nba2 = properties2.size();
 			double attsum = 0.;
 			// check that there is a correspondance

src/fr/inrialpes/exmo/align/onto/HeavyLoadedOntology.java

@@ -34,31 +34,20 @@ import org.semanticweb.owl.align.AlignmentException;
 public interface HeavyLoadedOntology<O> extends LoadedOntology<O> {
 
     /* Class methods */
-    public Set<Object> getSubClasses( Object c );
-    public Set<Object> getAssertedSubClasses( Object c );
-    public Set<Object> getSuperClasses( Object c );
-    public Set<Object> getAssertedSuperClasses( Object c );
-    public Set<Object> getProperties( Object c );
-    public Set<Object> getAssertedProperties( Object c );
-    public Set<Object> getDataProperties( Object c );
-    public Set<Object> getAssertedDataProperties( Object c );
-    public Set<Object> getObjectProperties( Object c );
-    public Set<Object> getAssertedObjectProperties( Object c );
-    public Set<Object> getInstances( Object c );
-    public Set<Object> getAssertedInstances( Object c );
+    public Set<Object> getSubClasses( Object c, boolean local, boolean asserted, boolean named );
+    public Set<Object> getSuperClasses( Object c, boolean local, boolean asserted, boolean named );
+    public Set<Object> getProperties( Object c, boolean local, boolean asserted, boolean named );
+    public Set<Object> getDataProperties( Object c, boolean local, boolean asserted, boolean named );
+    public Set<Object> getObjectProperties( Object c, boolean local, boolean asserted, boolean named );
+    public Set<Object> getInstances( Object c, boolean local, boolean asserted, boolean named  );
 
     /* Property methods */
-    public Set<Object> getSubProperties( Object p );
-    public Set<Object> getAssertedSubProperties( Object p );
-    public Set<Object> getSuperProperties( Object p );
-    public Set<Object> getAssertedSuperProperties( Object p );
-    public Set<Object> getRange( Object p );
-    public Set<Object> getAssertedRange( Object p );
-    public Set<Object> getDomain( Object p );
-    public Set<Object> getAssertedDomain( Object p );
+    public Set<Object> getSubProperties( Object p, boolean local, boolean asserted, boolean named );
+    public Set<Object> getSuperProperties( Object p, boolean local, boolean asserted, boolean named );
+    public Set<Object> getRange( Object p, boolean asserted );
+    public Set<Object> getDomain( Object p, boolean asserted );
 
     /* Individual methods */
-    public Set<Object> getClasses( Object i );
-    public Set<Object> getAssertedClasses( Object i );
+    public Set<Object> getClasses( Object i, boolean local, boolean asserted, boolean named );
 
 }