Merge pull request #114 from nicholas-leonard/LookupTable

LookupTable + Concat small fixes

2 files changed, 3 insertions, 1 deletions

diff --git a/Concat.lua b/Concat.lua
index 5743af9..c94808d 100644
--- a/Concat.lua
+++ b/Concat.lua
@@ -142,7 +142,7 @@ function Concat:__tostring__()
    local ext = '  |    '
    local extlast = '       '
    local last = '   ... -> '
-   local str = 'nn.Concat'
+   local str = torch.type(self)
    str = str .. ' {' .. line .. tab .. 'input'
    for i=1,#self.modules do
       if i == self.modules then
diff --git a/LookupTable.lua b/LookupTable.lua
index 71d7f62..5b5f565 100644
--- a/LookupTable.lua
+++ b/LookupTable.lua
@@ -117,6 +117,7 @@ function LookupTable:accUpdateGradParameters(input, gradOutput, lr)
       for i=1,input:size(1) do
          local k = input[i]
          local kscale = self:scaleUpdateByKey(k)
+         self.inputs[k] = (self.inputs[k] or 0) + 1
          self.weight:select(1, input[i]):add(-lr*kscale, gradOutput:select(1, i))
       end
    elseif input:dim() == 2 then 
@@ -126,6 +127,7 @@ function LookupTable:accUpdateGradParameters(input, gradOutput, lr)
          for j=1,input:size(1) do
             local k = input[j]
             local kscale = self:scaleUpdateByKey(k)
+            self.inputs[k] = (self.inputs[k] or 0) + 1
             self.weight:select(1, k):add(-lr*kscale, gradOutput:select(1, j))
          end
       end