Pellet upgrade

Upgraded Pellet(fork) dependency which imports latest
JGraphT version.

Author: LorenzBuehmann

components-core/src/main/java/org/dllearner/algorithms/qtl/util/SteinerTreeGeneric.java

@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Supplier;
 
-import org.jgrapht.EdgeFactory;
 import org.jgrapht.Graph;
 import org.jgrapht.alg.shortestpath.BellmanFordShortestPath;
 import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
@@ -23,12 +23,12 @@ public class SteinerTreeGeneric<V, E> {
 	Graph<V, E> graph;
 	WeightedMultigraph<V, E> tree;
 	List<V> steinerNodes;
-	private final EdgeFactory<V, E> edgeFactory;
+	private final Class<? extends E> edgeClass;
 
-	public SteinerTreeGeneric(Graph<V, E> graph, List<V> steinerNodes, EdgeFactory<V, E> edgeFactory) {
+	public SteinerTreeGeneric(Graph<V, E> graph, List<V> steinerNodes, Class<? extends E> edgeClass) {
 		this.graph = graph;
 		this.steinerNodes = steinerNodes;
-		this.edgeFactory = edgeFactory;
+		this.edgeClass = edgeClass;
 
 		runAlgorithm();
 	}
@@ -40,7 +40,7 @@ private Pseudograph<V, E> step1() {
 
 		logger.debug("<enter");
 
-		Pseudograph<V, E> g = new WeightedPseudograph<V, E>(edgeFactory);
+		Pseudograph<V, E> g = new WeightedPseudograph<V, E>(edgeClass);
 
 		for (V n : this.steinerNodes) {
 			g.addVertex(n);
@@ -57,8 +57,7 @@ private Pseudograph<V, E> step1() {
 				if (g.containsEdge(n1, n2))
 					continue;
 
-				E e = edgeFactory.createEdge(n1, n2);
-				g.addEdge(n1, n2, e);
+				E e = g.addEdge(n1, n2);
 				g.setEdgeWeight(e, pathGen.getPathWeight(n1, n2));
 
 			}
@@ -87,7 +86,7 @@ private WeightedMultigraph<V, E> step2(Pseudograph<V, E> g1) {
 
 		Set<E> edges = mst.getSpanningTree().getEdges();
 
-		WeightedMultigraph<V, E> g2 = new WeightedMultigraph<>(edgeFactory);
+		WeightedMultigraph<V, E> g2 = new WeightedMultigraph<>(edgeClass);
 
 		List<E> edgesSortedById = new ArrayList<>(edges);
 //		edgesSortedById.sort();
@@ -114,7 +113,7 @@ private WeightedMultigraph<V, E> step3(WeightedMultigraph<V, E> g2) {
 
 		logger.debug("<enter");
 
-		WeightedMultigraph<V, E> g3 = new WeightedMultigraph<>(edgeFactory);
+		WeightedMultigraph<V, E> g3 = new WeightedMultigraph<>(edgeClass);
 
 		Set<E> edges = g2.edgeSet();
 		DijkstraShortestPath<V, E> pathGen = new DijkstraShortestPath<>(this.graph);
@@ -170,7 +169,7 @@ private WeightedMultigraph<V, E> step4(WeightedMultigraph<V, E> g3) {
 
 		Set<E> edges = mst.getSpanningTree().getEdges();
 
-		WeightedMultigraph<V, E> g4 = new WeightedMultigraph<>(edgeFactory);
+		WeightedMultigraph<V, E> g4 = new WeightedMultigraph<>(edgeClass);
 
 		List<E> edgesSortedById = new ArrayList<>(edges);
 //		Collections.sort(edgesSortedById);
@@ -241,7 +240,7 @@ private void runAlgorithm() {
 //		GraphUtil.printGraph(g1);
 
 		if (g1.vertexSet().size() < 2) {
-			this.tree = new WeightedMultigraph<>(edgeFactory);
+			this.tree = new WeightedMultigraph<>(edgeClass);
 			for (V n : g1.vertexSet()) this.tree.addVertex(n);
 			return;
 		}

pom.xml

@@ -21,8 +21,8 @@
         <spring.version>4.3.3.RELEASE</spring.version>
         <jena.sparql.api.version>3.11.0-1</jena.sparql.api.version>
 		<jena.version>3.12.0</jena.version>
-		<pellet.version>2.5.0-dllearner</pellet.version>
-		<jgrapht.version>1.1.0</jgrapht.version>
+		<pellet.version>2.5.2-dllearner</pellet.version>
+		<jgrapht.version>1.3.1</jgrapht.version>
 	</properties>
 
 	<modules>