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.

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

added wavelets of oder 1,2,3,4 #2

Merged
merged 2 commits into from
Apr 20, 2022
Merged

added wavelets of oder 1,2,3,4 #2

merged 2 commits into from
Apr 20, 2022

Conversation

mischmi96
Copy link
Member

No description provided.

Comment on lines +6 to +7
bases = ["per", "cos", "cheb", "std" ,"wav1", "wav2", "wav3", "wav4"]
types = Dict("per" => ComplexF64, "cos" => Float64, "cheb" => Float64, "std" => Float64, "wav1" => Float64, "wav2" => Float64,"wav3" => Float64,"wav4" => 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
bases = ["per", "cos", "cheb", "std" ,"wav1", "wav2", "wav3", "wav4"]
types = Dict("per" => ComplexF64, "cos" => Float64, "cheb" => Float64, "std" => Float64, "wav1" => Float64, "wav2" => Float64,"wav3" => Float64,"wav4" => Float64)
bases = ["per", "cos", "cheb", "std", "wav1", "wav2", "wav3", "wav4"]
types = Dict(
"per" => ComplexF64,
"cos" => Float64,
"cheb" => Float64,
"std" => Float64,
"wav1" => Float64,
"wav2" => Float64,
"wav3" => Float64,
"wav4" => Float64,
)

)
gt_systems = Dict("per" => "exp", "cos" => "cos", "cheb" => "cos", "std" => "cos")
gt_systems = Dict("per" => "exp", "cos" => "cos", "cheb" => "cos", "std" => "cos", "wav1" => "wav1", "wav2" => "wav2", "wav3" => "wav3", "wav4" => "wav4")
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
gt_systems = Dict("per" => "exp", "cos" => "cos", "cheb" => "cos", "std" => "cos", "wav1" => "wav1", "wav2" => "wav2", "wav3" => "wav3", "wav4" => "wav4")
gt_systems = Dict(
"per" => "exp",
"cos" => "cos",
"cheb" => "cos",
"std" => "cos",
"wav1" => "wav1",
"wav2" => "wav2",
"wav3" => "wav3",
"wav4" => "wav4",
)

@@ -8,20 +8,36 @@ function get_GSI(
λ::Float64;
dict::Bool = false,
)::Union{Vector{Float64},Dict{Vector{Int},Float64}}
variances = norms(a.fc[λ]) .^ 2
if a.basis == "wav1"
variances = norms(a.fc[λ],1,dict=false) .^ 2
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
variances = norms(a.fc[λ],1,dict=false) .^ 2
variances = norms(a.fc[λ], 1, dict = false) .^ 2

if a.basis == "wav1"
variances = norms(a.fc[λ],1,dict=false) .^ 2
elseif a.basis == "wav2"
variances = norms(a.fc[λ],2,dict=false) .^ 2
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
variances = norms(a.fc[λ],2,dict=false) .^ 2
variances = norms(a.fc[λ], 2, dict = false) .^ 2

elseif a.basis == "wav2"
variances = norms(a.fc[λ],2,dict=false) .^ 2
elseif a.basis == "wav3"
variances = norms(a.fc[λ],3,dict=false) .^ 2
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
variances = norms(a.fc[λ],3,dict=false) .^ 2
variances = norms(a.fc[λ], 3, dict = false) .^ 2

@@ -16,7 +16,7 @@ using .TestFunctionCheb

rng = MersenneTwister(1234)

tests = ["misc", "cheb_fista", "cheb_lsqr", "per_lsqr", "per_fista"]
tests = ["misc", "cheb_fista", "cheb_lsqr", "per_lsqr", "per_fista","wav_lsqr"]
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
tests = ["misc", "cheb_fista", "cheb_lsqr", "per_lsqr", "per_fista","wav_lsqr"]
tests = ["misc", "cheb_fista", "cheb_lsqr", "per_lsqr", "per_fista", "wav_lsqr"]

ds = 2
M = 10_000
max_iter = 50
bw = [4,4]
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
bw = [4,4]
bw = [4, 4]

λs = [0.0, 1.0]


X = rand( d, M) .- 0.5
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
X = rand( d, M) .- 0.5
X = rand(d, M) .- 0.5

Comment on lines +26 to +27
println( "AR: ", sum(ANOVAapprox.get_AttributeRanking(ads, 0.0)) )
@test abs( sum(ANOVAapprox.get_AttributeRanking(ads, 0.0)) - 1 ) < 0.0001
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
println( "AR: ", sum(ANOVAapprox.get_AttributeRanking(ads, 0.0)) )
@test abs( sum(ANOVAapprox.get_AttributeRanking(ads, 0.0)) - 1 ) < 0.0001
println("AR: ", sum(ANOVAapprox.get_AttributeRanking(ads, 0.0)))
@test abs(sum(ANOVAapprox.get_AttributeRanking(ads, 0.0)) - 1) < 0.0001

println( "AR: ", sum(ANOVAapprox.get_AttributeRanking(ads, 0.0)) )
@test abs( sum(ANOVAapprox.get_AttributeRanking(ads, 0.0)) - 1 ) < 0.0001

bw = ANOVAapprox.get_orderDependentBW(TestFunctionPeriodic.AS, [4,4])
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
bw = ANOVAapprox.get_orderDependentBW(TestFunctionPeriodic.AS, [4,4])
bw = ANOVAapprox.get_orderDependentBW(TestFunctionPeriodic.AS, [4, 4])

@codecov-commenter
Copy link

Codecov Report

Merging #2 (ccc8011) into main (0ff83e2) will decrease coverage by 94.05%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             main      #2       +/-   ##
==========================================
- Coverage   94.05%   0.00%   -94.06%     
==========================================
  Files           5       5               
  Lines         286     300       +14     
==========================================
- Hits          269       0      -269     
- Misses         17     300      +283     
Impacted Files Coverage Δ
src/ANOVAapprox.jl 0.00% <ø> (-100.00%) ⬇️
src/analysis.jl 0.00% <0.00%> (-98.31%) ⬇️
src/approx.jl 0.00% <0.00%> (-93.21%) ⬇️
src/errors.jl 0.00% <0.00%> (-100.00%) ⬇️
src/fista.jl 0.00% <0.00%> (-88.47%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0ff83e2...ccc8011. Read the comment docs.

@Laura1110 Laura1110 merged commit c012409 into main Apr 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants