add min_time setting (cap_time -> max_time)

This commit is contained in:
Connor Olding 2018-06-13 00:59:36 +02:00
parent 7cecd57d05
commit b7a9360d6d
2 changed files with 6 additions and 3 deletions

View File

@ -45,7 +45,8 @@ local common_cfg = {
adam_eps = intmap(-1), -- focus on b1 rather than b2.
adam_debias = true,
cap_time = 300,
min_time = 100,
max_time = 300,
timer_loser = 1/2,
decrement_reward = false, -- bad idea, encourages mario to run into goombas.
score_multiplier = 1, -- how much the ingame score influences our rewards.
@ -64,7 +65,8 @@ local cfg = {
starting_world = 0,
starting_level = 1,
--starting_lives = 1,
cap_time = 300,
min_time = 300,
max_time = 300,
deterministic = false, --true,

View File

@ -421,7 +421,8 @@ local function do_reset()
end
end
max_time = min(6 * sqrt(480 / #trial_params * (epoch_i - 1)) + 60, cfg.cap_time)
max_time = 6 * sqrt(480 / #trial_params * (epoch_i - 1)) + 60
max_time = clamp(max_time, cfg.min_time, cfg.max_time)
max_time = ceil(max_time)
-- TODO: game.reset(cfg.starting_lives, cfg.start_big)