Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just a bit of cleanup. No code changes

Browse Source
This commit is contained in:
Bridger Maxwell
2012-04-16 22:15:58 -04:00
parent fcb530f1e3
commit a763edab40
2 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
djangoapps/courseware/__init__.py
View File

@@ -15,7 +15,6 @@ from courseware.course_settings import GRADER # This won't work.
"""
import courseware
import imp
import logging
@@ -28,8 +27,6 @@ from courseware import global_course_settings
_log = logging.getLogger("mitx.courseware")
class Settings(object):
def __init__(self):
# update this dict from global settings (but only for ALL_CAPS settings)
@@ -53,5 +50,4 @@ class Settings(object):
setting_value = getattr(mod, setting)
setattr(self, setting, setting_value)
course_settings = Settings()

80
djangoapps/courseware/grades.py
View File

@@ -16,7 +16,6 @@ log = logging.getLogger("mitx.courseware")
Score = namedtuple("Score", "earned possible graded section")
SectionPercentage = namedtuple("SectionPercentage", "percentage label summary")
class CourseGrader(object):
"""
A course grader takes the totaled scores for each graded section (that a student has
@@ -271,45 +270,6 @@ class AssignmentFormatGrader(CourseGrader):
#No grade_breakdown here
}
def get_score(user, problem, cache):
## HACK: assumes max score is fixed per problem
id = problem.get('id')
correct = 0.0
# If the ID is not in the cache, add the item
if id not in cache:
module = StudentModule(module_type = 'problem', # TODO: Move into StudentModule.__init__?
module_id = id,
student = user,
state = None,
grade = 0,
max_grade = None,
done = 'i')
cache[id] = module
# Grab the # correct from cache
if id in cache:
response = cache[id]
if response.grade!=None:
correct=float(response.grade)
# Grab max grade from cache, or if it doesn't exist, compute and save to DB
if id in cache and response.max_grade != None:
total = response.max_grade
else:
total=float(courseware.modules.capa_module.Module(etree.tostring(problem), "id").max_score())
response.max_grade = total
response.save()
#Now we re-weight the problem, if specified
weight = problem.get("weight", None)
if weight:
weight = float(weight)
correct = correct * weight / total
total = weight
return (correct, total)
def grade_sheet(student):
"""
This pulls a summary of all problems in the course. It returns a dictionary with two datastructures:
@@ -405,3 +365,43 @@ def aggregate_scores(scores, section_name = "summary"):
section_name)
return all_total, graded_total
def get_score(user, problem, cache):
## HACK: assumes max score is fixed per problem
id = problem.get('id')
correct = 0.0
# If the ID is not in the cache, add the item
if id not in cache:
module = StudentModule(module_type = 'problem', # TODO: Move into StudentModule.__init__?
module_id = id,
student = user,
state = None,
grade = 0,
max_grade = None,
done = 'i')
cache[id] = module
# Grab the # correct from cache
if id in cache:
response = cache[id]
if response.grade!=None:
correct=float(response.grade)
# Grab max grade from cache, or if it doesn't exist, compute and save to DB
if id in cache and response.max_grade != None:
total = response.max_grade
else:
total=float(courseware.modules.capa_module.Module(etree.tostring(problem), "id").max_score())
response.max_grade = total
response.save()
#Now we re-weight the problem, if specified
weight = problem.get("weight", None)
if weight:
weight = float(weight)
correct = correct * weight / total
total = weight
return (correct, total)