Update btllib in RResolver

Author: schutzekatze

RResolver/btllib/extras/java/BloomFilter.java

@@ -101,11 +101,11 @@ public String get_hash_fn() {
   }
 
   public void save(String path) {
-    btllibJNI.BloomFilter_save(swigCPtr, this, path);
+    btllibJNI.BloomFilter_save__SWIG_0(swigCPtr, this, path);
   }
 
-  public static SWIGTYPE_p_std__shared_ptrT_cpptoml__table_t parse_header(SWIGTYPE_p_std__ifstream file, String magic_string) {
-    return new SWIGTYPE_p_std__shared_ptrT_cpptoml__table_t(btllibJNI.BloomFilter_parse_header(SWIGTYPE_p_std__ifstream.getCPtr(file), magic_string), true);
+  public static void save(String path, SWIGTYPE_p_cpptoml__table table, String data, long n) {
+    btllibJNI.BloomFilter_save__SWIG_1(path, SWIGTYPE_p_cpptoml__table.getCPtr(table), data, n);
   }
 
 }

RResolver/btllib/extras/java/DataSink.java

@@ -8,11 +8,12 @@
 
 package btllib;
 
-public class DataSink extends DataStream {
+public class DataSink {
   private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
 
   protected DataSink(long cPtr, boolean cMemoryOwn) {
-    super(btllibJNI.DataSink_SWIGUpcast(cPtr), cMemoryOwn);
+    swigCMemOwn = cMemoryOwn;
     swigCPtr = cPtr;
   }
 
@@ -33,7 +34,6 @@ public synchronized void delete() {
       }
       swigCPtr = 0;
     }
-    super.delete();
   }
 
   public DataSink(String path, boolean append) {

RResolver/btllib/extras/java/DataSource.java

@@ -8,11 +8,12 @@
 
 package btllib;
 
-public class DataSource extends DataStream {
+public class DataSource {
   private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
 
   protected DataSource(long cPtr, boolean cMemoryOwn) {
-    super(btllibJNI.DataSource_SWIGUpcast(cPtr), cMemoryOwn);
+    swigCMemOwn = cMemoryOwn;
     swigCPtr = cPtr;
   }
 
@@ -33,7 +34,6 @@ public synchronized void delete() {
       }
       swigCPtr = 0;
     }
-    super.delete();
   }
 
   public DataSource(String path) {

RResolver/btllib/extras/java/DataStream.java

@@ -8,18 +8,18 @@
 
 package btllib;
 
-public class SWIGTYPE_p_FILE {
+public class SWIGTYPE_p_cpptoml__table {
   private transient long swigCPtr;
 
-  protected SWIGTYPE_p_FILE(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
+  protected SWIGTYPE_p_cpptoml__table(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
     swigCPtr = cPtr;
   }
 
-  protected SWIGTYPE_p_FILE() {
+  protected SWIGTYPE_p_cpptoml__table() {
     swigCPtr = 0;
   }
 
-  protected static long getCPtr(SWIGTYPE_p_FILE obj) {
+  protected static long getCPtr(SWIGTYPE_p_cpptoml__table obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 }

RResolver/btllib/extras/java/ProcessPipelineInternal.java

@@ -108,8 +108,8 @@ public double get_occupancy() {
     return btllibJNI.SeedBloomFilter_get_occupancy(swigCPtr, this);
   }
 
-  public long get_hash_num() {
-    return btllibJNI.SeedBloomFilter_get_hash_num(swigCPtr, this);
+  public long get_total_hash_num() {
+    return btllibJNI.SeedBloomFilter_get_total_hash_num(swigCPtr, this);
   }
 
   public double get_fpr() {
@@ -132,6 +132,10 @@ public long get_hash_num_per_seed() {
     return btllibJNI.SeedBloomFilter_get_hash_num_per_seed(swigCPtr, this);
   }
 
+  public long get_hash_num() {
+    return btllibJNI.SeedBloomFilter_get_hash_num(swigCPtr, this);
+  }
+
   public String get_hash_fn() {
     return btllibJNI.SeedBloomFilter_get_hash_fn(swigCPtr, this);
   }