From 04f7e48532e8ea809694e25a2f431a1a21dfa2ef Mon Sep 17 00:00:00 2001
From: Sven Hertling <svenhertling@t-online.de>
Date: Wed, 22 Nov 2023 10:15:50 +0100
Subject: [PATCH] updated rdf2vec example

---
 examples/RDF2VecMatcher/pom.xml                      |  4 ++--
 .../dws/melt/demomatcher/RDF2VecMatcher.java         |  7 ++++---
 .../dws/melt/demomatcher/RDF2VecMatcherTest.java     | 12 ++++--------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/examples/RDF2VecMatcher/pom.xml b/examples/RDF2VecMatcher/pom.xml
index 4806676450..b9955d2da2 100644
--- a/examples/RDF2VecMatcher/pom.xml
+++ b/examples/RDF2VecMatcher/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <maven.deploy.skip>true</maven.deploy.skip><!-- needed to call mvn deploy without having a distributionManagement -->
-        <matching.version>2.6</matching.version> <!-- version for all matching related packages -->
+        <matching.version>3.3</matching.version> <!-- version for all matching related packages -->
     </properties>
     
     <!-- Accessing the resources:
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>de.uni-mannheim.informatik.dws</groupId>
             <artifactId>jrdf2vec</artifactId>
-            <version>1.0</version>
+            <version>1.2</version>
         </dependency>
 
 
diff --git a/examples/RDF2VecMatcher/src/main/java/de/uni_mannheim/informatik/dws/melt/demomatcher/RDF2VecMatcher.java b/examples/RDF2VecMatcher/src/main/java/de/uni_mannheim/informatik/dws/melt/demomatcher/RDF2VecMatcher.java
index 8387c8a1c9..f2a32c77ae 100644
--- a/examples/RDF2VecMatcher/src/main/java/de/uni_mannheim/informatik/dws/melt/demomatcher/RDF2VecMatcher.java
+++ b/examples/RDF2VecMatcher/src/main/java/de/uni_mannheim/informatik/dws/melt/demomatcher/RDF2VecMatcher.java
@@ -1,13 +1,14 @@
 package de.uni_mannheim.informatik.dws.melt.demomatcher;
 
 import de.uni_mannheim.informatik.dws.jrdf2vec.RDF2Vec;
+import de.uni_mannheim.informatik.dws.jrdf2vec.training.Gensim;
 import de.uni_mannheim.informatik.dws.jrdf2vec.training.Word2VecConfiguration;
 import de.uni_mannheim.informatik.dws.melt.matching_jena.MatcherYAAAJena;
+import de.uni_mannheim.informatik.dws.melt.matching_ml.python.PythonServer;
 
 import java.io.File;
 import java.util.Properties;
 
-import de.uni_mannheim.informatik.dws.melt.matching_ml.python.Gensim;
 import de.uni_mannheim.informatik.dws.melt.yet_another_alignment_api.Alignment;
 import org.apache.commons.io.FileUtils;
 import org.apache.jena.ontology.OntModel;
@@ -53,9 +54,9 @@ public Alignment match(OntModel source, OntModel target, Alignment inputAlignmen
         // trigger target training
         String targetModel = rdf2Vec.trainNew(target, targetWalks);
 
-        de.uni_mannheim.informatik.dws.jrdf2vec.training.Gensim.shutDown();
+        Gensim.shutDown();
 
-        Alignment alignment = Gensim.getInstance().alignModel("./sourceDirectory/model.kv", "./targetDirectory/model.kv", "linear_projection", usedAlignment);
+        Alignment alignment = PythonServer.getInstance().alignModel("./sourceDirectory/model.kv", "./targetDirectory/model.kv", "linear_projection", usedAlignment);
         
         FileUtils.deleteDirectory(sourceWalkDirectory);
         FileUtils.deleteDirectory(targetWalks);
diff --git a/examples/RDF2VecMatcher/src/test/java/de/uni_mannheim/informatik/dws/melt/demomatcher/RDF2VecMatcherTest.java b/examples/RDF2VecMatcher/src/test/java/de/uni_mannheim/informatik/dws/melt/demomatcher/RDF2VecMatcherTest.java
index 3249f494ba..64b29ce941 100644
--- a/examples/RDF2VecMatcher/src/test/java/de/uni_mannheim/informatik/dws/melt/demomatcher/RDF2VecMatcherTest.java
+++ b/examples/RDF2VecMatcher/src/test/java/de/uni_mannheim/informatik/dws/melt/demomatcher/RDF2VecMatcherTest.java
@@ -1,22 +1,18 @@
 package de.uni_mannheim.informatik.dws.melt.demomatcher;
 
+import de.uni_mannheim.informatik.dws.melt.matching_data.TestCase;
+import de.uni_mannheim.informatik.dws.melt.matching_data.TrackRepository;
 import de.uni_mannheim.informatik.dws.melt.matching_eval.ExecutionResultSet;
 import de.uni_mannheim.informatik.dws.melt.matching_eval.Executor;
 import de.uni_mannheim.informatik.dws.melt.matching_eval.evaluator.EvaluatorCSV;
-import de.uni_mannheim.informatik.dws.melt.matching_eval.evaluator.metric.cm.GoldStandardCompleteness;
-import de.uni_mannheim.informatik.dws.melt.matching_eval.tracks.TestCase;
-import de.uni_mannheim.informatik.dws.melt.matching_eval.tracks.Track;
-import de.uni_mannheim.informatik.dws.melt.matching_eval.tracks.TrackRepository;
 import de.uni_mannheim.informatik.dws.melt.matching_jena.MatcherPipelineYAAAJenaConstructor;
-import de.uni_mannheim.informatik.dws.melt.matching_jena_matchers.filter.AnnonymousNodeFilter;
+import de.uni_mannheim.informatik.dws.melt.matching_jena_matchers.filter.AnonymousNodeFilter;
 import de.uni_mannheim.informatik.dws.melt.matching_jena_matchers.filter.BadHostsFilter;
 import de.uni_mannheim.informatik.dws.melt.matching_jena_matchers.filter.ConfidenceFilter;
 import de.uni_mannheim.informatik.dws.melt.matching_jena_matchers.filter.extraction.NaiveDescendingExtractor;
 import de.uni_mannheim.informatik.dws.melt.matching_jena_matchers.metalevel.ForwardMatcher;
 import de.uni_mannheim.informatik.dws.melt.yet_another_alignment_api.Alignment;
 import eu.sealsproject.platform.res.domain.omt.IOntologyMatchingToolBridge;
-
-import java.io.File;
 import java.util.*;
 
 import org.junit.jupiter.api.Test;
@@ -60,7 +56,7 @@ public void evalSimpleMatcher() {
         matchers.put("ReferenceSample", new ForwardMatcher());
         //matchers.put("RDF2Vec", new MatcherPipelineYAAAJenaConstructor(new ExactStringMatcher(), new ReferenceSampleMatcher(sample)));
         matchers.put("RDF2VecPostProcessed", new MatcherPipelineYAAAJenaConstructor(new RDF2VecMatcher(sample),
-                new BadHostsFilter(true), new AnnonymousNodeFilter(), new ConfidenceFilter(0.9), new NaiveDescendingExtractor()));
+                new BadHostsFilter(true), new AnonymousNodeFilter(), new ConfidenceFilter(0.9), new NaiveDescendingExtractor()));
 
         ExecutionResultSet results = Executor.run(TrackRepository.Anatomy.Default, matchers);