Skip to content

Commit 1c80f72

Browse files
committed
renamed perception noise level parameters
1 parent 01572ee commit 1c80f72

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ There are mainly three use cases this library is designed for:
6161
- "sigma_c": constant (i.e., signal-independent) control noise level [LQG/E-LQG (not used in paper)]
6262
- "sigma_s": observation noise scaling parameter [LQG]
6363
- "sigma_H": proprioceptive position noise level (only used if "include_proprioceptive_endeffector_signals==True") [E-LQG (not used in paper)]
64-
- "sigma_Hdot": visual velocity noise level [E-LQG ("sigma_v" in paper)]
65-
- "sigma_frc": visual force noise level [E-LQG ("sigma_f" in paper)]
64+
- "sigma_Hdot": velocity perception noise level [E-LQG ("sigma_v" in paper)]
65+
- "sigma_frc": force perception noise level [E-LQG ("sigma_f" in paper)]
6666
- "sigma_e": gaze noise level [E-LQG]
67-
- "gamma": visual position noise weight [E-LQG]
67+
- "gamma": position perception noise weight [E-LQG]
6868
- "saccade_times": array of indices that correspond to saccade times; here, this should be [n_s,N] (avoid whitespaces between list entries in command line argument!), with n_s saccade time between initial position and target and N final time step index [E-LQG (see "n_s" in paper)]
6969
- "Delta": observation time lag in time steps (WARNING: experimental!) [LQG/E-LQG (not used in paper)]
7070

ofc4hci.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -748,10 +748,10 @@ def lqg(N, dt, x0_mean, u0, Sigma0, dim, num_targets,
748748
:param sigma_c: constant (i.e., signal-independent) control noise level [float]
749749
:param sigma_s: observation noise scaling parameter (only used for LQG) [float]
750750
:param sigma_H: proprioceptive position noise level (only used for E-LQG, only used if "include_proprioceptive_endeffector_signals==True") [float]
751-
:param sigma_Hdot: visual velocity noise level [sigma_v in paper] (only used for E-LQG) [float]
752-
:param sigma_frc: visual force noise level [sigma_f in paper] (only used for E-LQG) [float]
751+
:param sigma_Hdot: velocity perception noise level [sigma_v in paper] (only used for E-LQG) [float]
752+
:param sigma_frc: force perception noise level [sigma_f in paper] (only used for E-LQG) [float]
753753
:param sigma_e: gaze noise level (only used for E-LQG) [float]
754-
:param gamma: visual position noise weight (only used for E-LQG) [float]
754+
:param gamma: position perception noise weight (only used for E-LQG) [float]
755755
:param passage_times: array of indices that correspond to target passing times in via-point tasks;
756756
at these time steps, distance, velocity, and force costs are applied [num_targets-array]
757757
:param saccade_times: array of indices that correspond to saccade times [see n_s in paper] (only used for E-LQG) [num_targets-array]
@@ -913,10 +913,10 @@ def lqg_initialization(N, dt, dim,
913913
:param sigma_c: constant (i.e., signal-independent) control noise level [float]
914914
:param sigma_s: observation noise scaling parameter (only used for LQG) [float]
915915
:param sigma_H: proprioceptive position noise level (only used for E-LQG, only used if "include_proprioceptive_endeffector_signals==True") [float]
916-
:param sigma_Hdot: visual velocity noise level [sigma_v in paper] (only used for E-LQG) [float]
917-
:param sigma_frc: visual force noise level [sigma_f in paper] (only used for E-LQG) [float]
916+
:param sigma_Hdot: velocity perception noise level [sigma_v in paper] (only used for E-LQG) [float]
917+
:param sigma_frc: force perception noise level [sigma_f in paper] (only used for E-LQG) [float]
918918
:param sigma_e: gaze noise level (only used for E-LQG) [float]
919-
:param gamma: visual position noise weight (only used for E-LQG) [float]
919+
:param gamma: position perception noise weight (only used for E-LQG) [float]
920920
:param passage_times: array of indices that correspond to target passing times in via-point tasks;
921921
at these time steps, distance, velocity, and force costs are applied [num_targets-array]
922922
:param saccade_times: array of indices that correspond to saccade times [see n_s in paper] (only used for E-LQG) [num_targets-array]
@@ -937,7 +937,7 @@ def lqg_initialization(N, dt, dim,
937937
- passage_times: see above (might be set to default values if initially None)
938938
- saccade_times: see above (might be set to default values if initially None)
939939
"""
940-
# INFO: for E-LQG, proprioceptive noise (defined by sigma_H, sigma_e) should be much larger than visual noise (defined by gamma) (following Todorov1998, p.55)
940+
# INFO: for E-LQG, proprioceptive noise (defined by sigma_H, sigma_e) should be much larger than visual noise (e.g., defined by gamma) (following Todorov1998, p.55)
941941

942942
if passage_times is None:
943943
passage_times = np.linspace(0, N, num_targets).astype(int) if num_targets > 1 \
@@ -1397,7 +1397,7 @@ def lqg_solve_control_problem_jerkpenalization(N, dim, num_targets, gamma, sacca
13971397
:param N: number of time steps (excluding final step) [int]
13981398
:param dim: dimension of the task (1D, 2D, or 3D) [int]
13991399
:param num_targets: number of targets [if system_dynamics=="E-LQG": including initial position] (can be used for via-point tasks) [int]
1400-
:param gamma: visual position noise weight (only used for E-LQG) [float]
1400+
:param gamma: position perception noise weight (only used for E-LQG) [float]
14011401
:param saccade_times: array of indices that correspond to saccade times [see n_s in paper] (only used for E-LQG) [num_targets-array]
14021402
:param system_dynamics: which dynamics to use ["LQG" or "E-LQG"]
14031403
:param m: dimension of information vector [int]
@@ -1483,7 +1483,7 @@ def lqg_solve_control_problem(N, dim, num_targets, gamma, saccade_times, system_
14831483
:param N: number of time steps (excluding final step) [int]
14841484
:param dim: dimension of the task (1D, 2D, or 3D) [int]
14851485
:param num_targets: number of targets [if system_dynamics=="E-LQG": including initial position] (can be used for via-point tasks) [int]
1486-
:param gamma: visual position noise weight (only used for E-LQG) [float]
1486+
:param gamma: position perception noise weight (only used for E-LQG) [float]
14871487
:param saccade_times: array of indices that correspond to saccade times [see n_s in paper] (only used for E-LQG) [num_targets-array]
14881488
:param system_dynamics: which dynamics to use ["LQG" or "E-LQG"]
14891489
:param m: dimension of information vector [int]
@@ -1577,7 +1577,7 @@ def lqg_solve_observation_problem(N, dim, num_targets, gamma, saccade_times, sys
15771577
:param N: number of time steps (excluding final step) [int]
15781578
:param dim: dimension of the task (1D, 2D, or 3D) [int]
15791579
:param num_targets: number of targets [if system_dynamics=="E-LQG": including initial position] (can be used for via-point tasks) [int]
1580-
:param gamma: visual position noise weight (only used for E-LQG) [float]
1580+
:param gamma: position perception noise weight (only used for E-LQG) [float]
15811581
:param saccade_times: array of indices that correspond to saccade times [see n_s in paper] (only used for E-LQG) [num_targets-array]
15821582
:param system_matrices: tuple of relevant system matrices (see definition below) that only need to be computed once at the beginning [tuple]
15831583
:param initial_state_matrices: tuple of initial state vectors/matrices (see definition below) that only need to be computed once at the beginning [tuple]
@@ -1755,7 +1755,7 @@ def lqg_forward_simulation(L, Kk, Kcal, Sigma_Ical, Sigma_ecal, Sigma_Icalecal,
17551755
:param n: dimension of state vector [int]
17561756
:param m: dimension of information vector [int]
17571757
:param l: dimension of observation vector [int]
1758-
:param gamma: visual position noise weight (only used for E-LQG) [float]
1758+
:param gamma: position perception noise weight (only used for E-LQG) [float]
17591759
:param saccade_times: array of indices that correspond to saccade times [see n_s in paper] (only used for E-LQG) [num_targets-array]
17601760
:param Delta: observation time lag in time steps (experimental!; default: 0) [int]
17611761
:param minimum_computations: if True, realized costs and other stuff are not computed and printed (useful in optimizations etc.) [bool]

0 commit comments

Comments
 (0)