Merge branch 'master' of github.com:liuq901/nerv into liuq901-master

Conflicts:
	nerv/layer/rnn.lua

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')