Clean up requires

codeaudit · Aug 14, 2016 · c648b5e · c648b5e
1 parent 0010e27
commit c648b5e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/Master.lua b/Master.lua
@@ -51,7 +51,10 @@ function Master:_init(opt)
   end
 
   -- Start gaming
-  log.info('Starting game: ' .. opt.game)
+  log.info('Starting ' .. opt.env)
+  if opt.game then
+    log.info('Starting game: ' .. opt.game)
+  end
   local state = self.env:start()
 
   -- Set up display (if available)

diff --git a/examples/GridWorldNet.lua b/examples/GridWorldNet.lua
@@ -1,24 +1,15 @@
 local nn = require 'nn'
-local nninit = require 'nninit'
 require 'classic.torch' -- Enables serialisation
---require 'rnn'
---require 'dpnn' -- Adds gradParamClip method
 
 local Body = classic.class('Body')
 
 -- Constructor
 function Body:_init(opts)
   opts = opts or {}
-
-  --self.recurrent = opts.recurrent
-  --self.histLen = opts.histLen
-  --self.stateSpec = opts.stateSpec
 end
 
 function Body:createBody()
-  local net
-
-  net = nn.Sequential()
+  local net = nn.Sequential()
   net:add(nn.View(2))
   net:add(nn.Linear(2, 32))
   net:add(nn.ReLU(true))

diff --git a/models/Atari.lua b/models/Atari.lua
@@ -1,8 +1,5 @@
 local nn = require 'nn'
-local nninit = require 'nninit'
 require 'classic.torch' -- Enables serialisation
-require 'rnn'
-require 'dpnn' -- Adds gradParamClip method
 
 local Body = classic.class('Body')
 
@@ -18,9 +15,7 @@ end
 function Body:createBody()
   -- Number of input frames for recurrent networks is always 1
   local histLen = self.recurrent and 1 or self.histLen
-  local net
-
-  net = nn.Sequential()
+  local net = nn.Sequential()
   net:add(nn.View(histLen*self.stateSpec[2][1], self.stateSpec[2][2], self.stateSpec[2][3])) -- Concatenate history in channel dimension
   net:add(nn.SpatialConvolution(histLen*self.stateSpec[2][1], 32, 8, 8, 4, 4, 1, 1))
   net:add(nn.ReLU(true))

diff --git a/models/Catch.lua b/models/Catch.lua
@@ -1,8 +1,5 @@
 local nn = require 'nn'
-local nninit = require 'nninit'
 require 'classic.torch' -- Enables serialisation
-require 'rnn'
-require 'dpnn' -- Adds gradParamClip method
 
 local Body = classic.class('Body')
 
@@ -18,9 +15,7 @@ end
 function Body:createBody()
   -- Number of input frames for recurrent networks is always 1
   local histLen = self.recurrent and 1 or self.histLen
-  local net
-
-  net = nn.Sequential()
+  local net = nn.Sequential()
   net:add(nn.View(histLen*self.stateSpec[2][1], self.stateSpec[2][2], self.stateSpec[2][3]))
   net:add(nn.SpatialConvolution(histLen*self.stateSpec[2][1], 32, 5, 5, 2, 2, 1, 1))
   net:add(nn.ReLU(true))