-
Notifications
You must be signed in to change notification settings - Fork 64
书院课选课权重 #870
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Deophius
wants to merge
11
commits into
Yuanpei-Intelligence:develop
Choose a base branch
from
Deophius:course-select
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+110
−15
Open
书院课选课权重 #870
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b892248
解决选课函数中存在的竞争问题
Deophius 2e5d498
Add course priority field in NaturalPerson
Deophius 0c65370
Weighted lot drawing
Deophius 06e3178
Manage script for course priority
Deophius 7162758
Enhancements for update_course_priority
Deophius 186301c
Merge migration files
Deophius f11b99d
Revert "Merge migration files"
Deophius fce67d2
Style fix for script
Deophius bd104f6
Refactor update_course_priority into course_utils.py
Deophius f60312a
Use Counter to make code readable
Deophius a85c048
Use defaultdict to simplify code
Deophius File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| from django.core.management.base import BaseCommand | ||
| from django.db import transaction | ||
|
|
||
| from app.models import NaturalPerson, CourseRecord | ||
|
|
||
| from typing import Dict, List | ||
| from tqdm import trange | ||
|
|
||
| class Command(BaseCommand): | ||
| # This command should be run before new semester starts | ||
| help = "Updates course_priority for all NaturalPerson" | ||
|
|
||
| def add_arguments(self, parser): | ||
| parser.add_argument('year', type=int, help='year of the course records to check (required)') | ||
| parser.add_argument('semester', type=str, help='semester of the course records to check. Valid values are: Fall, Spring (required)') | ||
|
|
||
| @transaction.atomic | ||
| def handle(self, *args, **options): | ||
Deophius marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| # Currently, just adjust all of them to 1. | ||
| NaturalPerson.objects.update(course_priority=1.0) | ||
| # Comment out this return to enable course priority | ||
| # return | ||
| if options['semester'] not in ('Fall', 'Spring'): | ||
| print('Error: <semester> must have value of "Fall" or "Spring"!') | ||
| return | ||
| # A list of invalid record's student id. | ||
| invalid_id: List[int] = list(CourseRecord.objects.filter( | ||
| year = options['year'], invalid = True, semester = options['semester'] | ||
| ).order_by( | ||
| 'person__id' | ||
| ).values_list( | ||
| 'person__id', flat = True | ||
| )) | ||
| # Number of invalid records | ||
| n = len(invalid_id) | ||
| print(f'update_course_priority: There are {n} invalid records.') | ||
| # a[k] is the list of id of people who have k invalid records | ||
| a: Dict[int, List[int]] = dict() | ||
Deophius marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| # Length of the current continuous segment | ||
| k = 0 | ||
| for i in trange(n, desc = 'Processing invalid records'): | ||
| k += 1 | ||
| if i == n - 1 or invalid_id[i] != invalid_id[i + 1]: | ||
| if k not in a: | ||
| a[k] = [] | ||
| a[k].append(invalid_id[i]) | ||
| k = 0 | ||
| # Print out a summary of invalid records | ||
| for i in a: | ||
| print(f'There are {len(a[i])} people with {i} invalid records...') | ||
| p = max(0.5, 1 - 0.05 * i) | ||
pkuGenuine marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| NaturalPerson.objects.filter(id__in = a[i]).update(course_priority = p) | ||
| print('Done!') | ||
Deophius marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
23 changes: 23 additions & 0 deletions
23
app/migrations/0009_naturalperson_course_priority_and_more.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # Generated by Django 5.0.9 on 2025-01-19 15:23 | ||
|
|
||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
| dependencies = [ | ||
| ("app", "0008_pool_activity_alter_poolitem_exchange_attributes_and_more"), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.AddField( | ||
| model_name="naturalperson", | ||
| name="course_priority", | ||
| field=models.FloatField(default=1.0, verbose_name="书院课选课权重"), | ||
| ), | ||
| migrations.AddConstraint( | ||
| model_name="courseparticipant", | ||
| constraint=models.UniqueConstraint( | ||
| fields=("course", "person"), name="Unique course selection record" | ||
| ), | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.