Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
maxk_multicover
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
smart_grids
public
maxk_multicover
Commits
2a606672
Commit
2a606672
authored
3 years ago
by
Mathias Berger
Browse files
Options
Downloads
Patches
Plain Diff
Slight update to RG, RGP, RGPSA.
parent
ed5512a1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/algorithms.jl
+3
-3
3 additions, 3 deletions
src/algorithms.jl
with
3 additions
and
3 deletions
src/algorithms.jl
+
3
−
3
View file @
2a606672
...
...
@@ -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
[])
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment