moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed a few spelling problems and standardised stdClass

Browse source
This commit is contained in:
Petr Skoda 2010-09-18 14:18:39 +00:00
parent 1c5765dd7a
commit 5924db724d
28 changed files with 151 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

20
mod/workshop/eval/best/lib.php
View file

@ -58,7 +58,7 @@ class workshop_best_evaluation implements workshop_evaluation {
* This function relies on the grading strategy subplugin providing get_assessments_recordset() method.
* {@see self::process_assessments()} for the required structure of the recordset.
*
* @param stdclass $settings The settings for this round of evaluation
* @param stdClass $settings The settings for this round of evaluation
* @param null|int|array $restrict If null, update all reviewers, otherwise update just grades for the given reviewers(s)
*
* @return void
@ -95,7 +95,7 @@ class workshop_best_evaluation implements workshop_evaluation {
if ($current->submissionid == $previous->submissionid) {
$batch[] = $current;
} else {
// process all the assessments of a sigle submission
// process all the assessments of a single submission
$this->process_assessments($batch, $diminfo, $settings);
// start with a new batch to be processed
$batch = array($current);
@ -146,7 +146,7 @@ class workshop_best_evaluation implements workshop_evaluation {
*
* @param array $assessments of stdclass (->assessmentid ->assessmentweight ->reviewerid ->gradinggrade ->submissionid ->dimensionid ->grade)
* @param array $diminfo of stdclass (->id ->weight ->max ->min)
* @param stdclass grading evaluation settings
* @param stdClass grading evaluation settings
* @return void
*/
protected function process_assessments(array $assessments, array $diminfo, stdclass $settings) {
@ -230,7 +230,7 @@ class workshop_best_evaluation implements workshop_evaluation {
protected function prepare_data_from_recordset($assessments) {
$data = array(); // to be returned
foreach ($assessments as $a) {
$id = $a->assessmentid; // just an abbrevation
$id = $a->assessmentid; // just an abbreviation
if (!isset($data[$id])) {
$data[$id] = new stdclass();
$data[$id]->assessmentid = $a->assessmentid;
@ -248,7 +248,7 @@ class workshop_best_evaluation implements workshop_evaluation {
/**
* Normalizes the dimension grades to the interval 0.00000 - 100.00000
*
* Note: this heavily relies on PHP5 way of handling references in array of stdclasses. Hopefuly
* Note: this heavily relies on PHP5 way of handling references in array of stdclasses. Hopefully
* it will not change again soon.
*
* @param array $assessments of stdclass as returned by {@see self::prepare_data_from_recordset()}
@ -276,7 +276,7 @@ class workshop_best_evaluation implements workshop_evaluation {
* The passed structure must be array of assessments objects with ->weight and ->dimgrades properties.
*
* @param array $assessments as prepared by {@link self::prepare_data_from_recordset()}
* @return null|stdclass
* @return null|stdClass
*/
protected function average_assessment(array $assessments) {
$sumdimgrades = array();
@ -332,7 +332,7 @@ class workshop_best_evaluation implements workshop_evaluation {
$sumweight = 0;
foreach ($asids as $asid) {
$x = $assessments[$asid]->dimgrades[$dimid]; // value (data point)
$weight = $assessments[$asid]->weight; // the values's weight
$weight = $assessments[$asid]->weight; // the values' weight
if ($weight == 0) {
continue;
}
@ -371,10 +371,10 @@ class workshop_best_evaluation implements workshop_evaluation {
* Returned value is rounded to 4 valid decimals to prevent some rounding issues - see the unit test
* for an example.
*
* @param stdclass $assessment the assessment being measured
* @param stdclass $referential assessment
* @param stdClass $assessment the assessment being measured
* @param stdClass $referential assessment
* @param array $diminfo of stdclass(->weight ->min ->max ->variance) indexed by dimension id
* @param stdclass $settings
* @param stdClass $settings
* @return float|null rounded to 4 valid decimals
*/
protected function assessments_distance(stdclass $assessment, stdclass $referential, array $diminfo, stdclass $settings) {

18
mod/workshop/eval/best/simpletest/testlib.php
View file

@ -103,7 +103,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
3 => (object)array('min' => 1, 'max' => 3),
4 => (object)array('min' => 0, 'max' => 20),
);
// excersise SUT
// exercise SUT
$norm = $this->evaluator->normalize_grades($assessments, $diminfo);
// validate
$this->assertIsA($norm, 'array');
@ -126,7 +126,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
$diminfo = array(
3 => (object)array('min' => 100, 'max' => 100),
);
// excersise SUT
// exercise SUT
$norm = $this->evaluator->normalize_grades($assessments, $diminfo);
// validate
$this->assertIsA($norm, 'array');
@ -144,7 +144,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
'weight' => 1,
'dimgrades' => array(1 => 0, 2 => 66.66667),
);
// excersise SUT
// exercise SUT
$average = $this->evaluator->average_assessment($assessments);
// validate
$this->assertIsA($average->dimgrades, 'array');
@ -167,7 +167,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
'weight' => 1,
'dimgrades' => array(3 => 11.0, 4 => 8.1, 5 => 88.0),
);
// excersise SUT
// exercise SUT
$average = $this->evaluator->average_assessment($assessments);
// validate
$this->assertIsA($average->dimgrades, 'array');
@ -187,7 +187,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
'weight' => 0,
'dimgrades' => array(3 => 11.0, 4 => 8.1, 5 => 88.0),
);
// excersise SUT
// exercise SUT
$average = $this->evaluator->average_assessment($assessments);
// validate
$this->assertNull($average);
@ -215,7 +215,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
'weight' => 1,
'dimgrades' => array(3 => 11, 4 => 9),
);
// excersise SUT
// exercise SUT
$variance = $this->evaluator->weighted_variance($assessments);
// validate
// dimension [3] have all the grades equal to 11
@ -233,7 +233,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
$assessment1 = (object)array('dimgrades' => array(3 => 15, 4 => 2));
$assessment2 = (object)array('dimgrades' => array(3 => 15, 4 => 2));
$settings = (object)array('comparison' => 5);
// excersise SUT and validate
// exercise SUT and validate
$this->assertEqual($this->evaluator->assessments_distance($assessment1, $assessment2, $diminfo, $settings), 0);
}
@ -248,7 +248,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
$assessment2 = (object)array('dimgrades' => array(3 => 75, 4 => 2));
$referential = (object)array('dimgrades' => array(3 => 50, 4 => 3));
$settings = (object)array('comparison' => 5);
// excersise SUT and validate
// exercise SUT and validate
$this->assertEqual($this->evaluator->assessments_distance($assessment1, $referential, $diminfo, $settings),
$this->evaluator->assessments_distance($assessment2, $referential, $diminfo, $settings));
*/
@ -261,7 +261,7 @@ class workshop_best_evaluation_test extends UnitTestCase {
$assessment2 = (object)array('dimgrades' => array(1 => 50, 2 => 33.33333));
$referential = (object)array('dimgrades' => array(1 => 25, 2 => 50));
$settings = (object)array('comparison' => 9);
// excersise SUT and validate
// exercise SUT and validate
$this->assertEqual($this->evaluator->assessments_distance($assessment1, $referential, $diminfo, $settings),
$this->evaluator->assessments_distance($assessment2, $referential, $diminfo, $settings));