From 2e3eadf38c91258a67bd1bccbf458ec0c0eb5a09 Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Sat, 12 Aug 2017 16:00:15 +0200
Subject: [PATCH] to latest yoshiko
---
.../ba/yoshikoWrapper/swig/LibraryInterface.java | 6 +++---
.../swig/LibraryInterfaceConstants.java | 13 -------------
.../ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java | 3 +--
3 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.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 4aea41e..10405b5 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 76ea9fd..0000000
--- 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 61cf480..7b6bc0b 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);
}
--
GitLab