diff options
| -rw-r--r-- | gn/data/strains.scm | 2 | ||||
| -rwxr-xr-x | scripts/precompute/list-traits-to-compute.scm | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gn/data/strains.scm b/gn/data/strains.scm index 06255e3..e5f839b 100644 --- a/gn/data/strains.scm +++ b/gn/data/strains.scm @@ -41,6 +41,8 @@ used-for-mapping? will say whether the strains/individuals are used for mapping. (define* (bxd-strain-id-names #:key (used-for-mapping? #f)) "Return assoc list of tuples of strain id + names. Same as strain-id-names, but just for the BXD. +Note that the parents are included - even if we don't use those for mapping. + used-for-mapping? will say whether the strains/individuals are used for mapping. Always True, FIXME" (filter (lambda (l) l) (map (lambda (l) diff --git a/scripts/precompute/list-traits-to-compute.scm b/scripts/precompute/list-traits-to-compute.scm index 07f5c9c..1fb44c9 100755 --- a/scripts/precompute/list-traits-to-compute.scm +++ b/scripts/precompute/list-traits-to-compute.scm @@ -89,7 +89,7 @@ When that is the case we might as well write the phenotype file because we have (call-with-db (lambda (db) (begin - (let [(bxd-strains (memo-bxd-strain-id-names #:used-for-mapping? #t))] + ;; (let [(bxd-strains (memo-bxd-strain-id-names #:used-for-mapping? #t))] (define (run-list-traits-to-compute db num prev-id) (let* [(count (if (< batch-size num) batch-size @@ -116,7 +116,7 @@ When that is the case we might as well write the phenotype file because we have (has-lst (assoc-ref nrecs data-id)) (lst (if has-lst (acons strain-id value has-lst) - '()) + `((,strain-id . ,value))) )] (set! nrecs (assoc-set! nrecs data-id lst)))) id-traits) @@ -130,8 +130,7 @@ When that is the case we might as well write the phenotype file because we have (run-list-traits-to-compute db rest (first (reverse data-ids)))) ;; start precompute ))) (run-list-traits-to-compute db num first-id) ;; start precompute - ;; (write bxd-strains) - ))))) + )))) (define (main args) |