version 0.6-2.1

cran · Jun 11, 2018 · 025e604 · 025e604
1 parent cb54685
commit 025e604
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,14 +1,19 @@
 Package: etm
 Title: Empirical Transition Matrix
-Version: 0.6-2
+Version: 0.6-2.1
 Author: Arthur Allignol
-Description: Matrix of transition probabilities for any time-inhomogeneous multistate model with finite state space
+Description: Matrix of transition probabilities for any time-inhomogeneous multistate model with finite state space.
 Maintainer: Arthur Allignol <arthur.allignol@uni-ulm.de>
 License: GPL (>= 2)
 Depends: R (>= 2.14), survival
 Imports: lattice
 Suggests: ggplot2, kmi, geepack
-Packaged: 2014-12-09 13:12:40 UTC; arthur
+Packaged: 2018-06-11 10:05:37 UTC; ripley
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2014-12-09 14:57:15
+Date/Publication: 2018-06-11 10:38:30 UTC
+X-CRAN-Comment: Orphaned and corrected on 2018-06-11 as maintainer's
+        email address bounced.
+ .
+ and the other address for Arthur Allignol produced no respose. The
+        'obvious' C++ container error was corrected.
diff --git a/MD5 b/MD5
@@ -1,6 +1,6 @@
 d669fb109b9e87292da9d4201b52c7c9 *ChangeLog
-a90f15f200f43e7d4e7723ef95a37763 *DESCRIPTION
-a0e69954bb848fa110ca164c01c07848 *NAMESPACE
+19e7fdb23e3e5453f071b63e46dab424 *DESCRIPTION
+b370cabe08c50082034b35ef18b337ac *NAMESPACE
 c769759089889310b44037f7e19f70e7 *R/ci.transfo.R
 161631858c05a6977a4d54263bb78266 *R/clos.R
 d139e9461403cfe36837c0439720c1a7 *R/etm.R
@@ -56,7 +56,7 @@ c7061cba7c3e3106b2074ca58beba9fb *man/tra.Rd
 6dd847e3ac794979dce68bc193d7018b *man/trprob_trcov.Rd
 b8d5092f9391804dce102fd1998e28df *man/xyplot.etm.Rd
 c7f5114c2954466b8fda5207bd5c7ee5 *src/cov_dna.c
-4ac9ec1ce02d321c61c28e18fbd49e15 *src/los_etm.cc
+5badeb419fe333c5a5cb7f423855d456 *src/los_etm.cc
 a58cd565dd706afa4346ddd996a82959 *src/matrix.cc
 bef22e0261a86cdd7d4044ac94c550e5 *src/matrix.h
 d4c110cdbcab77b2f6a7b123065726df *src/risk_set_etm.c

diff --git a/NAMESPACE b/NAMESPACE
@@ -17,4 +17,7 @@ S3method(plot, etmCIF)
 S3method(summary, etmCIF)
 S3method(print, summary.etmCIF)
 S3method(ggtransfo, etm)
+importFrom("graphics", "axis", "box", "close.screen", "lines", "par",
+           "plot", "screen", "segments", "split.screen")
+importFrom("stats", "model.extract", "qnorm", "quantile", "terms")
 useDynLib(etm, risk_set_etm, cov_dna, los_cp, los_nocp)
diff --git a/src/los_etm.cc b/src/los_etm.cc
@@ -22,10 +22,10 @@ extern "C" {
 	Array Ma(ma,*rows,*cols,*len );
 
 	Vector Los1(los1, *len);
-	Los1[*len] = *tau;
+	Los1[*len - 1] = *tau;
 
 	Vector Los0(los0,*len);
-	Los0[*len] = *tau;
+	Los0[*len - 1] = *tau;
 
 	Vector Phi2case(phi2case,*len);