jshbrmn/irt-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

but when removing enemy constraints

Browse Source
This commit is contained in:
Joshua Burman 2023-11-14 16:14:23 -05:00
parent 4e8c8416b6
commit c15345867d
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/problem_helper.py
View File

@ -3,21 +3,19 @@ from typing import Tuple
from models.item import Item from models.item import Item
def sanctify(solved_items: [Item]) -> Tuple[list]: def sanctify(solved_items: [Item]) -> Tuple[list]:
sacred_ids = []
enemy_ids = [] enemy_ids = []
# get all enemies # get all enemies
for item in solved_items: for item in solved_items:
# if the item is already an an enemy
# then it's enemy is sacred
if item.id not in enemy_ids:
# if it has enemies, check if it exists as part of the solved items # if it has enemies, check if it exists as part of the solved items
for enemy_id in item.enemies: for enemy_id in item.enemies:
# if it does, it's a true enemy # if it does, it's a true enemy
if enemy_id in (item.id for item in solved_items): if enemy_id in (i.id for i in solved_items):
enemy_ids.append(enemy_id) enemy_ids.append(enemy_id)
# remove enemy from solved items,
# lest it has this sacred item added to enemies
solved_items = [i for i in solved_items if i.id != enemy_id]
# the item is cleansed, now it's sacred sacred_ids = [i.id for i in solved_items if i.id not in enemy_ids]
sacred_ids.append(item.id)
return sacred_ids, enemy_ids return sacred_ids, enemy_ids

9
app/models/item.py
View File

@ -1,4 +1,4 @@
from pydantic import BaseModel from pydantic import BaseModel, validator
from typing import List, Optional from typing import List, Optional
from models.attribute import Attribute from models.attribute import Attribute
@ -16,6 +16,13 @@ class Item(BaseModel):
b_param: float = 0.00 b_param: float = 0.00
response: Optional[int] = None response: Optional[int] = None
@validator("enemies", pre=True)
def set_enemies(cls, v) -> List[id]:
if v == "":
return []
enemies = list(filter(None, [int(enemy) for enemy in v.split(",")]))
return enemies
def iif(self, irt_model, theta): def iif(self, irt_model, theta):
return ItemInformationFunction(irt_model).calculate(b_param=self.b_param, theta=theta) return ItemInformationFunction(irt_model).calculate(b_param=self.b_param, theta=theta)

5
app/models/problem.py
View File

@ -8,7 +8,6 @@ from pulp import LpProblem, LpVariable, LpStatus, lpSum
import logging import logging
from helpers.problem_helper import * from helpers.problem_helper import *
from helpers import service_helper from helpers import service_helper
from models.solution import Solution from models.solution import Solution
@ -67,8 +66,8 @@ class Problem(BaseModel):
logging.info('enemies found, adding constraints...') logging.info('enemies found, adding constraints...')
# remove old enemy/sacred constraints # remove old enemy/sacred constraints
self.problem.constraints.pop('Exclude_enemy_items') if 'Exclude_enemy_items' in self.problem.constraints.keys(): self.problem.constraints.pop('Exclude_enemy_items')
self.problem.constraints.pop('Include_sacred_items') if 'Include_sacred_items' in self.problem.constraints.keys(): self.problem.constraints.pop('Include_sacred_items')
# add constraint to not allow enemy items # add constraint to not allow enemy items
self.problem += lpSum([ self.problem += lpSum([