L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-35055_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-08-27 16:16:46 +02:00
parent 48ee721e2f 4d0a7e2b1f
commit 473285edde
2 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/questionlib.php
+23 -18
View File
@@ -209,39 +209,44 @@ function get_grade_options() {
}
/**
* match grade options
* if no match return error or match nearest
* Check whether a given grade is one of a list of allowed options. If not,
* depending on $matchgrades, either return the nearest match, or return false
* to signal an error.
* @param array $gradeoptionsfull list of valid options
* @param int $grade grade to be tested
* @param string $matchgrades 'error' or 'nearest'
* @return mixed either 'fixed' value or false if erro
* @return mixed either 'fixed' value or false if error.
*/
function match_grade_options($gradeoptionsfull, $grade, $matchgrades='error') {
function match_grade_options($gradeoptionsfull, $grade, $matchgrades = 'error') {
if ($matchgrades == 'error') {
// if we just need an error...
// (Almost) exact match, or an error.
foreach ($gradeoptionsfull as $value => $option) {
// slightly fuzzy test, never check floats for equality :-)
// Slightly fuzzy test, never check floats for equality.
if (abs($grade - $value) < 0.00001) {
return $grade;
return $value; // Be sure the return the proper value.
}
}
// didn't find a match so that's an error
// Didn't find a match so that's an error.
return false;
} else if ($matchgrades == 'nearest') {
// work out nearest value
$hownear = array();
// Work out nearest value
$best = false;
$bestmismatch = 2;
foreach ($gradeoptionsfull as $value => $option) {
if ($grade==$value) {
return $grade;
$newmismatch = abs($grade - $value);
if ($newmismatch < $bestmismatch) {
$best = $value;
$bestmismatch = $newmismatch;
}
$hownear[ $value ] = abs( $grade - $value );
}
// reverse sort list of deltas and grab the last (smallest)
asort( $hownear, SORT_NUMERIC );
reset( $hownear );
return key( $hownear );
return $best;
} else {
return false;
// Unknow option passed.
throw new coding_exception('Unknown $matchgrades ' . $matchgrades .
' passed to match_grade_options');
}
}
lib/tests/questionlib_test.php
+15
View File
@@ -55,4 +55,19 @@ class questionlib_testcase extends basic_testcase {
array(0 => 't1', 1 => 't2', 2 => 't3'));
}
public function test_match_grade_options() {
$gradeoptions = question_bank::fraction_options_full();
$this->assertEquals(0.3333333, match_grade_options($gradeoptions, 0.3333333, 'error'));
$this->assertEquals(0.3333333, match_grade_options($gradeoptions, 0.333333, 'error'));
$this->assertEquals(0.3333333, match_grade_options($gradeoptions, 0.33333, 'error'));
$this->assertFalse(match_grade_options($gradeoptions, 0.3333, 'error'));
$this->assertEquals(0.3333333, match_grade_options($gradeoptions, 0.3333333, 'nearest'));
$this->assertEquals(0.3333333, match_grade_options($gradeoptions, 0.333333, 'nearest'));
$this->assertEquals(0.3333333, match_grade_options($gradeoptions, 0.33333, 'nearest'));
$this->assertEquals(0.3333333, match_grade_options($gradeoptions, 0.33, 'nearest'));
$this->assertEquals(-0.1428571, match_grade_options($gradeoptions, -0.15, 'nearest'));
}
}