bug fixes

Author: mohamed82008

src/functions/sparse.jl

@@ -58,7 +58,7 @@ function _sparse_reshape(v::SparseVector, m, n)
     N = length(v.nzval)
     I = zeros(Int, N)
     J = zeros(Int, N)
-    for ind in v.nzind
+    for (i, ind) in enumerate(v.nzind)
         _col, _row = divrem(ind, m)
         if _row == 0
             col = _col
@@ -67,8 +67,8 @@ function _sparse_reshape(v::SparseVector, m, n)
             col = _col + 1
             row = _row
         end
-        I[ind] = row
-        J[ind] = col
+        I[i] = row
+        J[i] = col
     end
     return sparse(I, J, copy(v.nzval), m, n)
 end

src/models/flatten.jl

@@ -253,9 +253,12 @@ _zero(x::NamedTuple) = map(_zero, x)
 _zero(x::Tuple) = map(_zero, x)
 _zero(x) = structfromnt(typeof(x), _zero(ntfromstruct(x)))
 
-function _merge(d1, d2::AbstractDict)
-    _d = OrderedDict(k => _zero(v) for (k, v) in d1)
-    return sort!(merge(_d, OrderedDict(d2)))
+function _merge(d1::AbstractDict{K, V}, d2::AbstractDict) where {K, V}
+    _d = OrderedDict{K, V}(k => _zero(v) for (k, v) in d1)
+    return sort!(merge(_d, OrderedDict{K, V}(d2)))
+end
+function _merge(d1::Tuple, d2::Tangent)
+    return _merge.(d1, d2.backing)
 end
 _merge(::Any, d2) = d2