Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
Bachelor Mario Surlemont
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
general
albi
Bachelor Mario Surlemont
Commits
7270d3ff
Commit
7270d3ff
authored
5 years ago
by
msurl
Browse files
Options
Downloads
Patches
Plain Diff
pushed progress
parent
27987454
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
python/conda package/k_hop_dominating_set_gurobi/k_hop_dominating_set_gurobi/k_hop_dom_set.py
+87
-28
87 additions, 28 deletions
...g_set_gurobi/k_hop_dominating_set_gurobi/k_hop_dom_set.py
with
87 additions
and
28 deletions
python/conda package/k_hop_dominating_set_gurobi/k_hop_dominating_set_gurobi/k_hop_dom_set.py
+
87
−
28
View file @
7270d3ff
...
@@ -11,7 +11,7 @@ from gurobipy import GRB
...
@@ -11,7 +11,7 @@ from gurobipy import GRB
import
datetime
import
datetime
import
sys
import
sys
import
matplotlib.pyplot
as
plt
import
matplotlib.pyplot
as
plt
#
import lp_to_nx_graph
import
lp_to_nx_graph
from
itertools
import
combinations
from
itertools
import
combinations
from
enum
import
Enum
from
enum
import
Enum
...
@@ -37,7 +37,8 @@ class KHopDominatingSet():
...
@@ -37,7 +37,8 @@ class KHopDominatingSet():
def
solve
(
self
):
def
solve
(
self
):
# TODO: refactor, maybe use self.nodes directly
# TODO: refactor, maybe use self.nodes directly
ds
=
{
i
for
i
,
x_i
in
enumerate
(
self
.
m
.
getVars
())
if
x_i
.
x
==
1
}
self
.
m
.
optimize
()
ds
=
{
v
for
v
in
self
.
G
.
nodes
if
self
.
nodes
[
v
].
x
>
0.5
}
return
ds
return
ds
def
solve_and_draw
(
self
):
def
solve_and_draw
(
self
):
...
@@ -68,6 +69,7 @@ class ConnectedKHopDominatingSet(KHopDominatingSet):
...
@@ -68,6 +69,7 @@ class ConnectedKHopDominatingSet(KHopDominatingSet):
def
__init__
(
self
,
G
,
k
,
name
=
"
CkDS
"
,
exclude
=
{},
constraints
=
ConnectivityConstraint
.
SEPARATORS
):
def
__init__
(
self
,
G
,
k
,
name
=
"
CkDS
"
,
exclude
=
{},
constraints
=
ConnectivityConstraint
.
SEPARATORS
):
self
.
G
=
G
self
.
G
=
G
super
().
__init__
(
G
,
k
,
name
)
super
().
__init__
(
G
,
k
,
name
)
self
.
m
.
_rooted
=
False
self
.
constraints
=
constraints
self
.
constraints
=
constraints
...
@@ -154,15 +156,13 @@ class ConnectedKHopDominatingSet(KHopDominatingSet):
...
@@ -154,15 +156,13 @@ class ConnectedKHopDominatingSet(KHopDominatingSet):
self
.
m
.
_G
=
self
.
G
self
.
m
.
_G
=
self
.
G
self
.
m
.
Params
.
lazyConstraints
=
1
self
.
m
.
Params
.
lazyConstraints
=
1
self
.
m
.
optimize
(
ConnectedKHopDominatingSet
.
elim_unconnectivity
)
self
.
m
.
optimize
(
ConnectedKHopDominatingSet
.
elim_unconnectivity
)
# self.m.optimize()
elif
ConnectivityConstraint
.
INDEGREE
==
self
.
constraints
:
self
.
m
.
optimize
()
elif
ConnectivityConstraint
.
MILLER_TUCKER_ZEMLIN
==
self
.
constraints
:
elif
ConnectivityConstraint
.
MILLER_TUCKER_ZEMLIN
==
self
.
constraints
:
self
.
m
.
optimize
()
self
.
m
.
optimize
()
elif
ConnectivityConstraint
.
MARTIN
==
self
.
constraints
:
elif
ConnectivityConstraint
.
MARTIN
==
self
.
constraints
:
self
.
m
.
optimize
()
self
.
m
.
optimize
()
ds
=
{
i
for
i
,
x_i
in
enumerate
(
self
.
m
.
getVars
())
if
x_i
.
x
>
0.5
}
ds
=
{
v
for
v
in
self
.
G
.
nodes
if
self
.
nodes
[
v
]
.
x
>
0.5
}
return
ds
return
ds
# Probably uncorrect version
# Probably uncorrect version
...
@@ -203,8 +203,55 @@ class ConnectedKHopDominatingSet(KHopDominatingSet):
...
@@ -203,8 +203,55 @@ class ConnectedKHopDominatingSet(KHopDominatingSet):
# model.cbLazy(gp.quicksum(model._vars[s] for s in min_ij_sep) >= model._vars[h] + model._vars[l] - 1)
# model.cbLazy(gp.quicksum(model._vars[s] for s in min_ij_sep) >= model._vars[h] + model._vars[l] - 1)
# V2
# V2
# def elim_unconnectivity(model, where):
# if where == GRB.Callback.MIPSOL:
# vals = model.cbGetSolution(model._vars)
# ds = {i for i in model._vars.keys() if vals[i] > 0.5}
# G_prime_prime = model._G.subgraph(ds)
# if(not nx.is_connected(G_prime_prime)):
# C = [c for c in nx.algorithms.components.connected_components(G_prime_prime)]
# for i in range(len(C)):
# C_i = C[i]
# for j in range(len(C)):
# C_j = C[j]
# h = next(iter(C_i))
# l = next(iter(C_j))
# min_ij_sep = ConnectedKHopDominatingSet.min_ij_separator(model._G, h, l, C_i)
# if min_ij_sep:
# for w in C_i:
# model.cbLazy(gp.quicksum(model._vars[s] for s in min_ij_sep) >= model._vars[w] + model._vars[l] - 1)
# V3
def
elim_unconnectivity
(
model
,
where
):
def
elim_unconnectivity
(
model
,
where
):
if
where
==
GRB
.
Callback
.
MIPSOL
:
if
where
==
GRB
.
Callback
.
MIPSOL
:
if
model
.
_rooted
:
vals
=
model
.
cbGetSolution
(
model
.
_vars
)
ds
=
{
i
for
i
in
model
.
_vars
.
keys
()
if
vals
[
i
]
>
0.5
}
G_prime_prime
=
model
.
_G
.
subgraph
(
ds
)
if
(
not
nx
.
is_connected
(
G_prime_prime
)):
C
=
[
c
for
c
in
nx
.
algorithms
.
components
.
connected_components
(
G_prime_prime
)]
C_root
=
[
c
for
c
in
C
if
model
.
_root
in
c
].
pop
()
# this is really awkward. Try to find something better!
for
i
in
range
(
len
(
C
)):
C_i
=
C
[
i
]
if
C_i
!=
C_root
:
h
=
next
(
iter
(
C_i
))
l
=
model
.
_root
min_ij_sep
=
ConnectedKHopDominatingSet
.
min_ij_separator
(
model
.
_G
,
h
,
l
,
C_i
)
if
min_ij_sep
:
for
w
in
C_i
:
model
.
cbLazy
(
gp
.
quicksum
(
model
.
_vars
[
s
]
for
s
in
min_ij_sep
)
>=
model
.
_vars
[
w
]
+
model
.
_vars
[
l
]
-
1
)
else
:
for
j
in
range
(
len
(
C
)):
C_j
=
C
[
j
]
h
=
model
.
_root
l
=
next
(
iter
(
C_j
))
min_ij_sep
=
ConnectedKHopDominatingSet
.
min_ij_separator
(
model
.
_G
,
h
,
l
,
C_i
)
if
min_ij_sep
:
for
w
in
C_i
:
model
.
cbLazy
(
gp
.
quicksum
(
model
.
_vars
[
s
]
for
s
in
min_ij_sep
)
>=
model
.
_vars
[
w
]
+
model
.
_vars
[
l
]
-
1
)
else
:
vals
=
model
.
cbGetSolution
(
model
.
_vars
)
vals
=
model
.
cbGetSolution
(
model
.
_vars
)
ds
=
{
i
for
i
in
model
.
_vars
.
keys
()
if
vals
[
i
]
>
0.5
}
ds
=
{
i
for
i
in
model
.
_vars
.
keys
()
if
vals
[
i
]
>
0.5
}
...
@@ -230,12 +277,20 @@ class RootedConnectecKHopDominatingSet(ConnectedKHopDominatingSet):
...
@@ -230,12 +277,20 @@ class RootedConnectecKHopDominatingSet(ConnectedKHopDominatingSet):
self
.
m
.
addConstr
(
self
.
nodes
[
root
]
>=
1
)
self
.
m
.
addConstr
(
self
.
nodes
[
root
]
>=
1
)
# self.m.addConstr(gp.quicksum(self.nodes) >= 12)
# self.add_all_combinations_root_separators()
# self.add_all_combinations_root_separators()
# print("neighborhood separators:")
# print("neighborhood separators:")
# self.add_all_neighborhood_root_separators()
# self.add_all_neighborhood_root_separators()
# print("single node separators:")
# print("single node separators:")
# self.add_single_root_separators()
# self.add_single_root_separators()
def
solve
(
self
):
self
.
m
.
_root
=
self
.
root
self
.
m
.
_rooted
=
True
return
super
().
solve
()
def
add_single_root_separators
(
self
):
def
add_single_root_separators
(
self
):
number_of_found_separators
=
0
number_of_found_separators
=
0
for
i
in
self
.
G
.
nodes
:
for
i
in
self
.
G
.
nodes
:
...
@@ -297,9 +352,11 @@ class RootedConnectecKHopDominatingSet(ConnectedKHopDominatingSet):
...
@@ -297,9 +352,11 @@ class RootedConnectecKHopDominatingSet(ConnectedKHopDominatingSet):
if
__name__
==
'
__main__
'
:
if
__name__
==
'
__main__
'
:
filename
=
sys
.
argv
[
1
]
if
filename
.
endswith
(
"
.lp
"
):
G
=
lp_to_nx_graph
.
read
(
sys
.
argv
[
1
])
G
=
lp_to_nx_graph
.
read
(
sys
.
argv
[
1
])
G
=
G
.
to_undirected
()
else
:
G
=
nx
.
read_graphml
(
sys
.
argv
[
1
])
if
(
len
(
sys
.
argv
)
>
2
):
if
(
len
(
sys
.
argv
)
>
2
):
k
=
int
(
sys
.
argv
[
2
])
k
=
int
(
sys
.
argv
[
2
])
else
:
else
:
...
@@ -308,5 +365,7 @@ if __name__ == '__main__':
...
@@ -308,5 +365,7 @@ if __name__ == '__main__':
# G = lp_to_nx_graph.read("/home/mario/Dokumente/Uni/Bachelorarbeit/git_repo/bachelor-mario-surlemont/python/lp graphs/small-leaf.lp")
# G = lp_to_nx_graph.read("/home/mario/Dokumente/Uni/Bachelorarbeit/git_repo/bachelor-mario-surlemont/python/lp graphs/small-leaf.lp")
# k = 1
# k = 1
dsProb
=
RootedConnectecKHopDominatingSet
(
G
,
k
,
0
,
constraints
=
ConnectivityConstraint
.
SEPARATORS
)
dsProb
=
RootedConnectecKHopDominatingSet
(
G
,
k
,
next
(
iter
(
G
.
nodes
))
,
constraints
=
ConnectivityConstraint
.
SEPARATORS
)
dsProb
.
solve_and_draw
()
dsProb
.
solve_and_draw
()
# ds = KHopDominatingSet(G,k)
# ds.solve_and_draw()
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