use getblockunsafe from SymmetricTensors

iitis · Sep 11, 2017 · a31d6f1 · a31d6f1
1 parent aee397c
commit a31d6f1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/Cumulants.jl b/src/Cumulants.jl
@@ -1,9 +1,9 @@
 module Cumulants
   using SymmetricTensors
   using NullableArrays
-  using Iterators
+  #using Iterators
   using Combinatorics
-  import SymmetricTensors: indices, ind2range, sizetest
+  import SymmetricTensors: indices, ind2range, sizetest, getblockunsafe
   import Distributions: moment
 
   #calculates moments and cumulants using block structures (SymmetricTensors)

diff --git a/src/cumulant.jl b/src/cumulant.jl
@@ -203,7 +203,7 @@ function accesscum{T <: AbstractFloat}(mulind::Tuple,
   blocks = Array(Array{T}, part.npart)
   sq = cum[1].sqr || !(cum[1].bln in mulind)
   for k in 1:part.npart
-    data = cum[part.subsetslen[k]][mulind[part.part[k]]]
+    data = getblockunsafe(cum[part.subsetslen[k]], mulind[part.part[k]])
     if sq
       @inbounds blocks[k] = data
     else

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -3,7 +3,7 @@ using SymmetricTensors
 using Cumulants
 using Distributions
 using NullableArrays
-using Iterators
+#using Iterators
 import Cumulants: indpart, momentblock, blockel, accesscum, outprodblocks,
  IndexPart, outerprodcum, naivemoment, pyramidmoment, pyramidcumulants, mom2cums,
   usebl

diff --git a/test/testondata.jl b/test/testondata.jl
@@ -2,8 +2,6 @@
 
 using JLD
 using Cumulants
-addprocs(4)
-@everywhere using Cumulants
 
 function main()
   d = try load("data/datafortests.jld")