- Reengineered extractors (especially for virtualizing them: must be saved as well).

- there is more to do
- Cleaned up RDFRendered

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

 /*
- * Copyright (C) INRIA Rhône-Alpes, 2004
+ * Copyright (C) INRIA Rhône-Alpes, 2004-2005
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,15 +17,14 @@
  */
 package fr.inrialpes.exmo.align.impl;
 
-import fr.inrialpes.exmo.align.impl.BasicAlignment;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
+import org.semanticweb.owl.align.Alignment;
+import org.semanticweb.owl.align.Parameters;
 
 /**
  * @author jpierson
-
+ * JE: WHAT THE HELL DOES THAT INTERFACE OUT OF THE API !!!
  */
 public interface Extractor {
-	public void threshold (String type, BasicParameters param);
-	public BasicAlignment extractAlignment (String type);
-
+	public void threshold (String type, Parameters param);
+	public Alignment extractAlignment (String type);
 }

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

@@ -34,8 +34,9 @@ import org.semanticweb.owl.model.OWLOntology;
 import org.semanticweb.owl.model.OWLProperty;
 import org.semanticweb.owl.model.OWLIndividual;
 
-import fr.inrialpes.exmo.align.impl.BasicAlignment;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
+import org.semanticweb.owl.align.Alignment;
+import org.semanticweb.owl.align.Parameters;
+
 import fr.inrialpes.exmo.align.impl.Similarity;
 
 /**
@@ -57,40 +58,29 @@ public class SimExtract extends alignmentExtractor implements PreAlignment {
      * 
      */
     private double propmatrix[][]; 
+
     /**	 class similarity matrix
      * 
      */
-		
     private double classmatrix[][]; 
+
     /** Individual similarity matrix
      * 
      */
-    private double individualmatrix[][];
 
+    private double individualmatrix[][];
     private int nbclass1 = 0; // number of classes in onto1
-
     private int nbclass2 = 0; // number of classes in onto2
-
     private int nbprop1 = 0; // number of properties in onto1
-
     private int nbprop2 = 0; // number of properties in onto2
-	
     private int nbindividu1 = 0; // number of individual in onto1
-
     private int nbindividu2 = 0; // number of individual in onto2
-
     private Vector classlist2 = new Vector(10); // onto2 classes
-
     private Vector classlist1 = new Vector(10); // onto1 classes
-
     private Vector proplist2 = new Vector(10); // onto2 properties
-
     private Vector proplist1 = new Vector(10); // onto1 properties
-
     private Vector individulist2 = new Vector(10); // onto2 Individuals
-
     private Vector individulist1 = new Vector(10); // onto1 Individuals
-
     private double threshold;
 
     public SimExtract( String simClassName ) throws ClassNotFoundException, IllegalAccessException, InstantiationException, InvocationTargetException {
@@ -106,7 +96,7 @@ public class SimExtract extends alignmentExtractor implements PreAlignment {
      * Intialize the Alignment extraction process.
      * @param param
      */
-    public void align(BasicParameters param) {
+    public void align( Parameters param) {
 	sim.initialize(param);
 	onto1 = (OWLOntology) param.getParameter("ontology1");
 	onto2 = (OWLOntology) param.getParameter("ontology2");
@@ -203,7 +193,7 @@ public class SimExtract extends alignmentExtractor implements PreAlignment {
      * 
      * @return A basicAligment object
      */
-    public BasicAlignment extractAlignment(String type) {
+    public Alignment extractAlignment(String type) {
 	BasicAlignment Al = new BasicAlignment();
 	int i = 0, j = 0;
 

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

 /*
- * Copyright (C) INRIA Rhône-Alpes, 2004
+ * Copyright (C) INRIA Rhne-Alpes, 2004-2005
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -20,17 +20,20 @@ package fr.inrialpes.exmo.align.impl;
 import fr.inrialpes.exmo.align.impl.BasicAlignment;
 import fr.inrialpes.exmo.align.impl.BasicParameters;
 
+import org.semanticweb.owl.align.Alignment;
+import org.semanticweb.owl.align.Parameters;
+
 /**
  * @author jpierson
- *
+ * JE: THIS CLASS SHOULD BE OBSOLETED!
  */
 
 public class alignmentExtractor implements Extractor {
 
-	public BasicAlignment extractAlignment(String type) {
+	public Alignment extractAlignment(String type) {
 		BasicAlignment Al = new BasicAlignment();
-		return (Al);}
-		public void threshold (String type, BasicParameters param){}
+		return ((Alignment)Al);}
+		public void threshold (String type, Parameters param){}
 		
 
-}
\ No newline at end of file
+}

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

 /*
  * $Id$
  *
- * Copyright (C) INRIA Rhne-Alpes, 2003-2004
+ * Copyright (C) INRIA Rhne-Alpes, 2003-2005
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -46,7 +46,7 @@ import org.semanticweb.owl.align.Relation;
 import fr.inrialpes.exmo.align.impl.rel.*;
 
 /**
- * Renders an alignment as a new ontology merging these.
+ * Renders an alignment in its RDF format
  *
  * @author Jrme Euzenat
  * @version $Id$ 
@@ -76,10 +76,6 @@ public class RDFRendererVisitor implements AlignmentVisitor
 	writer.print( align.getType() );
 	writer.print("</type>\n");
 	try {
-	    //writer.print( ((OWLOntology)align.getOntology1()).getLogicalURI().toString());
-	    //writer.print("</onto1>\n  <onto2>");
-	    //writer.print( ((OWLOntology)align.getOntology2()).getLogicalURI().toString());
-	    //writer.print("</onto2>\n");
 	    if ( align.getFile1() != null )
 		writer.print("  <onto1>"+align.getFile1().toString()+"</onto1>\n");
 	    if ( align.getFile2() != null )