- Full reorganization of sources with the addition of rel, renderer, method and eval directories

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

@@ -36,6 +36,8 @@ import org.semanticweb.owl.align.AlignmentVisitor;
 import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.Relation;
 
+import fr.inrialpes.exmo.align.impl.rel.*;
+
 /**
  * Represents an OWL ontology alignment. An ontology comprises a number of
  * collections. Each ontology has a number of classes, properties and

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

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.eval;
 
 import org.semanticweb.owl.align.Alignment;
 import org.semanticweb.owl.align.AlignmentException;
@@ -26,6 +26,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.Evaluator;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.BasicEvaluator;
+
 import org.semanticweb.owl.model.OWLOntology;
 import org.semanticweb.owl.model.OWLEntity;
 import org.semanticweb.owl.model.OWLException;

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

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.eval; 
 
 import org.semanticweb.owl.align.Alignment;
 import org.semanticweb.owl.align.AlignmentException;
@@ -26,6 +26,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.Evaluator;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.BasicEvaluator;
+
 import org.semanticweb.owl.model.OWLOntology;
 import org.semanticweb.owl.model.OWLEntity;
 import org.semanticweb.owl.model.OWLException;

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

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 import java.util.Iterator;
 import java.util.Hashtable;
@@ -33,6 +33,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.BasicAlignment;
+
 /**
  * Represents an OWL ontology alignment. An ontology comprises a number of
  * collections. Each ontology has a number of classes, properties and

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

@@ -19,7 +19,7 @@
  */
 
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 import java.util.Iterator;
 import java.util.Vector;
@@ -45,6 +45,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
 /** This class has been built for ISWC experiments with bibliography.
  * It implements a non iterative (one step) OLA algorithms based on
  * the name of classes and properties. It could be made iterative by

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

@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 import java.util.Iterator;
 import java.util.Vector;
@@ -36,6 +36,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
 /**
  * This class aligns ontology with regard to the editing distance between 
  * class names.

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

@@ -19,7 +19,7 @@
  */
 
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 import java.util.Iterator;
 import java.util.Vector;
@@ -44,6 +44,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
 
 /** This class has been built for ISWC experiments with bibliography.
  * It implements a non iterative (one step) OLA algorithms based on

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

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 import java.util.Iterator;
 import java.util.Hashtable;
@@ -36,6 +36,9 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.BasicAlignment;
+
+
 /**
  * Represents an OWL ontology alignment. An ontology comprises a number of
  * collections. Each ontology has a number of classes, properties and

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

@@ -19,7 +19,7 @@
  */
 
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 import java.util.Iterator;
 import java.util.Vector;
@@ -42,6 +42,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
 /** This class has been built for ISWC experiments with bibliography.
  * It implements a non iterative (one step) OLA algorithms based on
  * the name of classes and properties. It could be made iterative by

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

@@ -24,7 +24,7 @@
  * @version $Id$ 
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 
 public class StringDistances {

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

@@ -19,7 +19,7 @@
  */
 
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 import java.util.Iterator;
 import java.util.Vector;
@@ -44,6 +44,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
 /** This class has been built for ISWC experiments with bibliography.
  * It implements a non iterative (one step) OLA algorithms based on
  * the name of classes and properties. It could be made iterative by

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

@@ -19,7 +19,7 @@
  */
 
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.method; 
 
 import java.util.Iterator;
 import java.util.Vector;
@@ -42,6 +42,8 @@ import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Parameters;
 
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
 /** This class has been built for ISWC experiments with bibliography.
  * It implements a non iterative (one step) OLA algorithms based on
  * the name of classes and properties. It could be made iterative by

src/fr/inrialpes/exmo/align/impl/rel/EquivRelation.java

@@ -17,11 +17,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.rel; 
 
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.AlignmentVisitor;
 
+import fr.inrialpes.exmo.align.impl.BasicRelation;
+
 /**
  * Represents an OWL equivalence relation.
  *

src/fr/inrialpes/exmo/align/impl/rel/IncompatRelation.java

@@ -17,11 +17,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.rel; 
 
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.AlignmentVisitor;
 
+import fr.inrialpes.exmo.align.impl.BasicRelation;
+
 /**
  * Represents an OWL equivalence relation.
  *

src/fr/inrialpes/exmo/align/impl/rel/SubsumeRelation.java

@@ -17,11 +17,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.rel; 
 
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.AlignmentVisitor;
 
+import fr.inrialpes.exmo.align.impl.BasicRelation;
+
 /**
  * Represents an OWL subsumption relation.
  *

src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.renderer; 
 
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -40,6 +40,8 @@ import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.Relation;
 
+import fr.inrialpes.exmo.align.impl.rel.*;
+
 /**
  * Renders an alignment as a new ontology merging these.
  *
@@ -147,15 +149,15 @@ public class OWLAxiomsRendererVisitor implements AlignmentVisitor
 	// but this seems to be the case...
 	try {
 	    Method mm = null;
-	    if ( Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation").isInstance(rel) ){
+	    if ( Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation").isInstance(rel) ){
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation")});
-	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation").isInstance(rel) ) {
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation")});
+	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation").isInstance(rel) ) {
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation")});
-	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation").isInstance(rel) ) {
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation")});
+	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation").isInstance(rel) ) {
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation")});
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation")});
 	    }
 	    if ( mm != null ) mm.invoke(this,new Object[] {rel});
 	} catch (Exception e) { throw new AlignmentException("Dispatching problem ", e); };

src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.renderer; 
 
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -40,6 +40,8 @@ import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.Relation;
 
+import fr.inrialpes.exmo.align.impl.rel.*;
+
 /**
  * Renders an alignment as a new ontology merging these.
  *

src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java

 /*
- * $id$
+ * $Id$
  *
  * Copyright (C) INRIA Rhne-Alpes, 2003-2004
  *
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.renderer; 
 
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -41,6 +41,8 @@ import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.Relation;
 
+import fr.inrialpes.exmo.align.impl.rel.*;
+
 /**
  * Renders an alignment as a SWRL rule set interpreting
  *.data of the first ontology into the second one.
@@ -120,15 +122,15 @@ public class SWRLRendererVisitor implements AlignmentVisitor
 	// but this seems to be the case...
 	try {
 	    Method mm = null;
-	    if ( Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation").isInstance(rel) ){
+	    if ( Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation").isInstance(rel) ){
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation")});
-	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation").isInstance(rel) ) {
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation")});
+	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation").isInstance(rel) ) {
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation")});
-	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation").isInstance(rel) ) {
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation")});
+	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation").isInstance(rel) ) {
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation")});
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation")});
 	    }
 	    if ( mm != null ) mm.invoke(this,new Object[] {rel});
 	} catch (Exception e) { throw new AlignmentException("Dispatching problem ", e); };

src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java

 /*
- * $id$
+ * $Id$
  *
  * Copyright (C) INRIA Rhne-Alpes, 2003-2004
  *
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-package fr.inrialpes.exmo.align.impl; 
+package fr.inrialpes.exmo.align.impl.renderer; 
 
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -41,6 +41,8 @@ import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.Relation;
 
+import fr.inrialpes.exmo.align.impl.rel.*;
+
 /**
  * Renders an alignment as a XSLT stylesheet transforming 
  *.data of the first ontology into the second one.
@@ -119,15 +121,15 @@ public class XSLTRendererVisitor implements AlignmentVisitor
 	// but this seems to be the case...
 	try {
 	    Method mm = null;
-	    if ( Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation").isInstance(rel) ){
+	    if ( Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation").isInstance(rel) ){
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation")});
-	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation").isInstance(rel) ) {
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation")});
+	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation").isInstance(rel) ) {
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation")});
-	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation").isInstance(rel) ) {
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation")});
+	    } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation").isInstance(rel) ) {
 		mm = this.getClass().getMethod("visit",
-					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation")});
+					       new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation")});
 	    }
 	    if ( mm != null ) mm.invoke(this,new Object[] {rel});
 	} catch (Exception e) { throw new AlignmentException("Dispatching problem ", e); };