Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
geopat
geopat
Commits
bbb85735
Commit
bbb85735
authored
Jul 03, 2019
by
Dumoulin Nicolas
Browse files
Fix: TargetDelta is not used in pareto computation
parent
848a529d
Changes
1
Hide whitespace changes
Inline
Side-by-side
scenariosAleatoires/MCMC.py
View file @
bbb85735
...
...
@@ -112,7 +112,7 @@ class MCMC:
print
(
'Iteration duration: {} - {:.2f} scen/s '
.
format
(
time
.
strftime
(
"%M:%S"
,
time
.
gmtime
(
elapsed_time
)),
nb_particles
/
elapsed_time
),
end
=
""
,
flush
=
True
)
# Computing pareto front
start_time
=
time
.
time
()
pareto_mask
=
MCMC
.
is_pareto_efficient
(
scenarios
.
scores
[[
'Resilience'
,
'Proximity'
,
'Productivity'
,
'Biodiversity'
,
'Social'
,
'TargetDelta'
]].
values
)
pareto_mask
=
MCMC
.
is_pareto_efficient
(
scenarios
.
scores
[[
'Resilience'
,
'Proximity'
,
'Productivity'
,
'Biodiversity'
,
'Social'
]].
values
)
scenarios
.
scores
[
'pareto'
]
=
pareto_mask
elapsed_time
=
time
.
time
()
-
start_time
print
(
' Fully reallocated scenarios {}/{} - '
.
format
(
scenarios
.
nbFullReallocated
(),
nb_particles
),
end
=
""
,
flush
=
True
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment