diff --git a/test/src/AlgTest.java b/test/src/AlgTest.java
index 5f00a637ff5b022686e049f2d5704f11a3a2cbdb..14bc088893c2ce536bf122288cc90ebc3c85ff97 100644
--- a/test/src/AlgTest.java
+++ b/test/src/AlgTest.java
@@ -100,17 +100,17 @@ public class AlgTest {
alignment1.init( new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl"), new URI("file:examples/rdf/edu.mit.visus.bibtex.owl"));
alignment1.align( (Alignment)null, new Properties() );
align1 = alignment1;
- assertEquals( align1.nbCells(), 37 );
+ assertEquals( align1.nbCells(), 35/*37*/ );
assertEquals( align2.nbCells(), 10 );
Alignment al = align1.inverse();
assertEquals( al.getOntology1(), align1.getOntology2() );
- assertEquals( al.nbCells(), 37 );
+ assertEquals( al.nbCells(), 35/*37*/ );
al = (Alignment)((BasicAlignment)align1).clone();
assertEquals( al.getOntology1(), align1.getOntology1() );
- assertEquals( al.nbCells(), 37 );
+ assertEquals( al.nbCells(), 35/*37*/ );
al = align1.diff( align2 );
assertEquals( al.getOntology1(), align1.getOntology1() );
- assertEquals( al.nbCells(), 36 ); // short diff
+ assertEquals( al.nbCells(), 34/*36*/ ); // short diff
al = align2.diff( align1 );
assertEquals( al.getOntology1(), align1.getOntology1() );
assertEquals( al.nbCells(), 9 );
@@ -119,7 +119,7 @@ public class AlgTest {
assertEquals( al.nbCells(), 1 );
al = align1.join( align2 );
assertEquals( al.getOntology1(), align1.getOntology1() );
- assertEquals( al.nbCells(), 46 );
+ assertEquals( al.nbCells(), 44/*46*/ );
}
@Test(expectedExceptions = AlignmentException.class, groups = { "full", "impl", "raw" }, dependsOnMethods = {"fullTest"})
@@ -141,6 +141,6 @@ public class AlgTest {
new NameAndPropertyAlignment().init( new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl"), new URI("file:examples/rdf/edu.mit.visus.bibtex.owl"));
assertEquals( al.getOntology1(), alignment1.getOntology1() );
assertEquals( al.getOntology2(), align2.getOntology2() );
- assertEquals( al.nbCells(), 4 );
+ assertEquals( al.nbCells(), 5/*4*/ );
}
}
diff --git a/test/src/EDOALTest.java b/test/src/EDOALTest.java
index 382afc674746c734410d9a62ed51828965d1c41f..7a05a2abee16d8fbeaa7929656a7428826049e6e 100644
--- a/test/src/EDOALTest.java
+++ b/test/src/EDOALTest.java
@@ -130,7 +130,7 @@ diff wine2.xml wine3.xml
assertEquals( "".equals( wine2 ), false );
// Provisory results, EDOAL is not well pretty printed
// AND THE RESULT GIVES DIFFERENT VALUES !!!
- assertEquals( wine2.length(), 4343 );
+ assertEquals( wine2.length(), 4709/*4343*/ );
// This does not work because (at least) the order of correspondences is never the same...
//assertEquals( wine2, stream.toString() );
}
diff --git a/test/src/MatcherTest.java b/test/src/MatcherTest.java
index a1de2a13268787ccc4fc67a023e93319dc4debc0..4eefd4066df6463077455785194144bec7295db0 100644
--- a/test/src/MatcherTest.java
+++ b/test/src/MatcherTest.java
@@ -80,7 +80,7 @@ $ java -jar lib/Procalign.jar file://$CWD/examples/rdf/edu.umbc.ebiquity.publica
assertEquals( alignment.nbCells(), 0 );
alignment.init( new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl"), new URI("file:examples/rdf/edu.mit.visus.bibtex.owl"));
alignment.align( (Alignment)null, params );
- assertEquals( alignment.nbCells(), 44 );
+ assertEquals( alignment.nbCells(), 42/*44*/ );
FileOutputStream stream = new FileOutputStream("test/output/bibref.rdf");
PrintWriter writer = new PrintWriter (
new BufferedWriter(
diff --git a/test/src/OntoTest.java b/test/src/OntoTest.java
index ec50f84d320ae10b88f9256fc5ddf2282324eb59..95a8bf34e77beb6a5c3085f6ade7cf01e051e684 100644
--- a/test/src/OntoTest.java
+++ b/test/src/OntoTest.java
@@ -179,8 +179,8 @@ public class OntoTest {
assertTrue( onto.getCapabilities( OntologyFactory.LOCAL, OntologyFactory.ASSERTED, OntologyFactory.NAMED ) );
// Here insert what is supposed to be done with Jena...
//for (Object o : onto.getEntities()) System.out.println(o);
- assertEquals( onto.nbEntities(), 44 ); //44 is with owl:Thing
- assertEquals( onto.nbClasses(), 15 );
+ assertEquals( onto.nbEntities(), 42/*44*/ ); //44 is with owl:Thing
+ assertEquals( onto.nbClasses(), 13/*15*/ );
assertEquals( onto.nbProperties(), 29 );
assertEquals( onto.nbDataProperties(), 25 );
assertEquals( onto.nbObjectProperties(), 4 );
diff --git a/test/src/READMETest.java b/test/src/READMETest.java
index 41a2bdb19313559686edef9b2981b8494b3510b8..53d2dbec4876c65b7007086a55f5a6e1da9e2a7f 100644
--- a/test/src/READMETest.java
+++ b/test/src/READMETest.java
@@ -160,7 +160,7 @@ $ java -jar lib/Procalign.jar file://$CWD/examples/rdf/edu.umbc.ebiquity.publica
assertEquals( alignment.nbCells(), 0 );
alignment.init( new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl"), new URI("file:examples/rdf/edu.mit.visus.bibtex.owl"));
alignment.align( (Alignment)null, params );
- assertEquals( alignment.nbCells(), 44 );
+ assertEquals( alignment.nbCells(), 42/*44*/ );
FileOutputStream stream = new FileOutputStream("test/output/bibref.rdf");
PrintWriter writer = new PrintWriter (
new BufferedWriter(
@@ -191,7 +191,7 @@ $ java -jar lib/Procalign.jar file://$CWD/examples/rdf/edu.umbc.ebiquity.publica
assertEquals( al.nbCells(), 32 );
al = (Alignment)al2.clone();
al.cut( "best", 0.55 );
- assertEquals( al.nbCells(), 44 );
+ assertEquals( al.nbCells(), 42/*44*/ );
al = (Alignment)al2.clone();
al.cut( "span", 0.55 );
assertEquals( al.nbCells(), 33 );
@@ -203,15 +203,15 @@ $ java -jar lib/Procalign.jar file://$CWD/examples/rdf/edu.umbc.ebiquity.publica
assertEquals( al.nbCells(), 32 );
al = (Alignment)al2.clone();
al.cut( "perc", 0.55 );
- assertEquals( al.nbCells(), 24 );
+ assertEquals( al.nbCells(), 23/*24*/ );
al = (Alignment)al2.clone();
al.cut( "hardgap", 0.5 );
- assertEquals( al.nbCells(), 44 );
+ assertEquals( al.nbCells(), 42/*44*/ );
al.cut( "hardgap", 0.05 );
assertEquals( al.nbCells(), 10 );
al = (Alignment)al2.clone();
al.cut( "propgap", 0.55 );
- assertEquals( al.nbCells(), 44 );
+ assertEquals( al.nbCells(), 42/*44*/ );
al.cut( "propgap", 0.1 );
assertEquals( al.nbCells(), 10 );
@@ -248,11 +248,11 @@ $ java -cp lib/procalign.jar fr.inrialpes.exmo.align.util.EvalAlign -i fr.inrial
eval.write( writer );
writer.flush();
writer.close();
- assertEquals( eval.getPrecision(), 0.7272727272727273 );
+ assertEquals( eval.getPrecision(), 0.7619047619047619);//7272727272727273 );
assertEquals( eval.getRecall(), 1.0 );
- assertEquals( eval.getFallout(), 0.2727272727272727 );
- assertEquals( eval.getFmeasure(), 0.8421052631578948 );
- assertEquals( eval.getOverall(), 0.625 );
+ assertEquals( eval.getFallout(), 0.23809523809523808);//2727272727272727 );
+ assertEquals( eval.getFmeasure(), 0.8648648648648648);//8421052631578948 );
+ assertEquals( eval.getOverall(), 0.6875);//625 );
//assertEquals( eval.getResult(), 1.34375 );
}
diff --git a/test/src/RendererTest.java b/test/src/RendererTest.java
index d54c14c1d4530cad83a27a6aa94df4c61df657f3..c007d64e0d22d75ccbe696104c49d176c618f5dd 100644
--- a/test/src/RendererTest.java
+++ b/test/src/RendererTest.java
@@ -80,7 +80,7 @@ public class RendererTest {
assertEquals( alignment.nbCells(), 0 );
alignment.init( new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl"), new URI("file:examples/rdf/edu.mit.visus.bibtex.owl"));
alignment.align( (Alignment)null, params );
- assertEquals( alignment.nbCells(), 44 );
+ assertEquals( alignment.nbCells(), 42); //44 ); // 44 with owl:Thing and others
// Suppress the time label
}
@@ -95,7 +95,7 @@ public class RendererTest {
writer.flush();
writer.close();
//System.err.println( stream.toString() );
- assertTrue( valueSimilarTo( stream.toString().length(), 14285 ), "Rendered differently: expected "+14285+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 13704/*14285*/ ), "Rendered differently: expected "+13704/*14285*/+" but was "+stream.toString().length() );
Properties params = new Properties();
params.setProperty( "embedded", "1");
}
@@ -110,7 +110,7 @@ public class RendererTest {
alignment.render( renderer );
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 7479 ), "Rendered differently: expected "+7479+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 7188/*7479*/ ), "Rendered differently: expected "+7188/*7479*/+" but was "+stream.toString().length() );
Properties params = new Properties();
params.setProperty( "embedded", "1");
stream = new ByteArrayOutputStream();
@@ -122,7 +122,7 @@ public class RendererTest {
alignment.render( renderer );
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 7424 ), "Rendered differently: expected "+7424+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 7133/*7424*/ ), "Rendered differently: expected "+7133/*7424*/+" but was "+stream.toString().length() );
params.setProperty( "pre2008", "1");
stream = new ByteArrayOutputStream();
writer = new PrintWriter (
@@ -133,7 +133,7 @@ public class RendererTest {
alignment.render( renderer );
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 7297 ), "Rendered differently: expected "+7297+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 7012/*7297*/ ), "Rendered differently: expected "+7012/*7297*/+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
@@ -146,7 +146,7 @@ public class RendererTest {
alignment.render( renderer );
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 7667 ), "Rendered differently: expected "+7667+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 7382/*7667*/ ), "Rendered differently: expected "+7382/*7667*/+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
@@ -160,7 +160,7 @@ public class RendererTest {
alignment.render( renderer );
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 6552 ), "Rendered differently: expected "+6552+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 6297/*6552*/ ), "Rendered differently: expected "+6297/*6552*/+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
@@ -173,7 +173,7 @@ public class RendererTest {
alignment.render( renderer );
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 21700 ), "Rendered differently: expected "+21700+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 20887/*21700*/ ), "Rendered differently: expected "+20887/*21700*/+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
@@ -186,7 +186,7 @@ public class RendererTest {
alignment.render( renderer );
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 8204 ), "Rendered differently: expected "+8204+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 7808/*8204*/ ), "Rendered differently: expected "+7808/*8204*/+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
@@ -199,7 +199,7 @@ public class RendererTest {
alignment.render( renderer );
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 15395 ), "Rendered differently: expected "+15395+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 14784 /*15395*/ ), "Rendered differently: expected "+14784/*15395*/+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
@@ -213,7 +213,7 @@ public class RendererTest {
writer.flush();
writer.close();
//System.err.println( stream.toString() );
- assertTrue( valueSimilarTo( stream.toString().length(), 18394 ), "Rendered differently: expected "+18394+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 17719/*18394*/ ), "Rendered differently: expected "+17719/*18394*/+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })