update some files

inst/stan_files/chunks/id_params.stan

@@ -3,25 +3,31 @@ Chop up the parameter vector to be identified
 By constraining two parameters to almost-fixed values (very low SD)
 */
 real id_params(vector p, array[] int high, array[] int low, 
-                  real fix_high, 
-                  real fix_low,
+                  array[] real fix_high, 
+                  array[] real fix_low,
                   real sd_fix_high,
                   real sd_fix_low,
                   real mean_val,
                   real sd_val) {
 
     int N = num_elements(p);
     real prob_dens = 0; // hold the calculated probability density
+    int fix_high_count = 1;
+    int fix_low_count = 1;
 
     for(n in 1:N) {
 
       if(r_in(n,high)) {
 
-        prob_dens += normal_lpdf(p[n]|fix_high,sd_fix_high);
+        prob_dens += normal_lpdf(p[n]|fix_high[fix_high_count],sd_fix_high);
+
+        fix_high_count = fix_high_count + 1;
 
       } else if(r_in(n,low)) {
 
-        prob_dens += normal_lpdf(p[n]|fix_low,sd_fix_low);
+        prob_dens += normal_lpdf(p[n]|fix_low[fix_low_count],sd_fix_low);
+
+        fix_low_count = fix_low_count + 1;
 
       } else {
 

inst/stan_files/chunks/id_params2.stan

@@ -3,8 +3,8 @@ Chop up the parameter vector to be identified
 By constraining two parameters to almost-fixed values (very low SD)
 */
 real id_params2(vector p, array[] int high, array[] int low, 
-                  real fix_high, 
-                  real fix_low,
+                  array[] real fix_high, 
+                  array[] real fix_low,
                   real sd_fix_high,
                   real sd_fix_low,
                   real mean_val,

inst/stan_files/chunks/map_func.stan

@@ -31,8 +31,8 @@ real partial_sum(array[,] int y_slice,
                  array[] int restrict_high,
                  array[] int restrict_low,
                  int center_cutoff,
-                 real fix_high,
-                 real fix_low,
+                 array[] real fix_high,
+                 array[] real fix_low,
                  real restrict_sd_high,
                  real restrict_sd_low,
                  real discrim_reg_upb,
@@ -133,34 +133,38 @@ real partial_sum(array[,] int y_slice,
 
     // ID parameters
 
+    int to_fix_high = r_in(s, restrict_high);
+    int to_fix_low = r_in(s, restrict_low);
+
 
     if(const_type == 1 && S_type == 1) {
         if(pos_discrim == 0) {
-            if(r_in(s, restrict_high)) {
+
+            if(to_fix_high>0) {
                 if(time_proc == 2) {
-                    real term = normal_lpdf(L_tp1_var[1, s] | fix_high, restrict_sd_high);
+                    real term = normal_lpdf(L_tp1_var[1, s] | fix_high[to_fix_high], restrict_sd_high);
                     log_prob += term;
                     if(debug_mode == 1) print("Added normal_lpdf(L_tp1_var[1,s] | fix_high, restrict_sd_high) to log_prob: ", term);
 
                     term = normal_lpdf(L_full[s] | 0, legis_sd);
                     log_prob += term;
                     if(debug_mode == 1) print("Added normal_lpdf(L_full[s] | 0, legis_sd) to log_prob: ", term);
                 } else {
-                    real term = normal_lpdf(L_full[s] | fix_high, restrict_sd_high);
+                    real term = normal_lpdf(L_full[s] | fix_high[to_fix_high], restrict_sd_high);
                     log_prob += term;
                     if(debug_mode == 1) print("Added normal_lpdf(L_full[s] | fix_high, restrict_sd_high) to log_prob: ", term);
                 }
-            } else if(r_in(s, restrict_low)) {
+            } else if(to_fix_low>0) {
                 if(time_proc == 2) {
-                    real term = normal_lpdf(L_tp1_var[1, s] | fix_low, restrict_sd_low);
+                    real term = normal_lpdf(L_tp1_var[1, s] | fix_low[to_fix_low], restrict_sd_low);
                     log_prob += term;
                     if(debug_mode == 1) print("Added normal_lpdf(L_tp1_var[1, s] | fix_low, restrict_sd_low) to log_prob: ", term);
 
                     term = normal_lpdf(L_full[s] | 0, legis_sd);
                     log_prob += term;
                     if(debug_mode == 1) print("Added normal_lpdf(L_full[s] | 0, legis_sd) to log_prob: ", term);
                 } else {
-                    real term = normal_lpdf(L_full[s] | fix_low, restrict_sd_low);
+                    real term = normal_lpdf(L_full[s] | fix_low[to_fix_low], restrict_sd_low);
                     log_prob += term;
                     if(debug_mode == 1) print("Added normal_lpdf(L_full[s] | fix_low, restrict_sd_low) to log_prob: ", term);
                 }

inst/stan_files/irt_standard_map.stan

@@ -25,13 +25,12 @@ functions {
     return sum( (alpha - 1) .* log(x) + (beta - 1) .* log1m(x) - vec_offset - vec_lbeta);
   }
 
-// #include /chunks/r_in.stan
 int r_in(int pos,array[] int pos_var) {
 
   for (p in 1:(size(pos_var))) {
     if (pos_var[p]==pos) {
       // can return immediately, as soon as find a match
-      return 1;
+      return p;
     }
   }
   return 0;
@@ -91,8 +90,8 @@ data {
   int num_restrict_low; // number of items/persons constrained to be low
   array[num_restrict_high] int restrict_high; // position of high valued fixed parameter
   array[num_restrict_low] int restrict_low; // position of low valued fixed parameter
-  real fix_high; // value to fix high parameter to
-  real fix_low; // value to fix low parameter to
+  array[num_restrict_high] real fix_high; // value to fix high parameter to
+  array[num_restrict_high] real fix_low; // value to fix low parameter to
   real discrim_reg_upb;
   real discrim_reg_lb;
   real discrim_miss_upb;