minor bug fixes.

compops · compops · commit a417cd9df46f · 2017-07-05T14:24:35.000+02:00
Former-commit-id: f0c4ddc [formerly f0c4ddc [formerly 53317f8]] Former-commit-id: 0211a78656a94a080a29570d43339887f954ab9a Former-commit-id: 9716b4c
diff --git a/r/example1-lgss.R b/r/example1-lgss.R
@@ -119,7 +119,7 @@ plot(
   col = "#7570B3",
   type = "l",
   xlab = "time",
-  ylab = "difference in state estimate",
+  ylab = "error in state estimate",
   ylim = c(-0.1, 0.1),
   bty = "n"
 )
diff --git a/r/figures/example1-lgss.pdf b/r/figures/example1-lgss.pdf
diff --git a/r/helpers/dataGeneration.R b/r/helpers/dataGeneration.R
@@ -60,4 +60,5 @@ generateData <- function(theta, T, initialState) {
     y[t] <- x[t] + sigmae * rnorm(1)
   }
   
-  list(x = x, y = y)
+  list(x = x, y = y)
+}
diff --git a/r/helpers/parameterEstimation.R b/r/helpers/parameterEstimation.R
@@ -211,6 +211,7 @@ particleMetropolisHastingsSVmodel <- function(y, initialTheta, noParticles, noIt
     
     # Always reject if parameter results in an unstable system
     acceptProbability <- acceptProbability * (abs(thetaProposed[k, 2]) < 1.0)
+    acceptProbability <- acceptProbability * (thetaProposed[k, 3] > 0.0)
     
     # Generate uniform random variable in U[0,1]
     uniformRandomVariable <- runif(1)

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ plot(`
`119`	`119`	`col = "#7570B3",`
`120`	`120`	`type = "l",`
`121`	`121`	`xlab = "time",`
`122`		`- ylab = "difference in state estimate",`
	`122`	`+ ylab = "error in state estimate",`
`123`	`123`	`ylim = c(-0.1, 0.1),`
`124`	`124`	`bty = "n"`
`125`	`125`	`)`
Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,5 @@ generateData <- function(theta, T, initialState) {`
`60`	`60`	`y[t] <- x[t] + sigmae * rnorm(1)`
`61`	`61`	`}`
`62`	`62`
`63`		`- list(x = x, y = y)`
	`63`	`+ list(x = x, y = y)`
	`64`	`+}`