From 86134ccf82dcafe338e68c14e483ec98cfc94925 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Tue, 28 Apr 2020 21:31:01 -0700 Subject: struct: preparing for prototype of math library --- sys/libbio/phylo.c | 14 ++++++++++++++ sys/libn/rules.mk | 2 +- sys/rules.mk | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) (limited to 'sys') diff --git a/sys/libbio/phylo.c b/sys/libbio/phylo.c index 4a4bcb1..4bb8f66 100644 --- a/sys/libbio/phylo.c +++ b/sys/libbio/phylo.c @@ -205,3 +205,17 @@ phylo·reroot(bio·Tree *tree, bio·Node *node, double d) tree->root = new; return 0; } + +// ----------------------------------------------------------------------- +// ancestral inference + +struct phylo·InferOpts +{ + int nstates; + double *Q; +}; + +error +phylo·ancestralinfer(bio·Tree *tree, struct phylo·InferOpts opts) +{ +} diff --git a/sys/libn/rules.mk b/sys/libn/rules.mk index 19e4c50..4731558 100644 --- a/sys/libn/rules.mk +++ b/sys/libn/rules.mk @@ -37,7 +37,7 @@ $(LIBS_$(d)): $(OBJS_$(d)) $(ARCHIVE) $(BINS_$(d)): TCLIBS := $(LIBS_$(d)) $(LIB_DIR)/vendor/libz.a -$(BINS_$(d)): $(OBJ_DIR)/libn/test.o +$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/test.o $(LINK) # ---- Pop off stack ---- diff --git a/sys/rules.mk b/sys/rules.mk index d7ca408..aac0aaa 100644 --- a/sys/rules.mk +++ b/sys/rules.mk @@ -11,6 +11,9 @@ include $(DIR)/rules.mk DIR := $(d)/libn include $(DIR)/rules.mk +DIR := $(d)/libmath +include $(DIR)/rules.mk + DIR := $(d)/libbio include $(DIR)/rules.mk -- cgit v1.2.1