Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AKPlanning
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
Service Desk
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
KIF
AKPlanning
Commits
a8ee67d9
Commit
a8ee67d9
authored
May 27, 2024
by
Felix Blanke
Browse files
Options
Downloads
Patches
Plain Diff
Filter unnecessary fulfilled constraints
parent
ff96c9fc
No related branches found
No related tags found
1 merge request
!268
Merge fork for interoperability of KoMa solver
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
AKModel/views/ak.py
+25
-15
25 additions, 15 deletions
AKModel/views/ak.py
with
25 additions
and
15 deletions
AKModel/views/ak.py
+
25
−
15
View file @
a8ee67d9
import
json
import
json
from
datetime
import
timedelta
from
datetime
import
timedelta
from
typing
import
List
from
django.contrib
import
messages
from
django.contrib
import
messages
from
django.urls
import
reverse_lazy
from
django.urls
import
reverse_lazy
...
@@ -71,15 +72,24 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
...
@@ -71,15 +72,24 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
for
slot
in
context
[
"
slots
"
]:
for
slot
in
context
[
"
slots
"
]:
slot
.
slots_in_an_hour
=
SLOTS_IN_AN_HOUR
slot
.
slots_in_an_hour
=
SLOTS_IN_AN_HOUR
ak_availabilities
=
{
slot
.
ak
.
pk
:
availability
ak_availabilities
=
{
slot
.
ak
.
pk
:
Availability
.
union
(
slot
.
ak
.
availabilities
.
all
())
for
slot
in
context
[
"
slots
"
]
for
slot
in
context
[
"
slots
"
]
for
availability
in
slot
.
ak
.
availabilities
.
all
()}
}
room_availabilities
=
{
room
.
pk
:
availability
room_availabilities
=
{
room
.
pk
:
Availability
.
union
(
room
.
availabilities
.
all
())
for
room
in
rooms
for
room
in
rooms
for
availability
in
room
.
availabilities
.
all
()}
}
person_availabilities
=
{
person
.
pk
:
availability
person_availabilities
=
{
person
.
pk
:
Availability
.
union
(
person
.
availabilities
.
all
())
for
person
in
AKOwner
.
objects
.
filter
(
event
=
self
.
event
)
for
person
in
AKOwner
.
objects
.
filter
(
event
=
self
.
event
)
for
availability
in
person
.
availabilities
.
all
()}
}
def
_test_add_constraint
(
slot
:
Availability
,
availabilities
:
List
[
Availability
])
->
bool
:
return
(
(
not
Availability
.
is_event_covered
(
self
.
event
,
availabilities
))
and
any
(
availability
.
contains
(
slot
)
for
availability
in
availabilities
)
)
for
block
in
self
.
event
.
time_slots
(
slots_in_an_hour
=
SLOTS_IN_AN_HOUR
):
for
block
in
self
.
event
.
time_slots
(
slots_in_an_hour
=
SLOTS_IN_AN_HOUR
):
current_block
=
[]
current_block
=
[]
...
@@ -92,16 +102,16 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
...
@@ -92,16 +102,16 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
if
self
.
event
.
reso_deadline
is
None
or
slot
.
end
<
self
.
event
.
reso_deadline
:
if
self
.
event
.
reso_deadline
is
None
or
slot
.
end
<
self
.
event
.
reso_deadline
:
constraints
.
append
(
"
resolution
"
)
constraints
.
append
(
"
resolution
"
)
for
(
ak
,
availabilit
y
)
in
ak_availabilities
.
items
():
for
ak
,
availabilit
ies
in
ak_availabilities
.
items
():
if
availability
.
contains
(
slot
):
if
_test_add_constraint
(
slot
,
availabilities
):
constraints
.
append
(
f
"
availability-ak-
{
ak
}
"
)
constraints
.
append
(
f
"
availability-ak-
{
ak
}
"
)
for
(
person
,
availabilit
y
)
in
person_availabilities
.
items
():
for
person
,
availabilit
ies
in
person_availabilities
.
items
():
if
availability
.
contains
(
slot
):
if
_test_add_constraint
(
slot
,
availabilities
):
constraints
.
append
(
f
"
availability-person-
{
person
}
"
)
constraints
.
append
(
f
"
availability-person-
{
person
}
"
)
for
(
room
,
availabilit
y
)
in
room_availabilities
.
items
():
for
person
,
availabilit
ies
in
room_availabilities
.
items
():
if
availability
.
contains
(
slot
):
if
_test_add_constraint
(
slot
,
availabilities
):
constraints
.
append
(
f
"
availability-room-
{
room
}
"
)
constraints
.
append
(
f
"
availability-room-
{
room
}
"
)
current_block
.
append
({
current_block
.
append
({
...
...
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