diff options
author | Determinant <[email protected]> | 2016-03-17 10:51:21 +0800 |
---|---|---|
committer | Determinant <[email protected]> | 2016-03-17 10:51:21 +0800 |
commit | 284d9f3fe3f7017e677fac03b2bc134892875515 (patch) | |
tree | fb3bb0d210d6cd347f60098faeeeb8afc70fd6c5 /nerv/init.lua | |
parent | 00211587988024e34370e7ec2ee1cb1c8632f116 (diff) | |
parent | f1656ade78ac71d4cd84f1f7a539d1845b137589 (diff) |
Merge branch 'master' of github.com:liuq901/nerv into liuq901-master
Conflicts:
nerv/layer/rnn.lua
Diffstat (limited to 'nerv/init.lua')
-rw-r--r-- | nerv/init.lua | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/nerv/init.lua b/nerv/init.lua index 439a83e..d017f82 100644 --- a/nerv/init.lua +++ b/nerv/init.lua @@ -360,6 +360,28 @@ function table.vector(len, fill) return v end +function table.connect(tbl1, tbl2) + local res = {} + for i = 1, #tbl1 do + table.insert(res, tbl1[i]) + end + for i = 1, #tbl2 do + table.insert(res, tbl2[i]) + end + return res +end + +function table.merge(tbl1, tbl2) + local res = {} + for k, v in pairs(tbl1) do + res[k] = v + end + for k, v in pairs(tbl2) do + res[k] = v + end + return res +end + -- the following lines trigger the initialization of basic modules nerv.include('matrix/init.lua') |