Skip to content
Snippets Groups Projects
Commit 2a606672 authored by Mathias Berger's avatar Mathias Berger
Browse files

Slight update to RG, RGP, RGPSA.

parent ed5512a1
No related branches found
No related tags found
No related merge requests found
......@@ -102,7 +102,6 @@ function RG(D::Array{Float64,2}, c::Float64, k::Float64)
else
obj_candidate = obj_incumbent
end
filter!(a -> !(a in ind_tmp), ind_tmp)
@inbounds for ind in ind_compl_incumbent
Dx_tmp .= Dx_incumbent .+ view(D, :, ind)
y_tmp .= Dx_tmp .>= threshold
......@@ -116,6 +115,7 @@ function RG(D::Array{Float64,2}, c::Float64, k::Float64)
end
end
ind_candidate[] = rand(ind_tmp)
filter!(a -> !(a in ind_tmp), ind_tmp)
push!(ind_incumbent, ind_candidate[])
filter!(a -> a != ind_candidate[], ind_compl_incumbent)
Dx_incumbent .+= view(D, :, ind_candidate[])
......@@ -164,7 +164,6 @@ function RGP(D::Array{Float64,2}, c::Float64, k::Float64, p::Float64)
obj_candidate = obj_incumbent
end
sample!(ind_compl_incumbent, random_ind_set, replace=false)
filter!(a -> !(a in ind_tmp), ind_tmp)
@inbounds for ind in random_ind_set
Dx_tmp .= Dx_incumbent .+ view(D, :, ind)
y_tmp .= Dx_tmp .>= threshold
......@@ -178,6 +177,7 @@ function RGP(D::Array{Float64,2}, c::Float64, k::Float64, p::Float64)
end
end
ind_candidate[] = rand(ind_tmp)
filter!(a -> !(a in ind_tmp), ind_tmp)
push!(ind_incumbent, ind_candidate[])
filter!(a -> a != ind_candidate[], ind_compl_incumbent)
Dx_incumbent .+= view(D, :, ind_candidate[])
......@@ -477,7 +477,6 @@ function RGPSA(D::Array{Float64, 2}, c::Float64, k::Float64, p::Float64, n::Int6
obj_candidate = obj_incumbent
end
sample!(ind_compl_incumbent, random_ind_set, replace=false)
filter!(a -> !(a in ind_tmp), ind_tmp)
@inbounds for ind in random_ind_set
Dx_tmp .= Dx_incumbent .+ view(D, :, ind)
y_tmp .= Dx_tmp .>= threshold
......@@ -491,6 +490,7 @@ function RGPSA(D::Array{Float64, 2}, c::Float64, k::Float64, p::Float64, n::Int6
end
end
ind_candidate[] = rand(ind_tmp)
filter!(a -> !(a in ind_tmp), ind_tmp)
push!(ind_incumbent, ind_candidate[])
filter!(a -> a != ind_candidate[], ind_compl_incumbent)
Dx_incumbent .+= view(D, :, ind_candidate[])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment