[med-svn] [Git][med-team/mptp][master] 7 commits: New upstream version 0.2.3
Andreas Tille
gitlab at salsa.debian.org
Fri Apr 27 06:18:55 BST 2018
Andreas Tille pushed to branch master at Debian Med / mptp
Commits:
ff0ad8f4 by Andreas Tille at 2018-04-27T07:15:46+02:00
New upstream version 0.2.3
- - - - -
bb448889 by Andreas Tille at 2018-04-27T07:15:46+02:00
Update upstream source from tag 'upstream/0.2.3'
Update to upstream version '0.2.3'
with Debian dir 55bf9abde39cbb0284f65d31534771f5640591a2
- - - - -
58f5f6c2 by Andreas Tille at 2018-04-27T07:15:47+02:00
New upstream version
- - - - -
f9188fa2 by Andreas Tille at 2018-04-27T07:15:54+02:00
Point Vcs fields to salsa.debian.org
- - - - -
6248588e by Andreas Tille at 2018-04-27T07:15:54+02:00
Standards-Version: 4.1.4
- - - - -
aeacc066 by Andreas Tille at 2018-04-27T07:15:55+02:00
debhelper 11
- - - - -
c4852e06 by Andreas Tille at 2018-04-27T07:17:44+02:00
Upload to unstable
- - - - -
15 changed files:
- ChangeLog.md
- README.md
- configure.ac
- debian/changelog
- debian/compat
- debian/control
- man/mptp.1
- src/Makefile.am
- src/auto.c
- + src/hash.c
- + src/list.c
- src/mptp.h
- src/rtree.c
- src/util.c
- src/utree.c
Changes:
=====================================
ChangeLog.md
=====================================
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,11 @@
All notable changes to `mptp` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+## [0.2.3] - 2017-07-25
+### Fixed
+ - Replaced hsearch which was causing problems on APPLE with custom hashtable
+ - Corrected file name in error messages when failing to open files
+
## [0.2.2] - 2017-01-31
### Fixed
- Regular expressions now allow scientific notation when parsing branch lengths
=====================================
README.md
=====================================
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# Species Delimitation
+# Species delimitation using the multi-rate Poisson Tree Processes (mPTP)
[](http://www.gnu.org/licenses/agpl-3.0.en.html)
-[](https://travis-ci.com/Pas-Kapli/mptp)
+[](https://travis-ci.org/Pas-Kapli/mptp)
## Introduction
@@ -59,7 +59,7 @@ On a Debian-based Linux system, the four packages can be installed
using the command
```bash
-sudo apt-get install libgsl0-dev flex bison autotools-dev
+sudo apt-get install libgsl0-dev flex bison autotools-dev autoconf
```
Optionally, you can install the bash auto-completion for mptp. To do that,
@@ -121,6 +121,13 @@ and `doc`. We recommend making a copy or a symbolic link to the mptp binary
to the mptp man page `man/mptp.1` in a folder included in your `$MANPATH`. The
PDF version of the manual is available in `doc/mptp_manual.pdf`.
+## Implementation details and method description
+
+Please see the manuscript for details:
+
+Kapli T, Lutteropp S, Zhang J, Kobert K, Pavlidis P, Stamatakis A, Flouri T. (2016) Multi-rate Poisson tree processes for single-locus species delimitation under maximum likelihood and Markov chain Monte Carlo. Bioinformatics 33(11):1630-1638. doi:[10.1093/bioinformatics/btx025](https://doi.org/10.1093/bioinformatics/btx025)
+
+
## Command-line options
@@ -193,30 +200,30 @@ The code is currently licensed under the [GNU Affero General Public License vers
## Code
- File | Description
---------------------|----------------
-**arch.c** | Architecture specific code (Mac/Linux).
-**auto.c** | Code for auto-detecting minimum branch length.
-**aic.c** | Code for Bayesian Single- and multi-rate PTP.
-**mptp.c** | Main file handling command-line parameters and executing corresponding parts.
-**mptp.h** | MPTP Header file.
-**dp.c** | Single- and multi-rate DP heuristics for solving the PTP problem.
-**fasta.c** | Code for reading FASTA files.
-**lex_rtree.l** | Lexical analyzer parsing newick rooted trees.
-**lex_utree.l** | Lexical analyzer parsing newick unrooted trees.
-**likelihood.c** | Likelihood rated functions.
-**Makefile.am** | Automake file for generating Makefile.in.
-**maps.c** | Character mapping arrays for converting sequences to the internal representation.
-**multirun.c** | Functions to execute multiple MCMC runs and compute ASD of support values.
-**output.c** | Output related files.
-**parse_rtree.y** | Functions for parsing rooted trees in newick format.
-**parse_utree.y** | Functions for parsing unrooted trees in newick format.
-**random.c** | Functions for creating a random delimitation.
-**rtree.c** | Rooted tree manipulation functions.
-**svg.c** | SVG visualization of delimited tree.
-**svg_landscape.c** | SVG visualization of likelihood landscape.
-**util.c** | Various common utility functions.
-**utree.c** | Unrooted tree manipulation functions.
+| File | Description |
+| --------------------| --------------------------------------------------------------------------------- |
+| **arch.c** | Architecture specific code (Mac/Linux). |
+| **auto.c** | Code for auto-detecting minimum branch length. |
+| **aic.c** | Code for Bayesian Single- and multi-rate PTP. |
+| **mptp.c** | Main file handling command-line parameters and executing corresponding parts. |
+| **mptp.h** | MPTP Header file. |
+| **dp.c** | Single- and multi-rate DP heuristics for solving the PTP problem. |
+| **fasta.c** | Code for reading FASTA files. |
+| **lex_rtree.l** | Lexical analyzer parsing newick rooted trees. |
+| **lex_utree.l** | Lexical analyzer parsing newick unrooted trees. |
+| **likelihood.c** | Likelihood rated functions. |
+| **Makefile.am** | Automake file for generating Makefile.in. |
+| **maps.c** | Character mapping arrays for converting sequences to the internal representation. |
+| **multirun.c** | Functions to execute multiple MCMC runs and compute ASD of support values. |
+| **output.c** | Output related files. |
+| **parse_rtree.y** | Functions for parsing rooted trees in newick format. |
+| **parse_utree.y** | Functions for parsing unrooted trees in newick format. |
+| **random.c** | Functions for creating a random delimitation. |
+| **rtree.c** | Rooted tree manipulation functions. |
+| **svg.c** | SVG visualization of delimited tree. |
+| **svg_landscape.c** | SVG visualization of likelihood landscape. |
+| **util.c** | Various common utility functions. |
+| **utree.c** | Unrooted tree manipulation functions. |
## The team
@@ -228,6 +235,12 @@ The code is currently licensed under the [GNU Affero General Public License vers
* Alexandros Stamatakis
* Tomáš Flouri
+## Citing mPTP
+
+Please cite the following publication if you use mPTP:
+
+Kapli T, Lutteropp S, Zhang J, Kobert K, Pavlidis P, Stamatakis A, Flouri T. (2016) Multi-rate Poisson tree processes for single-locus species delimitation under maximum likelihood and Markov chain Monte Carlo. Bioinformatics 33(11):1630-1638. doi:[10.1093/bioinformatics/btx025](https://doi.org/10.1093/bioinformatics/btx025)
+
# References
* Zhang J., Kapli P., Pavlidis P., Stamatakis A. (2013)
=====================================
configure.ac
=====================================
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
-AC_INIT([mptp], [0.2.2], [Tomas.Flouri at h-its.org])
+AC_INIT([mptp], [0.2.3], [Tomas.Flouri at h-its.org])
AM_INIT_AUTOMAKE([subdir-objects])
AC_LANG([C])
AC_CONFIG_SRCDIR([src/mptp.c])
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mptp (0.2.3-1) unstable; urgency=medium
+
+ * New upstream version
+ * Point Vcs fields to salsa.debian.org
+ * Standards-Version: 4.1.4
+ * debhelper 11
+
+ -- Andreas Tille <tille at debian.org> Fri, 27 Apr 2018 07:15:55 +0200
+
mptp (0.2.2-2) unstable; urgency=medium
* Do not try parallel builds since makefile is not properly generated
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
bison,
flex,
libgsl-dev,
pkg-config,
bash-completion
-Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/mptp.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/mptp.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/mptp
+Vcs-Git: https://salsa.debian.org/med-team/mptp.git
Homepage: https://github.com/Pas-Kapli/mptp
Package: mptp
=====================================
man/mptp.1
=====================================
--- a/man/mptp.1
+++ b/man/mptp.1
@@ -351,5 +351,8 @@ Fixed regular expressions to allow scientific notation for branch lengths when
parsing trees. Improved the accuracy of ASV score by also taking into account
tips forming coalescent roots. Fixed memory leaks that occur when parsing
incorrectly formatted trees.
+.TP
+.BR v0.2.3\~ "released July 25th, 2017"
+Replaced hsearch() with custom hashtable. Fixed minor output error messages.
.RE
.LP
=====================================
src/Makefile.am
=====================================
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,4 +26,6 @@ rtree.c \
svg.c \
svg_landscape.c \
util.c \
-utree.c
+utree.c \
+hash.c \
+list.c
=====================================
src/auto.c
=====================================
--- a/src/auto.c
+++ b/src/auto.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2015 Tomas Flouri
+ Copyright (C) 2015-2017 Tomas Flouri
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -159,30 +159,6 @@ static int cb_short_trees(rtree_t * node)
}
-static void hash_tips(rtree_t * root)
-{
- int i;
-
- /* obtain an array of pointers to tip names */
- rtree_t ** tipnodes = (rtree_t **)xmalloc((size_t)(root->leaves) *
- sizeof(rtree_t *));
- rtree_query_tipnodes(root, tipnodes);
-
- /* create a libc hash table of size tip_count */
- hcreate(2*(size_t)(root->leaves));
-
- /* populate a libc hash table with tree tip labels */
- for (i = 0; i < root->leaves; ++i)
- {
- ENTRY entry;
- entry.key = tipnodes[i]->label;
- entry.data = (void *)(tipnodes[i]);
- hsearch(entry, ENTER);
- }
- free(tipnodes);
-}
-
-
static void set_encode_sequence(rtree_t * node,
char * sequence,
long seqlen,
@@ -211,22 +187,47 @@ static void link_sequences(rtree_t * root, char ** headers, char ** sequence, lo
{
int i;
+ /* obtain an array of pointers to tip names */
+ rtree_t ** tipnodes = (rtree_t **)xmalloc((size_t)(root->leaves) *
+ sizeof(rtree_t *));
+ rtree_query_tipnodes(root, tipnodes);
+
+ /* create a libc hash table of size tip_count */
+ hashtable_t * ht = hashtable_create(root->leaves);
+
+ /* populate a libc hash table with tree tip labels */
for (i = 0; i < root->leaves; ++i)
{
- ENTRY query;
-// printf("Linking %s\n", headers[i]);
- query.key = headers[i];
- ENTRY * found = NULL;
+ pair_t * pair = (pair_t *)xmalloc(sizeof(pair_t));
+ pair->label = tipnodes[i]->label;
+ pair->index = i;
- found = hsearch(query,FIND);
+ if (!hashtable_insert(ht,
+ (void *)pair,
+ hash_fnv(tipnodes[i]->label),
+ hashtable_paircmp))
+ fatal("Duplicate taxon (%s)\n", tipnodes[i]->label);
- if (!found)
+ }
+
+ for (i = 0; i < root->leaves; ++i)
+ {
+ pair_t * query = hashtable_find(ht,
+ headers[i],
+ hash_fnv(headers[i]),
+ hashtable_paircmp);
+
+
+ if (!query)
fatal("Sequence with header %s does not appear in the tree", headers[i]);
- set_encode_sequence((rtree_t *)(found->data), sequence[i], seqlen, pll_map_nt);
+ set_encode_sequence(tipnodes[query->index], sequence[i], seqlen, pll_map_nt);
}
-}
+ free(tipnodes);
+
+ hashtable_destroy(ht,free);
+}
static int all_pairwise_dist(rtree_t ** tip_node_list, int tip_list_count, long seqlen)
{
@@ -263,14 +264,9 @@ void detect_min_bl(rtree_t * rtree)
seqlen = load_fasta(rtree->leaves, headers, seqdata);
- hash_tips(rtree);
-
/* find sequences in hash table and link them with the corresponding taxa */
link_sequences(rtree, headers, seqdata, seqlen);
- /* destroy hash table */
- hdestroy();
-
/* get inner nodes that are roots of of the largest short subtrees. Short are
such subtrees where all branch lengths within them are less or equal to
opt_subtree_short. The largest such subtrees are those that are not
=====================================
src/hash.c
=====================================
--- /dev/null
+++ b/src/hash.c
@@ -0,0 +1,180 @@
+/*
+ Copyright (C) 2015-2017 Tomas Flouri
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Contact: Tomas Flouri <Tomas.Flouri at h-its.org>,
+ Heidelberg Institute for Theoretical Studies,
+ Schloss-Wolfsbrunnenweg 35, D-69118 Heidelberg, Germany
+*/
+
+#include "mptp.h"
+
+
+/* Daniel J. Bernstein 2a hash function */
+unsigned long hash_djb2a(char * s)
+{
+ unsigned long hash = 5381;
+ unsigned long c;
+
+ while ((c = (unsigned long)*s++))
+ hash = ((hash << 5) + hash) ^ c; /* hash*33 ^ c */
+
+ return hash;
+}
+
+/* Fowler–Noll–Vo 1a hash function */
+unsigned long hash_fnv(char * s)
+{
+ unsigned long hash = 14695981039346656037UL;
+ unsigned long c;
+
+ while ((c = (unsigned long)*s++))
+ {
+ hash ^= c;
+ hash *= 1099511628211UL;
+ }
+
+ return hash;
+}
+
+static ht_item_t * hashitem_create(unsigned long key, void * value)
+{
+ ht_item_t * hi = (ht_item_t *)xmalloc(sizeof(ht_item_t));
+
+ hi->key = key;
+ hi->value = value;
+
+ return hi;
+}
+
+int hashtable_strcmp(void * x, void * y)
+{
+ return !strcmp((char *)x, (char *)y);
+}
+
+int hashtable_ptrcmp(void * x, void * y)
+{
+ return (x == y);
+}
+
+int hashtable_paircmp(void * stored, void * query)
+{
+ pair_t * stored_pair = (pair_t *)stored;
+ char * query_label = (char *)query;
+
+ return !strcmp(stored_pair->label, query_label);
+}
+
+void * hashtable_find(hashtable_t * ht,
+ void * x,
+ unsigned long hash,
+ int (*cb_cmp)(void *, void *))
+{
+ unsigned long index = hash & (ht->table_size-1);
+ list_item_t * li = (list_item_t *)(ht->entries[index]->head);
+
+ while (li)
+ {
+ ht_item_t * hi = (ht_item_t *)(li->data);
+
+ if ((hash == hi->key) && cb_cmp(hi->value, x))
+ return hi->value;
+
+ li = li->next;
+ }
+
+ return NULL;
+}
+
+
+hashtable_t * hashtable_create(unsigned long items_count)
+{
+ unsigned long i;
+ unsigned long size = 1;
+
+ if (!items_count) return NULL;
+
+ /* compute a size of at least double the items count that is a
+ multiple of 2 */
+ items_count <<= 1;
+ while (size < items_count)
+ size <<= 1;
+
+ /* allocate and init hash table */
+ hashtable_t * ht = (hashtable_t *)xmalloc(sizeof(hashtable_t));
+ ht->table_size = size;
+ ht->entries_count = 0;
+
+ /* allocate and init entries array */
+ ht->entries = (list_t **)xmalloc(size*sizeof(list_t *));
+ for (i = 0; i < size; ++i)
+ {
+ ht->entries[i] = (list_t *)xmalloc(sizeof(list_t));
+ memset(ht->entries[i], 0, sizeof(list_t));
+ }
+
+ return ht;
+}
+
+int hashtable_insert(hashtable_t * ht,
+ void * x,
+ unsigned long hash,
+ int (*cb_cmp)(void *, void *))
+{
+ /* size is always a multiple of 2 and greater than 2 */
+ unsigned long index = hash & (ht->table_size-1);
+
+ list_t * list = ht->entries[index];
+
+
+ if (hashtable_find(ht, x, hash, cb_cmp))
+ return 0;
+
+ ht_item_t * item = hashitem_create(hash,x);
+ list_append(list, item);
+
+ ht->entries_count++;
+
+ return 1;
+}
+
+void hashtable_destroy(hashtable_t * ht, void (*cb_dealloc)(void *))
+{
+ unsigned long i;
+
+ if (cb_dealloc)
+ {
+ for (i = 0; i < ht->table_size; ++i)
+ {
+ list_t * list = ht->entries[i];
+
+ list_item_t * head = list->head;
+ while (head)
+ {
+ ht_item_t * hi = (ht_item_t *)(head->data);
+ cb_dealloc(hi->value);
+ head = head->next;
+ }
+ }
+ }
+
+ for (i = 0; i < ht->table_size; ++i)
+ {
+ list_clear(ht->entries[i], free);
+ free(ht->entries[i]);
+ }
+ free(ht->entries);
+ free(ht);
+}
=====================================
src/list.c
=====================================
--- /dev/null
+++ b/src/list.c
@@ -0,0 +1,98 @@
+/*
+ Copyright (C) 2015 Tomas Flouri
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Contact: Tomas Flouri <Tomas.Flouri at h-its.org>,
+ Heidelberg Institute for Theoretical Studies,
+ Schloss-Wolfsbrunnenweg 35, D-69118 Heidelberg, Germany
+*/
+
+#include "mptp.h"
+
+#define DEF_LIST_APPEND 0
+#define DEF_LIST_PREPEND 1
+
+static int list_insert(list_t * list, void * data, int where)
+{
+ if (!list) return 0;
+
+ /* create list item */
+ list_item_t * item = (list_item_t *)xmalloc(sizeof(list_item_t));
+ item->data = data;
+
+ /* if list is empty */
+ if (!(list->count))
+ {
+ list->head = list->tail = item;
+ list->count = 1;
+ item->next = NULL;
+ return 1;
+ }
+
+ /* append */
+ if (where == DEF_LIST_APPEND)
+ {
+ list->tail->next = item;
+ list->tail = item;
+ item->next = NULL;
+ list->count++;
+ return 1;
+ }
+
+ /* prepend */
+ item->next = list->head;
+ list->head = item;
+ list->count++;
+
+ return 1;
+}
+
+void list_append(list_t * list, void * data)
+{
+ list_insert(list, data, DEF_LIST_APPEND);
+}
+
+void list_prepend(list_t * list, void * data)
+{
+ list_insert(list, data, DEF_LIST_PREPEND);
+}
+
+void list_clear(list_t * list, void (*cb_dealloc)(void *))
+{
+ if (!list) return;
+
+ list_item_t * head = list->head;
+
+ while (head)
+ {
+ list_item_t * temp = head;
+ head = head->next;
+ if (cb_dealloc)
+ cb_dealloc(temp->data);
+ free(temp);
+ }
+
+ list->head = list->tail = NULL;
+ list->count = 0;
+}
+
+list_t * list_create(void * data)
+{
+ list_t * list = (list_t *)xmalloc(sizeof(list_t));
+ list->count = 0;
+ list_append(list, data);
+
+ return list;
+}
=====================================
src/mptp.h
=====================================
--- a/src/mptp.h
+++ b/src/mptp.h
@@ -177,6 +177,38 @@ typedef struct pll_fasta
long stripped[256];
} pll_fasta_t;
+typedef struct list_item_s
+{
+ void * data;
+ struct list_item_s * next;
+} list_item_t;
+
+typedef struct list_s
+{
+ list_item_t * head;
+ list_item_t * tail;
+ long count;
+} list_t;
+
+typedef struct ht_item_s
+{
+ unsigned long key;
+ void * value;
+} ht_item_t;
+
+typedef struct hashtable_s
+{
+ unsigned long table_size;
+ unsigned long entries_count;
+ list_t ** entries;
+} hashtable_t;
+
+typedef struct pair_s
+{
+ char * label;
+ int index;
+} pair_t;
+
/* macros */
#define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -313,9 +345,6 @@ rtree_t * rtree_clone(rtree_t * node, rtree_t * parent);
int rtree_traverse_postorder(rtree_t * root,
int (*cbtrav)(rtree_t *),
rtree_t ** outbuffer);
-rtree_t ** rtree_tipstring_nodes(rtree_t * root,
- char * tipstring,
- unsigned int * tiplist_count);
rtree_t * get_outgroup_lca(rtree_t * root);
rtree_t * rtree_lca(rtree_t * root,
rtree_t ** tip_nodes,
@@ -417,3 +446,40 @@ void aic_mcmc(rtree_t * tree,
long seed,
double * mcmc_min_logl,
double * mcmc_max_logl);
+
+/* functions in hash.c */
+
+unsigned long hash_djb2a(char * s);
+
+unsigned long hash_fnv(char * s);
+
+int hashtable_strcmp(void * x, void * y);
+
+int hashtable_ptrcmp(void * x, void * y);
+
+int hashtable_paircmp(void * stored, void * query);
+
+void * hashtable_find(hashtable_t * ht,
+ void * x,
+ unsigned long hash,
+ int (*cb_cmp)(void *, void *));
+
+hashtable_t * hashtable_create(unsigned long items_count);
+
+int hashtable_insert(hashtable_t * ht,
+ void * x,
+ unsigned long hash,
+ int (*cb_cmp)(void *, void *));
+
+
+/* functions in list.c */
+
+void list_append(list_t * list, void * data);
+
+void list_prepend(list_t * list, void * data);
+
+void list_clear(list_t * list, void (*cb_dealloc)(void *));
+
+list_t * list_create(void * data);
+
+void hashtable_destroy(hashtable_t * ht, void (*cb_dealloc)(void *));
=====================================
src/rtree.c
=====================================
--- a/src/rtree.c
+++ b/src/rtree.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2015 Tomas Flouri
+ Copyright (C) 2015-2017 Tomas Flouri
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -427,9 +427,9 @@ rtree_t * rtree_clone(rtree_t * node, rtree_t * parent)
return clone;
}
-rtree_t ** rtree_tipstring_nodes(rtree_t * root,
- char * tipstring,
- unsigned int * tiplist_count)
+static rtree_t ** rtree_tipstring_nodes(rtree_t * root,
+ char * tipstring,
+ unsigned int * tiplist_count)
{
size_t i;
unsigned int k;
@@ -438,8 +438,6 @@ rtree_t ** rtree_tipstring_nodes(rtree_t * root,
char * taxon;
unsigned long taxon_len;
- ENTRY * found = NULL;
-
for (i = 0; i < strlen(tipstring); ++i)
if (tipstring[i] == ',')
commas_count++;
@@ -452,14 +450,19 @@ rtree_t ** rtree_tipstring_nodes(rtree_t * root,
sizeof(rtree_t *));
/* create a hashtable of tip labels */
- hcreate(2 * (size_t)(root->leaves));
+ hashtable_t * ht = hashtable_create(root->leaves);
for (i = 0; i < (unsigned int)(root->leaves); ++i)
{
- ENTRY entry;
- entry.key = node_list[i]->label;
- entry.data = node_list[i];
- hsearch(entry,ENTER);
+ pair_t * pair = (pair_t *)xmalloc(sizeof(pair_t));
+ pair->label = node_list[i]->label;
+ pair->index = i;
+
+ if (!hashtable_insert(ht,
+ (void *)pair,
+ hash_fnv(node_list[i]->label),
+ hashtable_paircmp))
+ fatal("Duplicate taxon (%s)\n", node_list[i]->label);
}
char * s = tipstring;
@@ -475,16 +478,16 @@ rtree_t ** rtree_tipstring_nodes(rtree_t * root,
taxon = xstrndup(s, taxon_len);
/* search tip in hash table */
- ENTRY query;
- query.key = taxon;
- found = NULL;
- found = hsearch(query,FIND);
+ pair_t * query = hashtable_find(ht,
+ taxon,
+ hash_fnv(taxon),
+ hashtable_paircmp);
- if (!found)
+ if (!query)
fatal("Taxon %s in does not appear in the tree", taxon);
/* store pointer in output list */
- out_node_list[k++] = (rtree_t *)(found->data);
+ out_node_list[k++] = node_list[query->index];
/* free tip label, and move to the beginning of next tip if available */
free(taxon);
@@ -494,7 +497,7 @@ rtree_t ** rtree_tipstring_nodes(rtree_t * root,
}
/* kill the hash table */
- hdestroy();
+ hashtable_destroy(ht,free);
free(node_list);
=====================================
src/util.c
=====================================
--- a/src/util.c
+++ b/src/util.c
@@ -165,7 +165,7 @@ FILE * xopen(const char * filename, const char * mode)
{
FILE * out = fopen(filename, mode);
if (!out)
- fatal("Cannot open file %s", opt_outfile);
+ fatal("Cannot open file %s", filename);
return out;
}
=====================================
src/utree.c
=====================================
--- a/src/utree.c
+++ b/src/utree.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2015 Tomas Flouri
+ Copyright (C) 2015-2017 Tomas Flouri
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -471,8 +471,6 @@ static utree_t ** utree_tipstring_nodes(utree_t * root,
char * taxon;
size_t taxon_len;
- ENTRY * found = NULL;
-
for (i = 0; i < strlen(tipstring); ++i)
if (tipstring[i] == ',')
commas_count++;
@@ -485,14 +483,19 @@ static utree_t ** utree_tipstring_nodes(utree_t * root,
sizeof(utree_t *));
/* create a hashtable of tip labels */
- hcreate(2 * (size_t)utree_tip_count);
+ hashtable_t * ht = hashtable_create(utree_tip_count);
for (i = 0; i < (unsigned int)utree_tip_count; ++i)
{
- ENTRY entry;
- entry.key = node_list[i]->label;
- entry.data = node_list[i];
- hsearch(entry,ENTER);
+ pair_t * pair = (pair_t *)xmalloc(sizeof(pair_t));
+ pair->label = node_list[i]->label;
+ pair->index = i;
+
+ if (!hashtable_insert(ht,
+ (void *)pair,
+ hash_fnv(node_list[i]->label),
+ hashtable_paircmp))
+ fatal("Duplicate taxon (%s)\n", node_list[i]->label);
}
char * s = tipstring;
@@ -508,16 +511,16 @@ static utree_t ** utree_tipstring_nodes(utree_t * root,
taxon = xstrndup(s, taxon_len);
/* search tip in hash table */
- ENTRY query;
- query.key = taxon;
- found = NULL;
- found = hsearch(query,FIND);
+ pair_t * query = hashtable_find(ht,
+ taxon,
+ hash_fnv(taxon),
+ hashtable_paircmp);
- if (!found)
+ if (!query)
fatal("Taxon %s does not appear in the tree", taxon);
/* store pointer in output list */
- out_node_list[k++] = (utree_t *)(found->data);
+ out_node_list[k++] = node_list[query->index];
/* free tip label, and move to the beginning of next tip if available */
free(taxon);
@@ -527,7 +530,7 @@ static utree_t ** utree_tipstring_nodes(utree_t * root,
}
/* kill the hash table */
- hdestroy();
+ hashtable_destroy(ht,free);
free(node_list);
View it on GitLab: https://salsa.debian.org/med-team/mptp/compare/caa77e5dfdaeb2df7aaaf11eb839a571f6fad3c6...c4852e06e9999611de1cd87fd803f77ae8d5a851
---
View it on GitLab: https://salsa.debian.org/med-team/mptp/compare/caa77e5dfdaeb2df7aaaf11eb839a571f6fad3c6...c4852e06e9999611de1cd87fd803f77ae8d5a851
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180427/08f2a7dd/attachment-0001.html>
More information about the debian-med-commit
mailing list