From ee48d2771f45a210a25cc354d0dbff5f69821f8b Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sun, 3 May 2020 20:34:50 -0700 Subject: removed the day's confusion. added debug and release mode to makefile --- sys/libbio/simulate.c | 1 + sys/libn/rules.mk | 4 ++-- sys/libn/test.c | 50 -------------------------------------------------- 3 files changed, 3 insertions(+), 52 deletions(-) (limited to 'sys') diff --git a/sys/libbio/simulate.c b/sys/libbio/simulate.c index a4567d5..f5489b6 100644 --- a/sys/libbio/simulate.c +++ b/sys/libbio/simulate.c @@ -73,6 +73,7 @@ main() int *loc[aln·N]; uint64 vals[aln·N][NSEQS][aln·L]; uint64 *val[aln·N]; + rng·init(0); seqs[0] = SEQ; diff --git a/sys/libn/rules.mk b/sys/libn/rules.mk index ffb41e4..19e4c50 100644 --- a/sys/libn/rules.mk +++ b/sys/libn/rules.mk @@ -24,7 +24,7 @@ LIBS_$(d) := $(d)/libn.a LIBS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(LIBS_$(d))) LIBS := $(LIBS) $(LIBS_$(d)) -BINS_$(d) := $(d)/test $(d)/scratch +BINS_$(d) := $(d)/test BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d))) BINS := $(BINS) $(BINS_$(d)) @@ -37,7 +37,7 @@ $(LIBS_$(d)): $(OBJS_$(d)) $(ARCHIVE) $(BINS_$(d)): TCLIBS := $(LIBS_$(d)) $(LIB_DIR)/vendor/libz.a -$(BINS_$(d)): $(OBJ_DIR)/libn/scratch.o +$(BINS_$(d)): $(OBJ_DIR)/libn/test.o $(LINK) # ---- Pop off stack ---- diff --git a/sys/libn/test.c b/sys/libn/test.c index 973245f..b52207d 100644 --- a/sys/libn/test.c +++ b/sys/libn/test.c @@ -155,56 +155,6 @@ test·sort() return 0; } -#define HASH(str) hash_string(str) -#define EQUAL(str, str2) (str == str2) - -typedef struct Map -{ - MAP_STRUCT_BODY(byte*, float) -} Map; - -Map* -makemap(mem·Allocator heap, void* h) -{ - MAP_MAKE(Map); -} - -void -mapfree(Map *map) -{ - MAP_FREE(map); -} - -void -mapreset(Map *map) -{ - MAP_RESET(map); -} - -double -mapget(Map *map, byte *key) -{ - MAP_GET(map, key, HASH, EQUAL); -} - -static -error -mapresize(Map *map, int n) -{ - MAP_GROW(map, byte*, float, n, HASH); -} - -static -int -mapput(Map *map, byte *key, float val, error *err) -{ - MAP_PUT(map, key, val, HASH, EQUAL, mapresize, err); -} - - -#undef HASH -#undef EQUAL - error main() { -- cgit v1.2.1