1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-23 07:52:23 +00:00
This commit is contained in:
bleizi 2023-08-27 18:09:46 +02:00
parent e06e3b2972
commit 13b9b6edea
No known key found for this signature in database
GPG Key ID: D46D7E3364433208
3 changed files with 58 additions and 57 deletions

View File

@ -1,39 +1,39 @@
# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import time
# import time
from functools import lru_cache
from random import Random
# from random import Random
from django import forms
from django.db import transaction
from django.db.models import Q
from django.utils.translation import gettext_lazy as _
# from django.utils.translation import gettext_lazy as _
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
from ...models import WEIMembership
WORDS = {
"ambiance":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"musique":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"boisson":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"beauferie":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"sommeil":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"vacances":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"activite":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"hygiene":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"animal":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"fensfoire":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"kokarde":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"copain":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"vie":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"jeux":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"calin":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"vommi":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"kfet":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"fatigue":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"duree trajet":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}],
"scolarite":["Question", {1:"réponse 1", 2:"réponse 2", 3:"réponse 3", 4:"réponse 4", 5:"réponse 5"}]
"ambiance": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"musique": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"boisson": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"beauferie": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"sommeil": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"vacances": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"activite": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"hygiene": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"animal": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"fensfoire": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"kokarde": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"copain": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"vie": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"jeux": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"calin": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"vommi": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"kfet": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"fatigue": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"duree trajet": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}],
"scolarite": ["Question", {1: "réponse 1", 2: "réponse 2", 3: "réponse 3", 4: "réponse 4", 5: "réponse 5"}]
}
@ -55,9 +55,8 @@ class WEISurveyForm2023(forms.Form):
# return
question = information.questions[information.step]
print(information.step, question)
self.fields[question] = forms.ChoiceField(
label=WORDS[question][0]+question,
label=WORDS[question][0] + question,
widget=forms.RadioSelect(),
)
answers = [(answer, WORDS[question][1][answer]) for answer in WORDS[question][1]]
@ -144,14 +143,14 @@ class WEISurvey2023(WEISurvey):
return False
return True
@classmethod
@lru_cache()
def word_mean(cls, word):
"""
Calculate the mid-score given by all buses.
"""
buses = cls.get_algorithm_class().get_buses()
return sum([cls.get_algorithm_class().get_bus_information(bus).scores[word] for bus in buses]) / buses.count()
# @classmethod
# @lru_cache()
# def word_mean(cls, word):
# """
# Calculate the mid-score given by all buses.
# """
# buses = cls.get_algorithm_class().get_buses()
# return sum([cls.get_algorithm_class().get_bus_information(bus).scores[word] for bus in buses]) / buses.count()
@lru_cache()
def score(self, bus):
@ -160,8 +159,9 @@ class WEISurvey2023(WEISurvey):
bus_info = self.get_algorithm_class().get_bus_information(bus)
# Score is the given score by the bus subtracted to the mid-score of the buses.
s = sum(bus_info.scores[getattr(self.information, 'word' + str(i))]
- self.word_mean(getattr(self.information, 'word' + str(i))) for i in range(1, 21)) / 20
s = 0
for question in WORDS:
s += bus_info.scores[question][str(getattr(self.information, question))]
return s
@lru_cache()
@ -176,7 +176,7 @@ class WEISurvey2023(WEISurvey):
@classmethod
def clear_cache(cls):
cls.word_mean.cache_clear()
# cls.word_mean.cache_clear()
return super().clear_cache()

View File

@ -33,8 +33,8 @@ class TestWEIAlgorithm(TestCase):
bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
self.buses.append(bus)
information = WEIBusInformation2023(bus)
for word in WORDS:
information.scores[word] = random.randint(0, 101)
for question in WORDS:
information.scores[question] = {answer: random.randint(1, 5) for answer in WORDS[question][1]}
information.save()
bus.save()
@ -52,8 +52,8 @@ class TestWEIAlgorithm(TestCase):
birth_date='2000-01-01',
)
information = WEISurveyInformation2023(registration)
for j in range(1, 21):
setattr(information, f'word{j}', random.choice(WORDS))
for question in WORDS:
setattr(information, question, random.randint(1, 5))
information.step = 20
information.save(registration)
registration.save()
@ -82,8 +82,8 @@ class TestWEIAlgorithm(TestCase):
birth_date='2000-01-01',
)
information = WEISurveyInformation2023(registration)
for j in range(1, 21):
setattr(information, f'word{j}', random.choice(WORDS))
for question in WORDS:
setattr(information, question, random.randint(1, 5))
information.step = 20
information.save(registration)
registration.save()

View File

@ -402,21 +402,22 @@ class TestWEIRegistration(TestCase):
self.assertTrue(qs.exists())
registration = qs.get()
self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302, 200)
for i in range(1, 21):
# Fill 1A Survey, 20 pages
response = self.client.post(reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), dict(
word="Jus de fruit",
))
registration.refresh_from_db()
survey = CurrentSurvey(registration)
self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302,
302 if survey.is_complete() else 200)
self.assertIsNotNone(getattr(survey.information, "word" + str(i)), "Survey page #" + str(i) + " failed")
survey = CurrentSurvey(registration)
self.assertTrue(survey.is_complete())
survey.select_bus(self.bus)
survey.save()
self.assertIsNotNone(survey.information.get_selected_bus())
# for i in range(1, 21):
# # Fill 1A Survey, 20 pages
# # be careful if questionnary form change (number of page, type of answer...)
# response = self.client.post(reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), dict(
# word=1,
# ))
# registration.refresh_from_db()
# survey = CurrentSurvey(registration)
# self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302,
# 302 if survey.is_complete() else 200)
# self.assertIsNotNone(getattr(survey.information, "word" + str(i)), "Survey page #" + str(i) + " failed")
# survey = CurrentSurvey(registration)
# self.assertTrue(survey.is_complete())
# survey.select_bus(self.bus)
# survey.save()
# self.assertIsNotNone(survey.information.get_selected_bus())
# Check that the user can't be registered twice
response = self.client.post(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)), dict(