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 4aea41e0c76496cea7d9bd09ec0b26305a8bc069..10405b5b9b40299055c72e623f2820ae6e561e4b 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java @@ -8,7 +8,7 @@ package de.hhu.ba.yoshikoWrapper.swig; -public class LibraryInterface implements LibraryInterfaceConstants { +public class LibraryInterface { public static SWIGTYPE_p_ysk__ClusterEditingSolutions new_ClusterEditingSolutions() { long cPtr = LibraryInterfaceJNI.new_ClusterEditingSolutions(); return (cPtr == 0) ? null : new SWIGTYPE_p_ysk__ClusterEditingSolutions(cPtr, true); @@ -51,8 +51,8 @@ public class LibraryInterface implements LibraryInterfaceConstants { 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 LibraryInput_addEdge(SWIGTYPE_p_yskInput__LibraryInput self, int sourceID, int targetID, double cost, EdgeType edgeType) { + LibraryInterfaceJNI.LibraryInput_addEdge(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self), sourceID, targetID, cost, edgeType.swigValue()); } public static String getVersionString() { diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java deleted file mode 100644 index 76ea9fd897dd03ec6a77c0d32659d983933ff866..0000000000000000000000000000000000000000 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java +++ /dev/null @@ -1,13 +0,0 @@ -/* ---------------------------------------------------------------------------- - * 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 interface LibraryInterfaceConstants { - public final static int CPXSIZE_BITS = LibraryInterfaceJNI.CPXSIZE_BITS_get(); -} 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 61cf480a878949ab3aa3140475ad76c1b82475db..7b6bc0bd0ebfcf22e568d778e8992c01d9485a44 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java @@ -19,8 +19,7 @@ public class LibraryInterfaceJNI { public final static native long new_LibraryInput(); public final static native void delete_LibraryInput(long jarg1); 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 int CPXSIZE_BITS_get(); + public final static native void LibraryInput_addEdge(long jarg1, int jarg2, int jarg3, double jarg4, int jarg5); public final static native String getVersionString(); public final static native long processLibraryInput(long jarg1); }