Merge aa8b48f into af86b99

.travis.yml

@@ -2,11 +2,12 @@ language: julia
 os:
   - linux
 julia:
-  - 0.3
   - 0.4
 notifications:
   email: false
 sudo: false
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.clone(pwd()); Pkg.build("TimeModels"); Pkg.test("TimeModels")'
+  - julia -e 'Pkg.clone(pwd()); Pkg.build("TimeModels"); Pkg.test("TimeModels", coverage=true)'
+after_success:
+  - julia -e 'cd(Pkg.dir("TimeModels")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'

README.md

@@ -1,13 +1,8 @@
 TimeModels.jl
 ============
 [![Build Status](https://travis-ci.org/JuliaStats/TimeModels.jl.svg?branch=master)](https://travis-ci.org/JuliaStats/TimeModels.jl)
-
-[![TimeModels](http://pkg.julialang.org/badges/TimeModels_0.3.svg)](http://pkg.julialang.org/?pkg=TimeModels&ver=0.3)
-[![TimeModels](http://pkg.julialang.org/badges/TimeModels_0.4.svg)](http://pkg.julialang.org/?pkg=TimeModels&ver=0.4)
-
-<!---
 [![Coverage Status](https://coveralls.io/repos/JuliaStats/TimeModels.jl/badge.svg?branch=master)](https://coveralls.io/r/JuliaStats/TimeModels.jl?branch=master)
- --> 
+[![TimeModels](http://pkg.julialang.org/badges/TimeModels_0.4.svg)](http://pkg.julialang.org/?pkg=TimeModels&ver=0.4)
 
 ##A Julia package for modeling time series. 
 
@@ -40,7 +35,7 @@ estimates parameters of univariate normal GARCH process.
 #### arguments:
 data - data vector
 #### returns:
-Structure containing details of the GARCH fit with the fllowing fields:
+Structure containing details of the GARCH fit with the following fields:
 
 * data - orginal data  
 * params - vector of model parameters (omega,alpha,beta)  

REQUIRE

@@ -1,8 +1,5 @@
-julia 0.3 0.5-
-Compat
+julia 0.4 0.5-
 Distributions
 StatsBase
-Dates
 TimeSeries 0.5.11
-NLopt
 Optim

src/TimeModels.jl

@@ -1,16 +1,9 @@
 module TimeModels
 
-if VERSION < v"0.4-"
-        using Dates
-    else
-        using Base.Dates
-end
-
-using Compat
+using Base.Dates
 using Distributions
 using StatsBase
 using TimeSeries 
-using NLopt
 using Optim
 
 import Base: show
@@ -33,9 +26,17 @@ export
   # diagnostic tests exports
   jbtest
 
-include("Kalman.jl")
+# Core functionality
+include("statespacemodel.jl")
+include("kalman_filter.jl")
+include("kalman_smooth.jl")
+include("parameter_estimation.jl")
+
+# Model specifications
 include("ARIMA.jl")
 include("GARCH.jl")
+
+# Tests
 include("diagnostic_tests.jl")
 
 end 

src/kalman_filter.jl

@@ -0,0 +1,74 @@
+type KalmanFiltered{T}
+    filtered::Array{T}
+    predicted::Array{T}
+    error_cov::Array{T}
+    pred_error_cov::Array{T}
+    model::StateSpaceModel
+    y::Array{T}
+    u::Array{T}
+    loglik::T
+end
+
+function show{T}(io::IO, filt::KalmanFiltered{T})
+    n = size(filt.y, 1)
+    dx, dy = filt.model.nx, filt.model.ny
+    println("KalmanFiltered{$T}")
+    println("$n observations, $dx-D process x $dy-D observations")
+    println("Negative log-likelihood: $(filt.loglik)")
+end
+
+function kalman_filter{T}(y::Array{T}, model::StateSpaceModel{T}; u::Array{T}=zeros(size(y,1), model.nu))
+
+    @assert size(u,1) == size(y,1)
+    @assert size(y,2) == model.ny
+    @assert size(u,2) == model.nu
+
+    function kalman_recursions(y_i::Vector{T}, u_i::Vector{T},
+                                  G_i::Matrix{T}, D_i::Matrix{T}, W_i::Matrix{T},
+                                  x_pred_i::Vector{T}, P_pred_i::Matrix{T})
+        if !any(isnan(y_i))
+            innov =  y_i - G_i * x_pred_i - D_i * u_i
+            S = G_i * P_pred_i * G_i' + W_i  # Innovation covariance
+            K = P_pred_i * G_i' / S # Kalman gain
+            x_filt_i = x_pred_i + K * innov
+            P_filt_i = (I - K * G_i) * P_pred_i
+            dll = (dot(innov,S\innov) + logdet(S))/2
+        else
+            x_filt_i = x_pred_i
+            P_filt_i = P_pred_i
+            dll = 0
+        end
+        return x_filt_i, P_filt_i, dll
+    end #kalman_recursions
+
+    y = y'
+    u = u'
+    n = size(y, 2)
+    x_pred = zeros(model.nx, n)
+    x_filt = zeros(x_pred)
+    P_pred = zeros(model.nx, model.nx, n)
+    P_filt = zeros(P_pred)
+    log_likelihood = n*model.ny*log(2pi)/2
+
+    # first iteration
+    F_1 = model.F(1)
+    x_pred[:, 1] = model.x1
+    P_pred[:, :, 1] = model.P1
+    x_filt[:, 1], P_filt[:,:,1], dll = kalman_recursions(y[:, 1], u[:, 1],
+                                            model.G(1), model.D(1), model.W(1),
+                                            model.x1, model.P1)
+    log_likelihood += dll
+
+    for i=2:n
+        F_i1 = model.F(i)
+        x_pred[:, i] =  F_i1 * x_filt[:, i-1] + model.B(i-1) * u[:, i-1]
+        P_pred[:, :, i] = F_i1 * P_filt[:, :, i-1] * F_i1' + model.V(i-1)
+        x_filt[:, i], P_filt[:,:,i], dll = kalman_recursions(y[:, i], u[:, i],
+                                                model.G(i), model.D(i), model.W(i),
+                                                x_pred[:,i], P_pred[:,:,i])
+        log_likelihood += dll
+    end
+
+    return KalmanFiltered(x_filt', x_pred', P_filt, P_pred, model, y', u', log_likelihood)
+end
+