From d1c15377e355ab77202febaf245136ccfd6281c2 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Mon, 16 Jul 2018 22:37:47 +0000 Subject: [PATCH] Fix init --- Makefile | 3 ++- src/wasm.rs | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fabd8cd..fee4a26 100644 --- a/Makefile +++ b/Makefile @@ -9,5 +9,6 @@ target/sourmash.h: src/lib.rs src/ffi.rs src/errors.rs -rm -rf ${tempdir} wasm: - wasm-pack init + wasm-pack init --mode no-installs + .phony: test diff --git a/src/wasm.rs b/src/wasm.rs index bc91c68..c6660d3 100644 --- a/src/wasm.rs +++ b/src/wasm.rs @@ -16,9 +16,9 @@ impl KmerMinHash { scaled: u32, track_abundance: bool, ) -> KmerMinHash { - if scaled == 0 { - } - let max_hash = if scaled == 0 { + let max_hash = if num != 0 { + 0 + } else if scaled == 0 { u64::max_value() } else { u64::max_value() / scaled as u64 @@ -28,8 +28,13 @@ impl KmerMinHash { } #[wasm_bindgen] - pub fn add_sequence_js(&mut self, buf: &[u8]) { - self.add_sequence(buf, true); + pub fn add_sequence_js(&mut self, buf: &str) { + self.add_sequence(buf.as_bytes(), true); + } + + #[wasm_bindgen] + pub fn add_hash_js(&mut self, h: u64) { + self.add_hash(h); } #[wasm_bindgen]