v0.4.1

将reset写进了dcay_func
将Q0写进了lrng_func

简化了主循环的逻辑

Author: yuki-961004

R/func_alpha.R

@@ -5,8 +5,8 @@
 #'
 #' @param shown
 #'  Which options shown in this trial.
-#' @param first
-#'  Is it the first time pick this option?
+#' @param is.fp
+#'  Is it the first time picking this option?
 #' @param qvalue 
 #'  The expected Q values of different behaviors produced by different systems 
 #'    when updated to this trial.
@@ -88,7 +88,7 @@
 #' @section Body: 
 #' \preformatted{func_alpha <- function(
 #'     shown,
-#'     first,
+#'     is.fp,
 #'     qvalue,
 #'     reward,
 #'     utility,
@@ -156,7 +156,7 @@
 #' 
 func_alpha <- function(
     shown,
-    first,
+    is.fp,
     qvalue,
     reward,
     utility,
@@ -181,11 +181,11 @@ func_alpha <- function(
   alphaN    <-  params[["alphaN"]]
   alphaP    <-  params[["alphaP"]]
 
-  if (is.nan(Q0) && first) {
+  if (is.nan(Q0) && is.fp) {
     update <- utility
     hidden[1] <- "first"
     return(list(output = update, hidden = hidden))
-  }
+  } 
 
   # Determine the model currently in use based on which parameters are free.
   if (

R/func_zeta.R

@@ -5,6 +5,8 @@
 #'
 #' @param shown
 #'  Which options shown in this trial.
+#' @param is.nb
+#'  Is it the new block?
 #' @param value0 
 #'  The initial values for all actions.
 #' @param values 
@@ -106,7 +108,15 @@
 #'   
 #'   zeta       <-  params[["zeta"]]
 #'   bonus      <-  params[["bonus"]]
-#'   
+#'   reset      <-  params[["reset"]]
+#'     
+#'   # If reset all Q values 
+#'   if (is.nb && !is.na(reset)) {
+#'     decay <- rep(reset, length(values))
+#'     hidden[6] <- "reset"
+#'     return(list(output = decay, hidden = hidden)) 
+#'   } 
+#' 
 #'   if (reward == 0) {
 #'     decay <- values + zeta * (value0 - values)
 #'   } else if (reward < 0) {
@@ -121,6 +131,7 @@
 #' 
 func_zeta <- function(
     shown,
+    is.nb,
     value0, 
     values,
     reward,
@@ -143,7 +154,15 @@ func_zeta <- function(
 
   zeta       <-  params[["zeta"]]
   bonus      <-  params[["bonus"]]
+  reset      <-  params[["reset"]]
 
+  # If reset all Q values 
+  if (is.nb && !is.na(reset)) {
+    decay <- rep(reset, length(values))
+    hidden[6] <- "reset"
+    return(list(output = decay, hidden = hidden)) 
+  } 
+
   if (reward == 0) {
     decay <- values + zeta * (value0 - values)
   } else if (reward < 0) {

R/process_4_output.R

@@ -237,33 +237,21 @@ process_4_output_r <- function(
     hidden[i + 1, ] <- util_results$hidden 
 
     # 判断是否需要重置：Block是否发生变化
-    if (!is.nan(reset)) {
-      is.nb <- trial[i] == 1
-    } else {
-      is.nb <- FALSE
-    }
-
+    is.nb <- trial[i] == 1
     # 检查此时是否是第一次选(全局第一次 or 局部第一次, 都算)
     is.fp <- count[i, latent[i, ]] == 0
 
     # 多系统更新价值
     for (sub_system in system) {
-      sub_value <- value[[sub_system]]
 
-      # 是否在进入新block时重置
-      if (is.nb) {
-        cur_value <- rep(reset, length(sub_value[i, ]))
-        Qi <- reset
-      } else {
-        cur_value <- sub_value[i, ]
-        Qi <- sub_value[i, latent[i, ]]
-      }
+      sub_value <- value[[sub_system]]
 
       # 工作记忆容量有限导致未被选择选项的价值衰减
       dcay_results <- dcay_func(
         shown = shown[i, ],
+        is.nb = is.nb,
         value0 = sub_value[1, ],
-        values = cur_value,
+        values = sub_value[i, ],
         reward = as.numeric(reward[i, ]),
         utility = as.numeric(utility[i, ]),
         system = sub_system,
@@ -282,13 +270,17 @@ process_4_output_r <- function(
       hidden[i, ] <- dcay_results$hidden 
       hidden[i + 1, ] <- dcay_results$hidden 
 
-      # 当使用dcay_func设定初始值(Q0 = NA_real_)需要从事实第一行读取初始值.
-      if (is.nb) {Qi = sub_value[i + 1, latent[i, ]]}
+      # 从当前行读取Qi
+      Qi = sub_value[i, latent[i, ]]
+      # 如果是新block, 且reset是NA_real而非NaN, 则Qi从新block第一试次读取. 
+      if (is.nb && is.na(reset) && !is.nan(reset)) {
+        Qi = sub_value[i + 1, latent[i, ]]
+      }
 
       # learning rate function: 如果不是第一次选, 则按照学习率方程更新
       lrng_results <- lrng_func(
         shown = shown[i, ],
-        first = is.fp,
+        is.fp = is.fp,
         qvalue = Qi,
         reward = as.numeric(reward[i, ]),
         utility = as.numeric(utility[i, ]),
@@ -318,7 +310,7 @@ process_4_output_r <- function(
     }
 
     # 如果需要重置, 且进入了新block, 则计数器也要归零
-    if (is.nb) {
+    if (is.nb && is.nan(reset)) {
       count[i + 1, ] <- 0
     } else {
       count[i + 1, ] <- count[i, ]

docs/articles/Step_1_run_m.html

@@ -8,7 +8,7 @@ articles:
   Step_2_rcv_d: Step_2_rcv_d.html
   Step_3_fit_p: Step_3_fit_p.html
   Step_4_rpl_e: Step_4_rpl_e.html
-last_built: 2026-04-20T14:40Z
+last_built: 2026-04-21T06:17Z
 urls:
   reference: https://yuki-961004.github.io/multiRL/reference
   article: https://yuki-961004.github.io/multiRL/articles