fix enrichment parameter link

Author: SimonBin

interfaces/src/main/java/org/dllearner/cli/Enrichment.java

@@ -654,13 +654,15 @@ private List<OWLAxiom> toRDF(List<EvaluatedAxiom<OWLAxiom>> evalAxioms, Class<?
 		//add Parameters to algorithm run instance
 		OWLIndividual paramInd;
 		for(Entry<Field, Object> entry : parameters.entrySet()){
-			paramInd = f.getOWLNamedIndividual(IRI.create(generateId()));
+			paramInd = f.getOWLNamedIndividual(IRI.create(defaultNamespace+generateId()));
 			ax = f.getOWLClassAssertionAxiom(EnrichmentVocabulary.Parameter, paramInd);
 			axioms.add(ax);
 			ax = f.getOWLDataPropertyAssertionAxiom(EnrichmentVocabulary.parameterName, paramInd, AnnComponentManager.getName(entry.getKey()));
 			axioms.add(ax);
 			ax = f.getOWLDataPropertyAssertionAxiom(EnrichmentVocabulary.parameterValue, paramInd, entry.getValue().toString());
 			axioms.add(ax);
+			ax = f.getOWLObjectPropertyAssertionAxiom(EnrichmentVocabulary.hasParameter, algorithmRunInd, paramInd);
+			axioms.add(ax);
 		}
 		//add timestamp
 		ax = f.getOWLDataPropertyAssertionAxiom(EnrichmentVocabulary.timestamp, algorithmRunInd, System.currentTimeMillis());
@@ -814,7 +816,7 @@ private void filter(Model model) {
 
 	Model getModel(List<OWLAxiom> axioms) {
 		try {
-			OWLOntology ontology = OWLManager.createOWLOntologyManager().createOntology(new HashSet<>(axioms));
+			OWLOntology ontology = OWLManager.createOWLOntologyManager().createOntology(new HashSet<>(axioms), IRI.create(DEFAULT_NS + generateId()));
 			Model model = OwlApiJenaUtils.getModel(ontology);
 			model.setNsPrefix("enr", "http://www.dl-learner.org/enrichment.owl#");
 			return model;
@@ -824,19 +826,19 @@ Model getModel(List<OWLAxiom> axioms) {
 		return null;
 	}
 
-	public OWLOntology getGeneratedOntology(){
+	public OWLOntology getGeneratedOntology(URI uri){
 		OWLOntology ontology = null;
 		try {
 			OWLOntologyManager man = OWLManager.createOWLOntologyManager();
-			ontology = man.createOntology(learnedOWLAxioms);
+			ontology = man.createOntology(learnedOWLAxioms, IRI.create(uri));
 		} catch (OWLOntologyCreationException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return ontology;
 	}
 
-	public OWLOntology getGeneratedOntology(boolean withConfidenceAsAnnotations){
+	public OWLOntology getGeneratedOntology(boolean withConfidenceAsAnnotations, URI uri){
 		OWLOntology ontology = null;
 		try {
 			OWLOntologyManager man = OWLManager.createOWLOntologyManager();
@@ -853,7 +855,7 @@ public OWLOntology getGeneratedOntology(boolean withConfidenceAsAnnotations){
 				}
 				axioms.add(ax);
 			}
-			ontology = man.createOntology(axioms);
+			ontology = man.createOntology(axioms, IRI.create(uri));
 
 		} catch (OWLOntologyCreationException e) {
 			e.printStackTrace();
@@ -867,7 +869,7 @@ public OWLOntology getGeneratedOntology(boolean withConfidenceAsAnnotations){
 	private void printTurtleSyntax(List<OWLAxiom> axioms){
 		try {
 			System.out.println("ENRICHMENT[");
-			Model model = OwlApiJenaUtils.getModel(OWLManager.createOWLOntologyManager().createOntology(new HashSet<>(axioms)));
+			Model model = OwlApiJenaUtils.getModel(OWLManager.createOWLOntologyManager().createOntology(new HashSet<>(axioms), IRI.create("http://localhost:8080/" + generateId())));
 			model.write(System.out, "TURTLE");
 			System.out.println("]");
 		} catch (OWLOntologyCreationException e) {
@@ -882,7 +884,7 @@ private void printTurtleSyntax(List<OWLAxiom> axioms){
 	private void printNTriplesSyntax(List<OWLAxiom> axioms){
 		try {
 			System.out.println("ENRICHMENT[");
-			Model model = OwlApiJenaUtils.getModel(OWLManager.createOWLOntologyManager().createOntology(new HashSet<>(axioms)));
+			Model model = OwlApiJenaUtils.getModel(OWLManager.createOWLOntologyManager().createOntology(new HashSet<>(axioms), IRI.create("http://localhost:8080/" + generateId())));
 			model.write(System.out, "N-TRIPLES");
 			System.out.println("]");
 		} catch (OWLOntologyCreationException e) {
@@ -1172,7 +1174,7 @@ protected PasswordAuthentication getPasswordAuthentication() {
 			if(options.has("s")){
 				File file = (File)options.valueOf("s");
 				try {
-					OWLOntology ontology = e.getGeneratedOntology(options.has("a"));
+					OWLOntology ontology = e.getGeneratedOntology(options.has("a"), file.toURI());
 					OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
 					OWLManager.createOWLOntologyManager().saveOntology(ontology, new RDFXMLDocumentFormat(), os);
 				} catch (OWLOntologyStorageException e1) {

interfaces/src/main/java/org/dllearner/cli/GlobalEnrichment.java

@@ -236,7 +236,7 @@ public void run() {
 						List<OWLAxiom> axioms = new LinkedList<>();
 						int axiomCnt = 0;
 						for(AlgorithmRun run : runs) {
-							axiomCnt += e.getGeneratedOntology().getLogicalAxiomCount();
+							axiomCnt += e.getGeneratedOntology(f.toURI()).getLogicalAxiomCount();
 							axioms.addAll(e.toRDF(run.getAxioms(), run.getAlgorithm(), run.getParameters(), ks));
 						}
 						Model model = e.getModel(axioms);