From b7a9360d6dd7e7809254b07c0155c74f740bf2b0 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Wed, 13 Jun 2018 00:59:36 +0200
Subject: [PATCH] add min_time setting (cap_time -> max_time)

---
 config.lua | 6 ++++--
 main.lua   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config.lua b/config.lua
index 179e830..66ceae4 100644
--- a/config.lua
+++ b/config.lua
@@ -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,
 
diff --git a/main.lua b/main.lua
index f7a929f..6110f28 100644
--- a/main.lua
+++ b/main.lua
@@ -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)