Commit b69a3b1c authored by DanielPJFaria's avatar DanielPJFaria
Browse files

Merge branch 'MajorCoreUpdate' of

https://github.com/AgreementMakerLight/AML-Project.git into
MajorCoreUpdate

Conflicts:
	AgreementMakerLight/src/aml/ontology/Ontology.java
parents 321ef5b4 abe64666
......@@ -234,6 +234,11 @@ public class AML
}
selectedSources = new Vector<String>(bkSources);
//Custom Match
matchSteps = new Vector<MatchStep>();
for(MatchStep s : MatchStep.values())
matchSteps.add(s);
matchClasses = hasClasses();
double sourceRatio = (source.count(EntityType.DATA) + source.count(EntityType.OBJECT)) * 1.0 / source.count(EntityType.CLASS);
double targetRatio = (target.count(EntityType.DATA) + target.count(EntityType.OBJECT)) * 1.0 / target.count(EntityType.CLASS);
......
......@@ -1407,7 +1407,6 @@ public class Ontology
if(sv == null)
continue;
Vector<Integer> cl = new Vector<Integer>(sv);
for(int i = 0; i < cl.size() - 1; i++)
{
int c1 = objectSomeValues.get(prop, cl.get(i));
......
#AgreementMakerLight OAEI Configuration File
#Instance Matching Classes (options: leave empty if no restriction, or list local names of classes to match separated by ';', or use * if target_classes = source_classes)
source_classes=Transition
target_classes=Transition
\ No newline at end of file
Supports Markdown
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