Skip to content

Commit

Permalink
correct benchamrk functions
Browse files Browse the repository at this point in the history
  • Loading branch information
kdomino committed Aug 30, 2022
1 parent e060d93 commit 5b862fd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
3 changes: 1 addition & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Cumulants"
uuid = "01e79fc4-f247-5fa3-af0e-2bd1d4cc767f"
version = "1.0.5"
version = "1.0.6"

[deps]
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
Expand All @@ -13,7 +13,6 @@ SymmetricTensors = "1ab33d94-6c6c-50cc-93f0-e3f623a46aa0"
Combinatorics = "1"
Distributions = "0.25"
SymmetricTensors = "1"
#CompilerSupportLibraries_jll = "0.3, 0.4, 0.5"
julia = "1"

[extras]
Expand Down
9 changes: 5 additions & 4 deletions benchmarks/res/plotcomptimes.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/usr/bin/env julia

using PyCall
@pyimport matplotlib as mpl
mpl.rc("text", usetex=true)
mpl.use("Agg")
#pyimport_conda("matplotlib", PKG)
#mpl = pyimport("matplotlib")
#mpl.rc("text", usetex=true)
#mpl.use("Agg")
using PyPlot
using JLD2
using FileIO
Expand All @@ -21,7 +22,7 @@ function singleplot(filename::String, name::String, compare::String = "")
x = d["x"]
t = d["t"]
m = d["m"]
mpl.rc("font", family="serif", size = 7)
#mpl.rc("font", family="serif", size = 7)
fig, ax = subplots(figsize = (2.5, 2.))
col = ["red", "blue", "black", "green", "yellow", "orange"]
marker = [":s", ":o", ":v", ":<", ":>", ":d"]
Expand Down
6 changes: 3 additions & 3 deletions src/cumulant.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ of X, at index cd i inside a block, where b is a standard blocks' size
```jldoctest
julia> M = [1. 2. 5. 6. ; 3. 4. 7. 8.];
julia> mom_el(M, (1,1), (1,1), 2)
julia> blockel(M, (1,1), (1,1), 2)
5.0
julia> mom_el(M, (1,1), (2,2), 2)
julia> blockel(M, (1,1), (2,2), 2)
37.0
```
"""
function blockel(data::Matrix{T}, mi::Tuple, mj::Tuple, b::Int) where T <: AbstractFloat
function blockel(data, mi, mj, b)
ret = 0.
t = size(data, 1)
for l in 1:t
Expand Down

0 comments on commit 5b862fd

Please sign in to comment.