diff --git a/html/relnotes.html b/html/relnotes.html index 1f939b0d7eafd9aa93c3a703e76347a05f81127b..ae8096d6a18b49a5d2d435d0c8d26945c0a6ee40 100644 --- a/html/relnotes.html +++ b/html/relnotes.html @@ -39,7 +39,7 @@ the main rupture that could appear is the use of Java 1.5 parametrization facili <li>Consolidate alignment based on <tt>dependsOn</tt> (loop checking, cell ingestion) (impl)</li> <li>Use the OWLReasoner interface and HermiT for adding inference to Ontowrap (ontowrap)</li> <li>Integrate tests from generator (test)</li> -<li>Integrate some basic reasoning (impl).</li> +<li>Integrate some basic reasoning (impl)</li> <li>Genericize evaluators in <tt>GraphEvaluator</tt> and <tt>GenPlot</tt> (eval)</li> <li>Replace <tt>DistanceAlignment</tt> and <tt>Similarity</tt> with a version more in line with <a href="http://ontosim.gforge.inria.fr">OntoSim</a> (impl)</tt> <li>Improve HTML interface layout and usability (serv)</li> @@ -57,14 +57,20 @@ The default type of StringDistAlignment should be reverted to "**" with a warning: --> -<!--h2>Version 4.9 (2xxx): ??/??/201X - Letraset</h2--> +<!--h2>Version 4.10 (2xxx): ??/??/201X - Pumpkin risotto</h2--> + +<!--h2>Version 4.9 (2xxx): ??/??/2017 - Letraset</h2--> <p><ul compact="1"> <li><span style="color: red;">Suppressed</span> empty constructor in <tt>DBServiceImpl</tt> (serv)</li> <li>Fixed a bug in <tt>SQLCache</tt> loading from database which prevented to reload EDOAL alignments (serv)</li> <li>Fixed a problem with Jade when running a server with no X server running (serv)</li> <li>Fixed a bug in test generation without URI (gen)</li> +<li>Fixed problems with IRI encoding in <tt>RDFRendererVisitor</tt> (impl)</li> <li>Added rendering of several queries in case of multiple link keys (edoal)</li> +<li>Added language support in EDOAL (edoal)</li> +<li>Added <tt>sameAs</tt> triples in SPARQL link generation (edoal)</li> +<li>Added <tt>nbCells()</tt> to <tt>BasiicOntologyNetwork</tt> (impl)</li> <li>Moved all shell examples from csh to bash (html)</li> <li>Clarified EDOAL documentation (html)</li> <li>Several documentation fixes --alignwn, rest-- (html)</li> diff --git a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java index cdf225d4a11a1287787dad66ae1381e39390f5e6..bf24ec57cd25d21a5f358036a00912c58af6bf2b 100644 --- a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java +++ b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java @@ -155,6 +155,12 @@ public class BasicOntologyNetwork implements OntologyNetwork, Extensible { public Set<Alignment> getAlignments(){ return alignments; }; + public int nbCells() { + int nbcells = 0; + for ( Alignment al : alignments ) nbcells += al.nbCells(); + return nbcells; + } + public Set<URI> getOntologies() { return ontologies.keySet(); // ?? }; @@ -183,7 +189,9 @@ public class BasicOntologyNetwork implements OntologyNetwork, Extensible { return intersectAlignments( ot1.sourceAlignments, ot2.targettingAlignments ); } */ + public Set<Alignment> getAlignments( URI srcOnto, URI dstOnto ) { + Map<URI,Set<Alignment>> m = onto2Align.get(srcOnto); if ( m != null ) { Set<Alignment> aligns = m.get(dstOnto); diff --git a/test/src/OntologyNetworkTest.java b/test/src/OntologyNetworkTest.java index 64e1a7f6bff151d883a29dbd154bbd3de67aebef..e6b64dd175a2d1d5aff501c8e338828fb8808462 100644 --- a/test/src/OntologyNetworkTest.java +++ b/test/src/OntologyNetworkTest.java @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) INRIA, 2008-2011, 2013-2015 + * Copyright (C) INRIA, 2008-2011, 2013-2015, 2017 * * 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 @@ -110,10 +110,12 @@ public class OntologyNetworkTest { //, RDFParserException assertEquals( noo.getAlignments().size(), 0 ); assertEquals( noo.getOntologies().size(), 2); + assertEquals( ((BasicOntologyNetwork)noo).nbCells(), 0); // addAlignment Alignment al1 = new AlignmentParser( 0 ).parse( "file:examples/rdf/newsample.rdf" ); noo.addAlignment( al1 ); assertEquals( noo.getOntologies().size(), 4); + assertEquals( ((BasicOntologyNetwork)noo).nbCells(), 2); // addAlignment Alignment al2 = new URIAlignment(); al2.init( al1.getOntology1URI(), al1.getOntology2URI() ); @@ -123,12 +125,15 @@ public class OntologyNetworkTest { noo.addAlignment( al2 ); assertEquals( noo.getAlignments().size(), 2 ); assertEquals( noo.getOntologies().size(), 4); + assertEquals( ((BasicOntologyNetwork)noo).nbCells(), 2); // remAlignment noo.remAlignment( al1 ); assertEquals( noo.getAlignments().size(), 1 ); + assertEquals( ((BasicOntologyNetwork)noo).nbCells(), 0); // addAlignment noo.addAlignment( al1 ); assertEquals( noo.getAlignments().size(), 2 ); + assertEquals( ((BasicOntologyNetwork)noo).nbCells(), 2); // impact on ontologies? }