Skip to content

Commit

Permalink
adds initial value optimization
Browse files Browse the repository at this point in the history
  • Loading branch information
mischmi96 committed Jun 16, 2021
1 parent 36ef144 commit a547a45
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ANOVAapprox"
uuid = "5e027bd6-ab01-4733-8320-e0223e929ebb"
authors = ["Michael Schmischke <michael.schmischke@math.tu-chemnitz.de> and Felix Bartel <felix.bartel@math.tu-chemnitz.de>"]
version = "1.0.23"
version = "1.0.24"

[deps]
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
Expand Down
8 changes: 7 additions & 1 deletion src/nperiodic_approx_scat_lsqr.jl
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ function approximate( approx::nperiodic_approx_scat_lsqr{d,ds}; max_iter::Int64=
W = ones( M )
end

for L in lambda
for i = 1:length(lambda)
L = lambda[i]
if verbose
println( "lambda = ", L )
end
Expand All @@ -59,6 +60,11 @@ function approximate( approx::nperiodic_approx_scat_lsqr{d,ds}; max_iter::Int64=
M, n )

tmp = zeros( ComplexF64, n )

if i > 1
tmp = approx.fc[lambda[i-1]].data
end

lsqr!( tmp, F, W .* approx.y, maxiter = max_iter, verbose=verbose, damp=sqrt(L) )
approx.fc[L] = GroupedCoeff(approx.trafo.setting, tmp)
end
Expand Down

2 comments on commit a547a45

@mischmi96
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register branch=main

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/38929

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.0.24 -m "<description of version>" a547a4586c39164f2388482b51c993a0cecab91b
git push origin v1.0.24

Please sign in to comment.