small changes to Week 7 lecture

njhenry · May 8, 2018 · 3215142 · 3215142
1 parent e5e2dea
commit 3215142
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Week 7 -- spatiotemporal models/Lecture/Lecture 7 -- spatio-temporal models.pptx b/Week 7 -- spatiotemporal models/Lecture/Lecture 7 -- spatio-temporal models.pptx
diff --git a/Week 7 -- spatiotemporal models/Lecture/Lecture_7.R b/Week 7 -- spatiotemporal models/Lecture/Lecture_7.R
@@ -40,3 +40,6 @@ unlist( Report[c('Range','SigmaO','SigmaE')] )
 Cov_Dt = Opt$SD$cov
 Corr_Dt = cov2cor( Cov_Dt )
 
+#
+plot( x=SimList$b_t, y=Opt$SD$value )
+matplot( x=1:SimList$n_years, y=cbind(SimList$b_t/mean(SimList$b_t),Opt$SD$value/mean(Opt$SD$value)), col=c("black","red"), type="l", lwd=2 )
diff --git a/Week 7 -- spatiotemporal models/Lecture/spatial_index_model.cpp b/Week 7 -- spatiotemporal models/Lecture/spatial_index_model.cpp
@@ -1,5 +1,6 @@
 
 #include <TMB.hpp>
+
 // Function for detecting NAs
 template<class Type>
 bool isNA(Type x){
@@ -68,11 +69,11 @@ Type objective_function<Type>::operator() ()
   Type jnll = jnll_comp.sum();
 
   // Derived quantities
-  vector<Type> D_t( n_t );
-  D_t.setZero();
+  vector<Type> b_t( n_t );
+  b_t.setZero();
   for( int t=0; t<n_t; t++){
   for( int s=0; s<n_s; s++){
-    D_t(t) += a_s(s) * exp(log_d_st(s,t));
+    b_t(t) += a_s(s) * exp(log_d_st(s,t));
   }}
 
   // Reporting
@@ -82,8 +83,8 @@ Type objective_function<Type>::operator() ()
   REPORT( SigmaE );
   REPORT( SigmaO );
   REPORT( log_d_st );
-  REPORT( D_t );
-  ADREPORT( D_t );
+  REPORT( b_t );
+  ADREPORT( b_t );
 
   return jnll;
 }