git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/msa@128803 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1,8 +1,8 @@ |
1 | 1 |
Package: msa |
2 | 2 |
Type: Package |
3 | 3 |
Title: Multiple Sequence Alignment |
4 |
-Version: 1.7.1 |
|
5 |
-Date: 2017-03-31 |
|
4 |
+Version: 1.7.2 |
|
5 |
+Date: 2017-04-17 |
|
6 | 6 |
Author: Enrico Bonatesta, Christoph Horejs-Kainrath, Ulrich Bodenhofer |
7 | 7 |
Maintainer: Ulrich Bodenhofer <bodenhofer@bioinf.jku.at> |
8 | 8 |
Description: The 'msa' package provides a unified R/Bioconductor interface to |
... | ... |
@@ -1,6 +1,9 @@ |
1 | 1 |
Change history of package msa: |
2 | 2 |
============================== |
3 | 3 |
|
4 |
+Version 1.7.2: |
|
5 |
+- fix for new clang 4 compiler on Mac OS |
|
6 |
+ |
|
4 | 7 |
Version 1.7.1: |
5 | 8 |
- additional conversions implemented for msaConvert() function |
6 | 9 |
- added a new method msaConsensusSequence() that extends the |
... | ... |
@@ -50,8 +50,10 @@ inline int iround(double x) {return int(floor(x+0.5));} |
50 | 50 |
inline double fmean(double x, double y, double d) { return pow( (pow(x,d)+pow(y,d))/2 ,1./d);} |
51 | 51 |
|
52 | 52 |
// log base 2 |
53 |
-inline float log2(float x) {return (x<=0? (float)(-100000):1.442695041*log(x));} |
|
54 |
-inline float log10(float x) {return (x<=0? (float)(-100000):0.434294481*log(x));} |
|
53 |
+// inline float log2(float x) {return (x<=0? (float)(-100000):1.442695041*log(x));} |
|
54 |
+// inline float log10(float x) {return (x<=0? (float)(-100000):0.434294481*log(x));} |
|
55 |
+#define log2 log2f |
|
56 |
+#define log10 log10f |
|
55 | 57 |
|
56 | 58 |
|
57 | 59 |
///////////////////////////////////////////////////////////////////////////////////// |
... | ... |
@@ -889,6 +889,9 @@ bibliography below). |
889 | 889 |
\section{Change Log} |
890 | 890 |
|
891 | 891 |
\begin{description} |
892 |
+\item[Version 1.7.2:] \mbox{ } \begin{itemize} |
|
893 |
+ \item fix for new \verb+clang+ 4 compiler on Mac OS |
|
894 |
+ \end{itemize} |
|
892 | 895 |
\item[Version 1.7.1:] \mbox{ } \begin{itemize} |
893 | 896 |
\item additional conversions implemented for \verb+msaConvert()+ function |
894 | 897 |
\item added a new method \verb+msaConsensusSequence()+ that extends the |
... | ... |
@@ -925,7 +928,7 @@ bibliography below). |
925 | 928 |
\item[Version 1.3.7:] \mbox{ } \begin{itemize} |
926 | 929 |
\item fixes in \verb+msaPrettyPrint()+ function |
927 | 930 |
\end{itemize} |
928 |
-\item[Version 1.3.6:] \mbox{ } \begin{itemize} |
|
931 |
+\item[Version 1.3.6:] \mbox) { } \begin{itemize} |
|
929 | 932 |
\item \verb+msaPrettyPrint()+ now also accepts dashes in file names |
930 | 933 |
\item added section about pretty-printing wide alignments to package vignette |
931 | 934 |
\end{itemize} |