Mentions légales du service

Skip to content
Snippets Groups Projects
Commit f4e9cd54 authored by Jérôme Euzenat's avatar Jérôme Euzenat
Browse files

- corrected bugus implementation of Relaxed evaluator

parent f8310a37
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
+ 13
− 11
View file @ f4e9cd54
/* /*
* $Id$ * $Id$
* *
* Copyright (C) INRIA, 2004-2010, 2012 * Copyright (C) INRIA, 2004-2010, 2012-2013
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU Lesser General Public License as published by
...@@ -212,16 +212,18 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator { ...@@ -212,16 +212,18 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator {
for ( Cell c2 : align2 ) { for ( Cell c2 : align2 ) {
int val1 = 0; // the similatity between the o1 objects int val1 = 0; // the similatity between the o1 objects
int val2 = 0; // the similarity between the o2 objects int val2 = 0; // the similarity between the o2 objects
if ( onto1.getEntityURI( c1.getObject1() ).equals(onto1.getEntityURI(c2.getObject1())) ){ if ( onto1.getEntityURI( c1.getObject1() ).equals( onto1.getEntityURI(c2.getObject1()) ) ){
val1 = 0; val1 = 0;
} else { } else {
val1 = Math.abs( relativePosition( c1.getObject2(), c2.getObject2(), onto2 ) ); val1 = Math.abs( relativePosition( c1.getObject1(), c2.getObject1(), onto1 ) );
//System.err.println( c1.getObject1()+" -- "+c2.getObject1()+" = "+val1 );
if ( val1 == 0 ) continue; if ( val1 == 0 ) continue;
} }
if ( onto2.getEntityURI(c1.getObject2()).equals(onto2.getEntityURI(c2.getObject2())) ){ if ( onto2.getEntityURI( c1.getObject2() ).equals( onto2.getEntityURI(c2.getObject2()) ) ){
val2 = 0; val2 = 0;
} else { } else {
val2 = Math.abs( relativePosition( c1.getObject1(), c2.getObject1(), onto1 ) ); val2 = Math.abs( relativePosition( c1.getObject2(), c2.getObject2(), onto2 ) );
//System.err.println( c1.getObject2()+" -- "+c2.getObject2()+" = "+val2 );
if ( val2 == 0 ) continue; if ( val2 == 0 ) continue;
} }
double val = Math.pow( symALPHA, val1 + val2 ); double val = Math.pow( symALPHA, val1 + val2 );
...@@ -250,7 +252,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator { ...@@ -250,7 +252,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator {
if ( onto1.getEntityURI( c1.getObject1() ).equals(onto1.getEntityURI(c2.getObject1())) ){ if ( onto1.getEntityURI( c1.getObject1() ).equals(onto1.getEntityURI(c2.getObject1())) ){
val = 1.; val = 1.;
} else { } else {
val1 = relativePosition( c1.getObject2(), c2.getObject2(), onto2 ); val1 = relativePosition( c1.getObject1(), c2.getObject1(), onto1 );
if ( val1 == 0 ) { if ( val1 == 0 ) {
continue; continue;
} if ( val1 > 0 ) { } if ( val1 > 0 ) {
...@@ -262,7 +264,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator { ...@@ -262,7 +264,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator {
if ( onto2.getEntityURI(c1.getObject2()).equals(onto2.getEntityURI(c2.getObject2())) ){ if ( onto2.getEntityURI(c1.getObject2()).equals(onto2.getEntityURI(c2.getObject2())) ){
// val remains val // val remains val
} else { } else {
val2 = relativePosition( c1.getObject1(), c2.getObject1(), onto1 ); val2 = relativePosition( c1.getObject2(), c2.getObject2(), onto2 );
if ( val2 == 0 ) { if ( val2 == 0 ) {
continue; continue;
} if ( val2 > 0 ) { } if ( val2 > 0 ) {
...@@ -296,7 +298,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator { ...@@ -296,7 +298,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator {
if ( onto1.getEntityURI( c1.getObject1() ).equals(onto1.getEntityURI(c2.getObject1())) ){ if ( onto1.getEntityURI( c1.getObject1() ).equals(onto1.getEntityURI(c2.getObject1())) ){
val = 1.; val = 1.;
} else { } else {
val1 = relativePosition( c1.getObject2(), c2.getObject2(), onto2 ); val1 = relativePosition( c1.getObject1(), c2.getObject1(), onto1 );
if ( val1 == 0 ) { if ( val1 == 0 ) {
continue; continue;
} if ( val1 > 0 ) { } if ( val1 > 0 ) {
...@@ -308,7 +310,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator { ...@@ -308,7 +310,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator {
if ( onto2.getEntityURI(c1.getObject2()).equals(onto2.getEntityURI(c2.getObject2())) ){ if ( onto2.getEntityURI(c1.getObject2()).equals(onto2.getEntityURI(c2.getObject2())) ){
// val remains val // val remains val
} else { } else {
val2 = relativePosition( c1.getObject1(), c2.getObject1(), onto1 ); val2 = relativePosition( c1.getObject2(), c2.getObject2(), onto2 );
if ( val2 == 0 ) { if ( val2 == 0 ) {
continue; continue;
} if ( val2 > 0 ) { // This is the inverse from o1 because queries flow from o1 to o2 } if ( val2 > 0 ) { // This is the inverse from o1 because queries flow from o1 to o2
...@@ -340,7 +342,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator { ...@@ -340,7 +342,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator {
if ( onto1.getEntityURI( c1.getObject1() ).equals(onto1.getEntityURI(c2.getObject1())) ){ if ( onto1.getEntityURI( c1.getObject1() ).equals(onto1.getEntityURI(c2.getObject1())) ){
val = 1.; val = 1.;
} else { } else {
val1 = relativePosition( c1.getObject2(), c2.getObject2(), onto2 ); val1 = relativePosition( c1.getObject1(), c2.getObject1(), onto1 );
if ( val1 == 0 ) { if ( val1 == 0 ) {
continue; continue;
} if ( val1 > 0 ) { } if ( val1 > 0 ) {
...@@ -352,7 +354,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator { ...@@ -352,7 +354,7 @@ public class ExtPREvaluator extends BasicEvaluator implements Evaluator {
if ( onto2.getEntityURI(c1.getObject2()).equals(onto2.getEntityURI(c2.getObject2())) ){ if ( onto2.getEntityURI(c1.getObject2()).equals(onto2.getEntityURI(c2.getObject2())) ){
// val remains val // val remains val
} else { } else {
val2 = relativePosition( c1.getObject1(), c2.getObject1(), onto1 ); val2 = relativePosition( c1.getObject2(), c2.getObject2(), onto2 );
if ( val2 == 0 ) { if ( val2 == 0 ) {
continue; continue;
} if ( val2 > 0 ) { // This is the inverse from o1 because queries flow from o1 to o2 } if ( val2 > 0 ) { // This is the inverse from o1 because queries flow from o1 to o2
......
src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
+ 1
− 1
View file @ f4e9cd54
...@@ -41,7 +41,7 @@ import fr.inrialpes.exmo.align.impl.BasicAlignment; ...@@ -41,7 +41,7 @@ import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.ObjectCell; import fr.inrialpes.exmo.align.impl.ObjectCell;
import fr.inrialpes.exmo.ontowrap.LoadedOntology; import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.ontowrap.Ontology; //? import fr.inrialpes.exmo.ontowrap.Ontology;
import fr.inrialpes.exmo.align.parser.SyntaxElement; import fr.inrialpes.exmo.align.parser.SyntaxElement;
import fr.inrialpes.exmo.align.parser.SyntaxElement.Constructor; import fr.inrialpes.exmo.align.parser.SyntaxElement.Constructor;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment