--- loncom/interface/statistics/lonstathelpers.pm 2004/09/23 15:31:40 1.25 +++ loncom/interface/statistics/lonstathelpers.pm 2004/12/02 21:53:33 1.32 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.25 2004/09/23 15:31:40 matthew Exp $ +# $Id: lonstathelpers.pm,v 1.32 2004/12/02 21:53:33 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -118,6 +118,7 @@ sub ProblemSelector { my ($AcceptedResponseTypes) = @_; my $Str; $Str = "\n\n"; + my $rb_count =0; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) { next if ($seq->{'num_assess'}<1); my $seq_str = ''; @@ -141,16 +142,17 @@ sub ProblemSelector { if (! defined($title) || $title eq '') { ($title) = ($res->{'src'} =~ m:/([^/]*)$:); } - $seq_str .= ''. + qq{}. + ''. + '\n"; + $rb_count++; } } } @@ -304,8 +306,10 @@ sub new_accumulator { $target .= 'id="'.$seq_id.':'.$item_id++.'" '; $target.= 'value="'.&Apache::lonnet::escape($res->symb).'" />'. - ' '.$res->compTitle.''. - ''.$/; + ' '.$res->compTitle.''. + (' 'x2).'view'. + ''.$/; } else { if (defined($target)) { return { title => $title, @@ -551,6 +555,7 @@ Returns: nothing ##################################################### sub GetStudentAnswers { my ($r,$problem,$Students,$formname,$inputname) = @_; + my %answers; my $status_type; if (defined($formname)) { $status_type = 'inline'; @@ -574,18 +579,19 @@ sub GetStudentAnswers { last if ($c->aborted()); my $sname = $student->{'username'}; my $sdom = $student->{'domain'}; - my $answer = &Apache::lonstathelpers::analyze_problem_as_student + my $answer = &Apache::lonstathelpers::get_student_answer ($resource,$sname,$sdom,$partid,$respid); &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, &mt('last student')); + $answers{$answer}++; $student->{'answer'} = $answer; } - &Apache::lonstathelpers::write_answer_cache(); + &Apache::lonstathelpers::write_analysis_cache(); return if ($c->aborted()); $r->rflush(); # close progress window &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - return; + return \%answers; } ##################################################### @@ -595,13 +601,61 @@ sub GetStudentAnswers { =item analyze_problem_as_student -Analyzes a homework problem for a student and returns the correct answer -for the student. Attempts to put together an answer for problem types -that do not natively support it. +Analyzes a homework problem for a student Inputs: $resource: a resource object $sname, $sdom, $partid, $respid +Returns: the problem analysis hash + +=cut + +##################################################### +##################################################### +sub analyze_problem_as_student { + my ($resource,$sname,$sdom) = @_; + if (ref($resource) ne 'HASH') { + my $res = $resource; + $resource = { 'src' => $res->src, + 'symb' => $res->symb, + 'parts' => $res->parts }; + foreach my $part (@{$resource->{'parts'}}) { + $resource->{'partdata'}->{$part}->{'ResponseIds'}= + [$res->responseIds($part)]; + } + } + my $url = $resource->{'src'}; + my $symb = $resource->{'symb'}; + my $analysis = &get_from_analysis_cache($sname,$sdom,$symb); + if (! defined($analysis)) { + my $courseid = $ENV{'request.course.id'}; + my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', + 'grade_domain' => $sdom, + 'grade_username' => $sname, + 'grade_symb' => $symb, + 'grade_courseid' => $courseid)); + (my $garbage,$analysis)=split(/_HASH_REF__/,$Answ,2); + &store_analysis($sname,$sdom,$symb,$analysis); + } + my %Answer=&Apache::lonnet::str2hash($analysis); + # + return \%Answer; +} + +##################################################### +##################################################### + +=pod + +=item get_student_answer + +Analyzes a homework problem for a particular student and returns the correct +answer. Attempts to put together an answer for problem types +that do not natively support it. + +Inputs: $resource: a resource object (from navmaps or hash from loncoursedata) + $sname, $sdom, $partid, $respid + Returns: $answer If $partid and $respid are specified, $answer is simply a scalar containing @@ -614,8 +668,9 @@ keys $partid.'.'.$respid.'.answer'. ##################################################### ##################################################### -sub analyze_problem_as_student { +sub get_student_answer { my ($resource,$sname,$sdom,$partid,$respid) = @_; + # if (ref($resource) ne 'HASH') { my $res = $resource; $resource = { 'src' => $res->src, @@ -626,32 +681,20 @@ sub analyze_problem_as_student { [$res->responseIds($part)]; } } - my $returnvalue; - my $url = $resource->{'src'}; - my $symb = $resource->{'symb'}; - my $answer = &get_from_answer_cache($sname,$sdom,$symb,$partid,$respid); - if (defined($answer)) { - return($answer); - } - my $courseid = $ENV{'request.course.id'}; - my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', - 'grade_domain' => $sdom, - 'grade_username' => $sname, - 'grade_symb' => $symb, - 'grade_courseid' => $courseid)); - (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); - my %Answer=&Apache::lonnet::str2hash($Answ); # - undef($answer); + my $analysis = + &analyze_problem_as_student($resource,$sname,$sdom); + my $answer; foreach my $partid (@{$resource->{'parts'}}) { my $partdata = $resource->{'partdata'}->{$partid}; foreach my $respid (@{$partdata->{'ResponseIds'}}) { my $prefix = $partid.'.'.$respid; my $key = $prefix.'.answer'; - $answer->{$partid}->{$respid} = &get_answer($prefix,$key,%Answer); + $answer->{$partid}->{$respid} = + &get_answer($prefix,$key,%$analysis); } } - &store_answer($sname,$sdom,$symb,undef,undef,$answer); + my $returnvalue; if (! defined($partid)) { $returnvalue = $answer; } elsif (! defined($respid)) { @@ -696,7 +739,6 @@ sub get_answer { return $returnvalue; } - ##################################################### ##################################################### @@ -706,7 +748,7 @@ sub get_answer { =over 4 -=item &load_answer_cache($symb) +=item &load_analysis_cache($symb) Loads the cache for the given symb into memory from disk. Requires the cache filename be set. @@ -721,7 +763,7 @@ Only should be called by &ensure_proper_ my $current_symb = undef; my %cache; -sub load_answer_cache { +sub load_analysis_cache { my ($symb) = @_; return if (! defined($cache_filename)); if (! defined($current_symb) || $current_symb ne $symb) { @@ -744,34 +786,20 @@ sub load_answer_cache { =pod -=item &get_from_answer_cache($sname,$sdom,$symb,$partid,$respid) +=item &get_from_analysis_cache($sname,$sdom,$symb,$partid,$respid) Returns the appropriate data from the cache, or undef if no data exists. -If $respid is undefined, a hash ref containing the answers for the given -$partid is returned. If $partid is undefined, a hash ref containing answers -for all of the parts is returned. =cut ##################################################### ##################################################### -sub get_from_answer_cache { - my ($sname,$sdom,$symb,$partid,$respid) = @_; +sub get_from_analysis_cache { + my ($sname,$sdom,$symb) = @_; &ensure_proper_cache($symb); my $returnvalue; - if (exists($cache{$sname.':'.$sdom}) && - ref($cache{$sname.':'.$sdom}) eq 'HASH') { - if (defined($partid) && - exists($cache{$sname.':'.$sdom}->{$partid})) { - if (defined($respid) && - exists($cache{$sname.':'.$sdom}->{$partid}->{$respid})) { - $returnvalue = $cache{$sname.':'.$sdom}->{$partid}->{$respid}; - } else { - $returnvalue = $cache{$sname.':'.$sdom}->{$partid}; - } - } else { - $returnvalue = $cache{$sname.':'.$sdom}; - } + if (exists($cache{$sname.':'.$sdom})) { + $returnvalue = $cache{$sname.':'.$sdom}; } else { $returnvalue = undef; } @@ -783,16 +811,16 @@ sub get_from_answer_cache { =pod -=item &write_answer_cache($symb) +=item &write_analysis_cache($symb) Writes the in memory cache to disk so that it can be read in with -&load_answer_cache($symb). +&load_analysis_cache($symb). =cut ##################################################### ##################################################### -sub write_answer_cache { +sub write_analysis_cache { return if (! defined($current_symb) || ! defined($cache_filename)); my %cache_db; my $key = &Apache::lonnet::escape($current_symb); @@ -816,7 +844,7 @@ sub write_answer_cache { =item &ensure_proper_cache($symb) Called to make sure we have the proper cache set up. This is called -prior to every answer lookup. +prior to every analysis lookup. =cut @@ -826,16 +854,16 @@ sub ensure_proper_cache { my ($symb) = @_; my $cid = $ENV{'request.course.id'}; my $new_filename = '/home/httpd/perl/tmp/'. - 'problemanalysis_'.$cid.'_answer_cache.db'; + 'problemanalysis_'.$cid.'_analysis_cache.db'; if (! defined($cache_filename) || $cache_filename ne $new_filename || ! defined($current_symb) || $current_symb ne $symb) { $cache_filename = $new_filename; # Notice: $current_symb is not set to $symb until after the cache is - # loaded. This is what tells &load_answer_cache to load in a new + # loaded. This is what tells &load_analysis_cache to load in a new # symb cache. - &load_answer_cache($symb); + &load_analysis_cache($symb); $current_symb = $symb; } } @@ -845,26 +873,18 @@ sub ensure_proper_cache { =pod -=item &store_answer($sname,$sdom,$symb,$partid,$respid,$dataset) +=item &store_analysis($sname,$sdom,$symb,$partid,$respid,$dataset) -Stores the answer data in the in memory cache. +Stores the analysis data in the in memory cache. =cut ##################################################### ##################################################### -sub store_answer { - my ($sname,$sdom,$symb,$partid,$respid,$dataset) = @_; +sub store_analysis { + my ($sname,$sdom,$symb,$dataset) = @_; return if ($symb ne $current_symb); - if (defined($partid)) { - if (defined($respid)) { - $cache{$sname.':'.$sdom}->{$partid}->{$respid} = $dataset; - } else { - $cache{$sname.':'.$sdom}->{$partid} = $dataset; - } - } else { - $cache{$sname.':'.$sdom}=$dataset; - } + $cache{$sname.':'.$sdom}=$dataset; return; } @@ -1104,13 +1124,15 @@ sub get_problem_data { $Partdata{$part}->{'_Options'}=$value; } elsif ($key eq 'concepts') { $Partdata{$part}->{'_Concepts'}=$value; + } elsif ($key eq 'items') { + $Partdata{$part}->{'_Items'}=$value; } elsif ($key =~ /^concept\.(.*)$/) { my $concept = $1; foreach my $foil (@$value) { $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= $concept; } - } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high)$/) { + } elsif ($key =~ /^(unit|incorrect|answer|ans_low|ans_high|str_type)$/) { $Partdata{$part}->{$key}=$value; } } else { @@ -1122,13 +1144,51 @@ sub get_problem_data { } elsif ($key =~ /^foil\.value\.(.*)$/) { my $foil = $1; $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value; + } elsif ($key eq 'answercomputed') { + $Partdata{$part}->{'answercomputed'} = $value; } } } } + # Further debugging code + if (0) { + &Apache::lonnet::logthis('lonstathelpers::get_problem_data'); + &log_hash_ref(\%Partdata); + } return %Partdata; } +sub log_array_ref { + my ($arrayref,$prefix) = @_; + return if (ref($arrayref) ne 'ARRAY'); + if (! defined($prefix)) { $prefix = ''; }; + foreach my $v (@$arrayref) { + if (ref($v) eq 'ARRAY') { + &log_array_ref($v,$prefix.' '); + } elsif (ref($v) eq 'HASH') { + &log_hash_ref($v,$prefix.' '); + } else { + &Apache::lonnet::logthis($prefix.'"'.$v.'"'); + } + } +} + +sub log_hash_ref { + my ($hashref,$prefix) = @_; + return if (ref($hashref) ne 'HASH'); + if (! defined($prefix)) { $prefix = ''; }; + while (my ($k,$v) = each(%$hashref)) { + if (ref($v) eq 'ARRAY') { + &Apache::lonnet::logthis($prefix.'"'.$k.'" = array'); + &log_array_ref($v,$prefix.' '); + } elsif (ref($v) eq 'HASH') { + &Apache::lonnet::logthis($prefix.'"'.$k.'" = hash'); + &log_hash_ref($v,$prefix.' '); + } else { + &Apache::lonnet::logthis($prefix.'"'.$k.'" => "'.$v.'"'); + } + } +} #################################################### ####################################################
'. - ''. - ''. - $resptype.''. - ''.$title.' '; -# ''.$resptype.' '.$res->{'title'}.' '; + $seq_str .= '
'; if (scalar(@{$partdata->{'ResponseIds'}}) > 1) { $seq_str .= &mt('response').' '.$respid; } + $seq_str .= (' 'x2). + qq{view}; $seq_str .= "