From 6e20a6f3d1cac9404ea55a5989297cc0786a29eb Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Thu, 10 Aug 2017 16:37:37 +0200
Subject: [PATCH] Adjusted to latest yoshiko changes
---
.../hhu/ba/yoshikoWrapper/gui/MainPanel.java | 7 ++-
.../yoshikoWrapper/swig/LibraryInterface.java | 60 ++++++++++++++++---
.../swig/LibraryInterfaceJNI.java | 17 +++++-
...nt_t.java => SWIGTYPE_p_std__istream.java} | 8 +--
...=> SWIGTYPE_p_yskInput__LibraryInput.java} | 8 +--
...de.java => SWIGTYPE_p_yskInput__edge.java} | 8 +--
6 files changed, 84 insertions(+), 24 deletions(-)
rename src/main/java/de/hhu/ba/yoshikoWrapper/swig/{SWIGTYPE_p_std__vectorT_int_t.java => SWIGTYPE_p_std__istream.java} (67%)
rename src/main/java/de/hhu/ba/yoshikoWrapper/swig/{SWIGTYPE_p_lemon__FullGraph__Edge.java => SWIGTYPE_p_yskInput__LibraryInput.java} (71%)
rename src/main/java/de/hhu/ba/yoshikoWrapper/swig/{SWIGTYPE_p_lemon__FullGraph__Node.java => SWIGTYPE_p_yskInput__edge.java} (66%)
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
index 6e59ff5..6473b62 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
@@ -15,6 +15,7 @@ import org.cytoscape.application.swing.CytoPanelName;
import de.hhu.ba.yoshikoWrapper.core.YoshikoLoader;
import de.hhu.ba.yoshikoWrapper.swig.LibraryInterface;
+import de.hhu.ba.yoshikoWrapper.swig.SWIGTYPE_p_yskInput__LibraryInput;
import de.hhu.ba.yoshikoWrapper.swig.SWIGTYPE_p_ysk__ClusterEditingInstance;
/**This class describes the Swing Panel that the user interacts with in cytoscape
@@ -71,11 +72,13 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
JButton debugGraphActionButton = new JButton("DO MYSTERIOUS DEBUG STUFF");
debugGraphActionButton.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(ActionEvent e) {
if (yoshikoLoader.isLibraryLoaded()){
- SWIGTYPE_p_ysk__ClusterEditingInstance testInstance = LibraryInterface.new_ClusterEditingInstance();
- LibraryInterface.ClusterEditingInstance_initEdge(testInstance, edge, 0.5, false, false);
+ SWIGTYPE_p_yskInput__LibraryInput instance;
+ instance = LibraryInterface.new_LibraryInput();
+ LibraryInterface.LibraryInput_setSize(instance, 4);
}
}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
index d816447..c647463 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
@@ -9,17 +9,63 @@
package de.hhu.ba.yoshikoWrapper.swig;
public class LibraryInterface {
- public static SWIGTYPE_p_ysk__ClusterEditingInstance new_ClusterEditingInstance() {
- long cPtr = LibraryInterfaceJNI.new_ClusterEditingInstance();
- return (cPtr == 0) ? null : new SWIGTYPE_p_ysk__ClusterEditingInstance(cPtr, true);
+ public static void edge_sourceID_set(SWIGTYPE_p_yskInput__edge self, int value) {
+ LibraryInterfaceJNI.edge_sourceID_set(SWIGTYPE_p_yskInput__edge.getCPtr(self), value);
}
- public static void ClusterEditingInstance_initNode(SWIGTYPE_p_ysk__ClusterEditingInstance self, SWIGTYPE_p_lemon__FullGraph__Node node, String name, SWIGTYPE_p_std__vectorT_int_t cluster) {
- LibraryInterfaceJNI.ClusterEditingInstance_initNode(SWIGTYPE_p_ysk__ClusterEditingInstance.getCPtr(self), SWIGTYPE_p_lemon__FullGraph__Node.getCPtr(node), name, SWIGTYPE_p_std__vectorT_int_t.getCPtr(cluster));
+ public static int edge_sourceID_get(SWIGTYPE_p_yskInput__edge self) {
+ return LibraryInterfaceJNI.edge_sourceID_get(SWIGTYPE_p_yskInput__edge.getCPtr(self));
}
- public static void ClusterEditingInstance_initEdge(SWIGTYPE_p_ysk__ClusterEditingInstance self, SWIGTYPE_p_lemon__FullGraph__Edge edge, double weight, boolean permanent, boolean forbidden) {
- LibraryInterfaceJNI.ClusterEditingInstance_initEdge(SWIGTYPE_p_ysk__ClusterEditingInstance.getCPtr(self), SWIGTYPE_p_lemon__FullGraph__Edge.getCPtr(edge), weight, permanent, forbidden);
+ public static void edge_targetID_set(SWIGTYPE_p_yskInput__edge self, int value) {
+ LibraryInterfaceJNI.edge_targetID_set(SWIGTYPE_p_yskInput__edge.getCPtr(self), value);
+ }
+
+ public static int edge_targetID_get(SWIGTYPE_p_yskInput__edge self) {
+ return LibraryInterfaceJNI.edge_targetID_get(SWIGTYPE_p_yskInput__edge.getCPtr(self));
+ }
+
+ public static void edge_cost_set(SWIGTYPE_p_yskInput__edge self, double value) {
+ LibraryInterfaceJNI.edge_cost_set(SWIGTYPE_p_yskInput__edge.getCPtr(self), value);
+ }
+
+ public static double edge_cost_get(SWIGTYPE_p_yskInput__edge self) {
+ return LibraryInterfaceJNI.edge_cost_get(SWIGTYPE_p_yskInput__edge.getCPtr(self));
+ }
+
+ public static SWIGTYPE_p_yskInput__edge new_edge() {
+ long cPtr = LibraryInterfaceJNI.new_edge();
+ return (cPtr == 0) ? null : new SWIGTYPE_p_yskInput__edge(cPtr, true);
+ }
+
+ public static void delete_edge(SWIGTYPE_p_yskInput__edge self) {
+ LibraryInterfaceJNI.delete_edge(SWIGTYPE_p_yskInput__edge.getCPtr(self));
+ }
+
+ public static SWIGTYPE_p_ysk__ClusterEditingInstance LibraryInput_parseInput(SWIGTYPE_p_yskInput__LibraryInput self, SWIGTYPE_p_std__istream is) {
+ long cPtr = LibraryInterfaceJNI.LibraryInput_parseInput(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self), SWIGTYPE_p_std__istream.getCPtr(is));
+ return (cPtr == 0) ? null : new SWIGTYPE_p_ysk__ClusterEditingInstance(cPtr, false);
+ }
+
+ public static boolean LibraryInput_validateInput(SWIGTYPE_p_yskInput__LibraryInput self, SWIGTYPE_p_std__istream is) {
+ return LibraryInterfaceJNI.LibraryInput_validateInput(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self), SWIGTYPE_p_std__istream.getCPtr(is));
+ }
+
+ public static SWIGTYPE_p_yskInput__LibraryInput new_LibraryInput() {
+ long cPtr = LibraryInterfaceJNI.new_LibraryInput();
+ return (cPtr == 0) ? null : new SWIGTYPE_p_yskInput__LibraryInput(cPtr, true);
+ }
+
+ public static void LibraryInput_setSize(SWIGTYPE_p_yskInput__LibraryInput self, int id) {
+ LibraryInterfaceJNI.LibraryInput_setSize(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self), id);
+ }
+
+ public static void LibraryInput_addEdge(SWIGTYPE_p_yskInput__LibraryInput self, int sourceID, int targetID, double cost) {
+ LibraryInterfaceJNI.LibraryInput_addEdge(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self), sourceID, targetID, cost);
+ }
+
+ public static void delete_LibraryInput(SWIGTYPE_p_yskInput__LibraryInput self) {
+ LibraryInterfaceJNI.delete_LibraryInput(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self));
}
public static String getVersionString() {
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
index 18089e1..4c55ee7 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
@@ -9,9 +9,20 @@
package de.hhu.ba.yoshikoWrapper.swig;
public class LibraryInterfaceJNI {
- public final static native long new_ClusterEditingInstance();
- public final static native void ClusterEditingInstance_initNode(long jarg1, long jarg2, String jarg3, long jarg4);
- public final static native void ClusterEditingInstance_initEdge(long jarg1, long jarg2, double jarg3, boolean jarg4, boolean jarg5);
+ public final static native void edge_sourceID_set(long jarg1, int jarg2);
+ public final static native int edge_sourceID_get(long jarg1);
+ public final static native void edge_targetID_set(long jarg1, int jarg2);
+ public final static native int edge_targetID_get(long jarg1);
+ public final static native void edge_cost_set(long jarg1, double jarg2);
+ public final static native double edge_cost_get(long jarg1);
+ public final static native long new_edge();
+ public final static native void delete_edge(long jarg1);
+ public final static native long LibraryInput_parseInput(long jarg1, long jarg2);
+ public final static native boolean LibraryInput_validateInput(long jarg1, long jarg2);
+ public final static native long new_LibraryInput();
+ public final static native void LibraryInput_setSize(long jarg1, int jarg2);
+ public final static native void LibraryInput_addEdge(long jarg1, int jarg2, int jarg3, double jarg4);
+ public final static native void delete_LibraryInput(long jarg1);
public final static native String getVersionString();
public final static native long createNewProblemInstance();
}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__vectorT_int_t.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__istream.java
similarity index 67%
rename from src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__vectorT_int_t.java
rename to src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__istream.java
index f7a734e..bea945a 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__vectorT_int_t.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__istream.java
@@ -8,18 +8,18 @@
package de.hhu.ba.yoshikoWrapper.swig;
-public class SWIGTYPE_p_std__vectorT_int_t {
+public class SWIGTYPE_p_std__istream {
private transient long swigCPtr;
- protected SWIGTYPE_p_std__vectorT_int_t(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
+ protected SWIGTYPE_p_std__istream(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
swigCPtr = cPtr;
}
- protected SWIGTYPE_p_std__vectorT_int_t() {
+ protected SWIGTYPE_p_std__istream() {
swigCPtr = 0;
}
- protected static long getCPtr(SWIGTYPE_p_std__vectorT_int_t obj) {
+ protected static long getCPtr(SWIGTYPE_p_std__istream obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Edge.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_yskInput__LibraryInput.java
similarity index 71%
rename from src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Edge.java
rename to src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_yskInput__LibraryInput.java
index edc3020..40ef62b 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Edge.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_yskInput__LibraryInput.java
@@ -8,18 +8,18 @@
package de.hhu.ba.yoshikoWrapper.swig;
-public class SWIGTYPE_p_lemon__FullGraph__Edge {
+public class SWIGTYPE_p_yskInput__LibraryInput {
private transient long swigCPtr;
- protected SWIGTYPE_p_lemon__FullGraph__Edge(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
+ protected SWIGTYPE_p_yskInput__LibraryInput(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
swigCPtr = cPtr;
}
- protected SWIGTYPE_p_lemon__FullGraph__Edge() {
+ protected SWIGTYPE_p_yskInput__LibraryInput() {
swigCPtr = 0;
}
- protected static long getCPtr(SWIGTYPE_p_lemon__FullGraph__Edge obj) {
+ protected static long getCPtr(SWIGTYPE_p_yskInput__LibraryInput obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Node.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_yskInput__edge.java
similarity index 66%
rename from src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Node.java
rename to src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_yskInput__edge.java
index 99f67e4..928b8c9 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Node.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_yskInput__edge.java
@@ -8,18 +8,18 @@
package de.hhu.ba.yoshikoWrapper.swig;
-public class SWIGTYPE_p_lemon__FullGraph__Node {
+public class SWIGTYPE_p_yskInput__edge {
private transient long swigCPtr;
- protected SWIGTYPE_p_lemon__FullGraph__Node(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
+ protected SWIGTYPE_p_yskInput__edge(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
swigCPtr = cPtr;
}
- protected SWIGTYPE_p_lemon__FullGraph__Node() {
+ protected SWIGTYPE_p_yskInput__edge() {
swigCPtr = 0;
}
- protected static long getCPtr(SWIGTYPE_p_lemon__FullGraph__Node obj) {
+ protected static long getCPtr(SWIGTYPE_p_yskInput__edge obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}
--
GitLab