Version 1.0.4 uploaded to CRAN,

helske · May 27, 2014 · 1043065 · 1043065
1 parent 5d1d139
commit 1043065
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ src/*.o
 src/*.so
 src/*.dll
 .project
+.settings/org.eclipse.core.resources.prefs
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,13 +1,13 @@
 Package: KFAS
 Version: 1.0.4
-Date: 2014-04-23
+Date: 2014-05-27
 Title: Kalman Filter and Smoother for Exponential Family State Space Models.
 Author: Jouni Helske <jouni.helske@jyu.fi>
 Maintainer: Jouni Helske <jouni.helske@jyu.fi>
 Depends:
     R (>= 3.0.0)
 Imports: stats
-Suggests: MASS, nloptr, testthat
+Suggests: MASS, testthat
 Description: Package KFAS provides functions for Kalman filtering, smoothing,
     forecasting and simulation of multivariate exponential family state space
     models with exact diffuse initialization when distributions of some or all

diff --git a/R/SSMcustom.R b/R/SSMcustom.R
@@ -73,7 +73,8 @@ SSMcustom <- function(Z, T, R, Q, a1, P1, P1inf, index, n) {
                 stop("Misspecified P1inf, argument P1inf must be a (m x m) matrix, where m is the number of states..")
         }
     }    
-
+    diag(P1inf)[diag(P1) > 0 || is.na(diag(P1))] <- 0
+    a1[diag(P1inf) > 0] <- 0
     state_names <- paste0("custom", 1:m)
 
     list(index = index, m = m, k = k, p = p, n = n, Z = Z, T = T, R = R, Q = Q, a1 = a1, P1 = P1, P1inf = P1inf, tvz = dim(Z)[3] >