From e4cb959730ed5d89c8f5e96de2ddbd405fcf2cc9 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Tue, 21 Nov 2023 11:26:07 +0100 Subject: Adding GEMMA --- scripts/precompute/precompute-hits.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'scripts/precompute/precompute-hits.scm') diff --git a/scripts/precompute/precompute-hits.scm b/scripts/precompute/precompute-hits.scm index d8170db..0bce8d7 100755 --- a/scripts/precompute/precompute-hits.scm +++ b/scripts/precompute/precompute-hits.scm @@ -10,6 +10,7 @@ (gn data hits) (gn data strains) (gn util convert) + (gn runner gemma) (rnrs base) (ice-9 match) (srfi srfi-1) @@ -54,7 +55,7 @@ ) (define (run-precompute db prev-id) - (let* [(hit (get-next-hit-for-precompute db prev-id)) + (let* [(hit (get-precompute-hit db prev-id)) (data-id (assoc-ref hit "DataId")) (data-id-str (int-to-string data-id)) (probesetfreeze-id (assoc-ref hit "ProbeSetFreezeId")) @@ -81,16 +82,14 @@ '() traits)) - (if (= 0 (length non-bxd)) + ;; (if (= 0 (length non-bxd)) + (if (eq? non-bxd '()) (begin - (if name - (display (string-append "WE HAVE OUR BXD DATASET " name " and trait " trait-name " for precompute!\n"))) - (display data-id) - (display traits) - (newline) - - )) - (run-precompute db data-id) + (set-precompute-hit-status! db data-id-str "GEMMA-START") + (run-gemma data-id name trait-name traits))) + ;; disable precompute if non-bxd, for now, so it won't try again + (set-precompute-hit-status! db data-id-str "NON-BXD") + ;;(run-precompute db data-id) )) (run-precompute db 0) ))) -- cgit v1.2.3