changed good r threshold to 0.8

jdbcode · Jan 25, 2016 · cfc4eb6 · cfc4eb6
1 parent 46c349c
commit cfc4eb6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/R/cal_mss_tc_aggregate_model.r b/R/cal_mss_tc_aggregate_model.r
@@ -8,6 +8,10 @@
 
 cal_mss_tc_aggregate_model = function(dir){
 
+  #dir = "K:/test/mss/wrs2/038029/calibration"
+  #overwrite=T
+
+
   #make new directory
   outdir = file.path(dir,"aggregate_model")
   dir.create(outdir, recursive=T, showWarnings=F)
@@ -193,7 +197,7 @@ cal_mss_tc_aggregate_model = function(dir){
       df$r[i] = r
     }
     n_goods = 0
-    thresh = 0.7
+    thresh = 0.8
     while(n_goods < 1){
       goods = which(df$r > thresh)
       n_goods = length(goods)
@@ -212,10 +216,6 @@ cal_mss_tc_aggregate_model = function(dir){
     return(these[2:length(these)])
   }
 
-
-
-
-
   tcbsamps = list.files(dir,"tcb_cal_samp.csv",recursive=T,full.names=T)
   tcgsamps = list.files(dir,"tcg_cal_samp.csv",recursive=T,full.names=T)
   tcwsamps = list.files(dir,"tcw_cal_samp.csv",recursive=T,full.names=T)

diff --git a/R/cal_oli_tc_aggregate_model.r b/R/cal_oli_tc_aggregate_model.r
@@ -7,8 +7,7 @@
 
 
 cal_oli_tc_aggregate_model = function(dir, overwrite=F){
-  #dir = "K:/test/oli/wrs2/038029/calibration"
-  #overwrite=T
+
 
   #make new directory
   outdir = file.path(dir,"aggregate_model")
@@ -168,7 +167,7 @@ cal_oli_tc_aggregate_model = function(dir, overwrite=F){
       df$r[i] = r
     }
     n_goods = 0
-    thresh = 0.7
+    thresh = 0.8
     while(n_goods < 1){
       goods = which(df$r > thresh)
       n_goods = length(goods)