A few fixes to v3a

pfmc-assessments · Jan 14, 2015 · 92e3b97 · 92e3b97
1 parent ed82492
commit 92e3b97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/R/Make_Map.R b/R/Make_Map.R
@@ -36,8 +36,8 @@ function( VesselConfig, TmbData, FieldConfig, CovConfig, CovConception, ObsModel
     Map[["gamma2_j"]] = factor(NA)
   }
   if( sum(Q_Config)==0 ){
-    Map[["lambda1_j"]] = factor(NA)
-    Map[["lambda2_j"]] = factor(NA)
+    Map[["lambda1_k"]] = factor(NA)
+    Map[["lambda2_k"]] = factor(NA)
   }
   if(ObsModel%in%c(0,1,2)){
     Map[["logSigmaM"]] = factor( c(1,NA,NA,NA) )

diff --git a/examples/example_for_NWFSC_shelf-slope_data.R b/examples/example_for_NWFSC_shelf-slope_data.R
@@ -84,6 +84,7 @@ DateFile = paste(getwd(),'/',Sys.Date(),'/',sep='')
   Data_Geostat = cbind( Data_Geostat, Data_Extrap[NN_Tmp$nn.idx,c('Depth_km','Depth_km2','E_km','N_km')] )
 
 # Calculate k-means centroids (but only once for all species)
+  setwd( DateFile ) 
   Kmeans = Calc_Kmeans(n_x=n_x, Kmeans_Config=Kmeans_Config, Data_Geostat=Data_Geostat, Data_Extrap=Data_Extrap)
   loc_x = Kmeans$centers