Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update observables #23

Closed
wants to merge 5 commits into from
Closed

update observables #23

wants to merge 5 commits into from

Conversation

yomichi
Copy link
Owner

@yomichi yomichi commented May 26, 2024

  • Some operations for VectorObservable like var are corrected
  • BinningObservable is deprecated
    • Instead, use obs = SimpleObservable() and binned = binning(obs)
    • binning returns new SimpleObservable with binned
    • binning takes one option, binsize::Int or numbins::Int.
      • binsize is the size of each bin
      • numbins is the number of bins
      • If omitted, binsize = floor(Int, sqrt(count(obs))) is used
    • param in runMC(param::Parameter) takes new optional keys, Binning size and Number of Bins
  • Operations for the mixture of Jackknife and JackknifeVector are added

github-actions[bot]
github-actions bot reviewed May 26, 2024
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

JuliaFormatter

src/observables/simple.jl|135|
src/observables/simple.jl|138|
src/observables/simplevector.jl|10|
src/observables/simplevector.jl|29|
src/observables/simplevector.jl|31|
src/observables/simplevector.jl|33|
src/observables/simplevector.jl|35|
src/observables/simplevector.jl|45|
src/observables/simplevector.jl|51|
src/observables/simplevector.jl|87|
src/observables/simplevector.jl|145|
src/observables/simplevector.jl|150|
src/observables/simplevector.jl|153|
src/observables/tinyvector.jl|47|
src/runMC.jl|139|
test/classical.jl|26|
test/classical.jl|37|
test/observable.jl|6|
test/observable.jl|10|
test/observable.jl|17|
test/observable.jl|19|
test/observable.jl|22|
test/observable.jl|31|
test/observable.jl|35|
test/observable.jl|42|
test/observable.jl|45|
test/observable.jl|47|
test/observable.jl|57|
test/observable.jl|59|
test/observable.jl|64|
test/observable.jl|72|
test/observable.jl|75|
test/observable.jl|102|

src/lattice/generate.jl
use_index_as_sitetype = get(param, "Use Indecies as Site Types", false)
use_index_as_bondtype = get(param, "Use Indecies as Bond Types", false)
use_index_as_sitetype = get(param, "Use Indicies as Site Types", false)
use_index_as_bondtype = get(param, "Use Indicies as Bond Types", false)

for icell in 0:(numcell-1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
for icell in 0:(numcell-1)
for icell = 0:(numcell-1)

src/observables/binning.jl Outdated Show resolved Hide resolved
src/observables/binningvector.jl
Comment on lines +7 to +18
raw_ts :: Vector{Vector{Float64}} ## Time series of raw data
bins :: Vector{Vector{Float64}} ## Time series of bins
sum :: Vector{Vector{Float64}} ## Summation of stored values
sum2 :: Vector{Vector{Float64}} ## Summation of square of bin's mean
entries :: Vector{Int} ## Number of bins
binsize :: Int
lastbin :: Int
minbinnum :: Int
maxlevel :: Int
end

function BinningVectorObservable(minbinnum::Int = 128)
BinningVectorObservable( Vector{Float64}[], Vector{Float64}[], Vector{Float64}[], Vector{Float64}[],
zeros(Int,1), 1, 0, minbinnum, 1)
function BinningVectorObservable(minbinnum::Int = 128)
Base.depwarn("BinningVectorObservable is deprecated. Use obs=SimpleVectorObservable() and binning(obs) instead.", nothing, force=true)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
raw_ts :: Vector{Vector{Float64}} ## Time series of raw data
bins :: Vector{Vector{Float64}} ## Time series of bins
sum :: Vector{Vector{Float64}} ## Summation of stored values
sum2 :: Vector{Vector{Float64}} ## Summation of square of bin's mean
entries :: Vector{Int} ## Number of bins
binsize :: Int
lastbin :: Int
minbinnum :: Int
maxlevel :: Int
end
function BinningVectorObservable(minbinnum::Int = 128)
BinningVectorObservable( Vector{Float64}[], Vector{Float64}[], Vector{Float64}[], Vector{Float64}[],
zeros(Int,1), 1, 0, minbinnum, 1)
function BinningVectorObservable(minbinnum::Int = 128)
Base.depwarn("BinningVectorObservable is deprecated. Use obs=SimpleVectorObservable() and binning(obs) instead.", nothing, force=true)
raw_ts::Vector{Vector{Float64}} ## Time series of raw data
bins::Vector{Vector{Float64}} ## Time series of bins
sum::Vector{Vector{Float64}} ## Summation of stored values
sum2::Vector{Vector{Float64}} ## Summation of square of bin's mean
entries::Vector{Int} ## Number of bins
binsize::Int
lastbin::Int
minbinnum::Int
maxlevel::Int
function BinningVectorObservable(minbinnum::Int = 128)
Base.depwarn(
"BinningVectorObservable is deprecated. Use obs=SimpleVectorObservable() and binning(obs) instead.",
nothing,
force = true,
)

src/observables/binningvector.jl
bins = Vector{Float64}[]
sum = Vector{Float64}[]
sum2 = Vector{Float64}[]
entries = zeros(Int,1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
entries = zeros(Int,1)
entries = zeros(Int, 1)

src/observables/jackknife.jl
@@ -5,9 +5,25 @@ mutable struct Jackknife <: ScalarObservable
xs :: Vector{Float64}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
xs :: Vector{Float64}
xs::Vector{Float64}

src/observables/jackknifevector.jl
end

const JackknifeSet = MCObservableSet{Jackknife}
const JackknifeVectorSet = MCObservableSet{JackknifeVector}

jackknife(obs::VectorObservable) = JackknifeVector(obs)
function jackknife(obsset :: MCObservableSet{Obs}) where (Obs<: VectorObservable)
JK = JackknifeSet()
for (k,v) in obsset
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
for (k,v) in obsset
for (k, v) in obsset

src/observables/simple.jl
end

if binsize > 0
numbins = floor(Int, nobs/binsize)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
numbins = floor(Int, nobs/binsize)
numbins = floor(Int, nobs / binsize)

src/observables/simple.jl
if binsize > 0
numbins = floor(Int, nobs/binsize)
else
binsize = floor(Int, nobs/numbins)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
binsize = floor(Int, nobs/numbins)
binsize = floor(Int, nobs / numbins)

src/observables/simple.jl

bins = zeros(numbins)
offset = 1
for i in 1:numbins
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
for i in 1:numbins
for i = 1:numbins

src/observables/simple.jl
newobs = SimpleObservable(bins, numbins, sum(bins), sum(abs2, bins))
return newobs
end

function reset!(obs :: SimpleObservable)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
function reset!(obs :: SimpleObservable)
function reset!(obs::SimpleObservable)

@yomichi @github-actions
Update src/observables/binning.jl
cafbf50 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
github-actions[bot]
github-actions bot reviewed May 26, 2024
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

JuliaFormatter

test/observable.jl|72|
test/observable.jl|75|
test/observable.jl|102|

src/observables/simple.jl
function binning(obsset::SimpleObservableSet; binsize::Int = 0, numbins::Int = 0)
newobsset = SimpleObservableSet()
for (name, obs) in obsset
newobsset[name] = binning(obs, binsize=binsize, numbins=numbins)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
newobsset[name] = binning(obs, binsize=binsize, numbins=numbins)
newobsset[name] = binning(obs, binsize = binsize, numbins = numbins)

src/observables/simple.jl
newobsset[name] = binning(obs, binsize=binsize, numbins=numbins)
end
return newobsset
end
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
end
end

src/observables/simplevector.jl
@@ -9,6 +9,45 @@ end

SimpleVectorObservable() = SimpleVectorObservable(Vector{Float64}[], 0, Float64[], Float64[])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
SimpleVectorObservable() = SimpleVectorObservable(Vector{Float64}[], 0, Float64[], Float64[])
SimpleVectorObservable() =
SimpleVectorObservable(Vector{Float64}[], 0, Float64[], Float64[])

src/observables/simplevector.jl
end

if binsize > 0
numbins = floor(Int, nobs/binsize)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
numbins = floor(Int, nobs/binsize)
numbins = floor(Int, nobs / binsize)

src/observables/simplevector.jl
if binsize > 0
numbins = floor(Int, nobs/binsize)
else
binsize = floor(Int, nobs/numbins)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
binsize = floor(Int, nobs/numbins)
binsize = floor(Int, nobs / numbins)

test/observable.jl
binning_scalar = [binning(obs_scalar[i]) for i in 1:nobs]
binning_vector = binning(obs_vector)

mean_scalar = [mean(binning_scalar[i]) for i in 1:nobs]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
mean_scalar = [mean(binning_scalar[i]) for i in 1:nobs]
mean_scalar = [mean(binning_scalar[i]) for i = 1:nobs]

test/observable.jl

mean_scalar = [mean(binning_scalar[i]) for i in 1:nobs]
mean_vector = mean(binning_vector)
var_scalar = [var(binning_scalar[i]) for i in 1:nobs]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
var_scalar = [var(binning_scalar[i]) for i in 1:nobs]
var_scalar = [var(binning_scalar[i]) for i = 1:nobs]

test/observable.jl
function test_jackknife(scalartype, vectortype)
nobs = 3
ndata = 100
obs_scalar_x = [scalartype() for i in 1:nobs]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
obs_scalar_x = [scalartype() for i in 1:nobs]
obs_scalar_x = [scalartype() for i = 1:nobs]

test/observable.jl
ndata = 100
obs_scalar_x = [scalartype() for i in 1:nobs]
obs_vector_x = vectortype()
obs_scalar_y = [scalartype() for i in 1:nobs]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
obs_scalar_y = [scalartype() for i in 1:nobs]
obs_scalar_y = [scalartype() for i = 1:nobs]

test/observable.jl
Comment on lines +64 to +65
for i in 1:ndata
for j in 1:nobs
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
for i in 1:ndata
for j in 1:nobs
for i = 1:ndata
for j = 1:nobs

@yomichi
Copy link
Owner Author

yomichi commented May 26, 2024

I close it until the test passes

@yomichi yomichi closed this May 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@yomichi