From a8d555794956a716f0b1aaf46b2049df41fff7e5 Mon Sep 17 00:00:00 2001 From: Philipp Spohr <spohr.philipp@web.de> Date: Wed, 9 Aug 2017 12:56:44 +0200 Subject: [PATCH] some cleanup/ removed "double wrapping" dummy classes for referencing object pointers --- .../yoshikoWrapper/swig/LibraryInterface.java | 20 +++++++++++++- .../swig/LibraryInterfaceJNI.java | 5 +++- .../SWIGTYPE_p_lemon__FullGraph__Edge.java | 26 +++++++++++++++++++ .../SWIGTYPE_p_lemon__FullGraph__Node.java | 26 +++++++++++++++++++ ...ava => SWIGTYPE_p_std__vectorT_int_t.java} | 17 ++++++++++-- ...WIGTYPE_p_ysk__ClusterEditingInstance.java | 26 +++++++++++++++++++ 6 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Edge.java create mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Node.java rename src/main/java/de/hhu/ba/yoshikoWrapper/swig/{LibraryInterfaceConstants.java => SWIGTYPE_p_std__vectorT_int_t.java} (51%) create mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_ysk__ClusterEditingInstance.java 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 fe8185a..d816447 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java @@ -8,9 +8,27 @@ package de.hhu.ba.yoshikoWrapper.swig; -public class LibraryInterface implements LibraryInterfaceConstants { +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 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 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 String getVersionString() { return LibraryInterfaceJNI.getVersionString(); } + public static SWIGTYPE_p_ysk__ClusterEditingInstance createNewProblemInstance() { + long cPtr = LibraryInterfaceJNI.createNewProblemInstance(); + return (cPtr == 0) ? null : new SWIGTYPE_p_ysk__ClusterEditingInstance(cPtr, false); + } + } 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 c451b04..18089e1 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java @@ -9,6 +9,9 @@ package de.hhu.ba.yoshikoWrapper.swig; public class LibraryInterfaceJNI { - public final static native String YOSHIKO_VERSION_get(); + 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 String getVersionString(); + public final static native long createNewProblemInstance(); } 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_lemon__FullGraph__Edge.java new file mode 100644 index 0000000..edc3020 --- /dev/null +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Edge.java @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 3.0.8 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package de.hhu.ba.yoshikoWrapper.swig; + +public class SWIGTYPE_p_lemon__FullGraph__Edge { + private transient long swigCPtr; + + protected SWIGTYPE_p_lemon__FullGraph__Edge(long cPtr, @SuppressWarnings("unused") boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_lemon__FullGraph__Edge() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_lemon__FullGraph__Edge 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_lemon__FullGraph__Node.java new file mode 100644 index 0000000..99f67e4 --- /dev/null +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_lemon__FullGraph__Node.java @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 3.0.8 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package de.hhu.ba.yoshikoWrapper.swig; + +public class SWIGTYPE_p_lemon__FullGraph__Node { + private transient long swigCPtr; + + protected SWIGTYPE_p_lemon__FullGraph__Node(long cPtr, @SuppressWarnings("unused") boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_lemon__FullGraph__Node() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_lemon__FullGraph__Node obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} + diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__vectorT_int_t.java similarity index 51% rename from src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java rename to src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__vectorT_int_t.java index 2f4b3fd..f7a734e 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__vectorT_int_t.java @@ -8,6 +8,19 @@ package de.hhu.ba.yoshikoWrapper.swig; -public interface LibraryInterfaceConstants { - public final static String YOSHIKO_VERSION = LibraryInterfaceJNI.YOSHIKO_VERSION_get(); +public class SWIGTYPE_p_std__vectorT_int_t { + private transient long swigCPtr; + + protected SWIGTYPE_p_std__vectorT_int_t(long cPtr, @SuppressWarnings("unused") boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_std__vectorT_int_t() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_std__vectorT_int_t obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } } + diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_ysk__ClusterEditingInstance.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_ysk__ClusterEditingInstance.java new file mode 100644 index 0000000..83823e5 --- /dev/null +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_ysk__ClusterEditingInstance.java @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 3.0.8 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package de.hhu.ba.yoshikoWrapper.swig; + +public class SWIGTYPE_p_ysk__ClusterEditingInstance { + private transient long swigCPtr; + + protected SWIGTYPE_p_ysk__ClusterEditingInstance(long cPtr, @SuppressWarnings("unused") boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_ysk__ClusterEditingInstance() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_ysk__ClusterEditingInstance obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} + -- GitLab