--- loncom/interface/lonstatistics.pm 2002/05/13 16:41:46 1.17 +++ loncom/interface/lonstatistics.pm 2002/05/14 23:17:06 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonstatistics.pm,v 1.17 2002/05/13 16:41:46 minaeibi Exp $ +# $Id: lonstatistics.pm,v 1.18 2002/05/14 23:17:06 minaeibi Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,7 +30,8 @@ # 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei # 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei # YEAR=2002 -# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6,5/12 Behrouz Minaei +# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei +# 5/12, 5/14 Behrouz Minaei # ### @@ -83,7 +84,7 @@ my %ConceptData; my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod", 4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff", 9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd"); -my @shown; +my %Answer = (); sub InitAnalysis { my ($rid, $student)=@_; @@ -100,7 +101,7 @@ sub InitAnalysis { # my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze')); (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); - my %Answer=(); + %Answer=(); %Answer=&Apache::lonnet::str2hash($Answ); my $parts=''; @@ -115,17 +116,9 @@ sub InitAnalysis { chop($conc); @Concepts=split(/\@/,$conc); - my $show=''; - foreach my $elm (@{$Answer{"$parts.shown"}}) { - $show.="$elm@"; - } - chop($show); - @shown=split(/\@/,$show); -# $r->print("
shown:".$show);# $r->rflush(); foreach my $concept (@{$Answer{"$parts.concepts"}}) { foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) { $foil_to_concept{$foil} = $concept; - $ConceptData{$foil} = $Answer{"$parts.foil.value.$foil"}; } } return $symb; @@ -138,7 +131,6 @@ sub Interval { my $due = &Apache::lonnet::EXT('resource.$part.duedate',$symb)+1; my $opn = &Apache::lonnet::EXT('resource.$part.opendate',$symb); my $add=int(($due-$opn)/$Int); -#$r->print("
$opn, to $due add=$add int=$Int");#$r->rflush(); $ConceptData{"Int.0"}=$opn; for (my $i=1;$i<$Int;$i++) { $ConceptData{"Int.$i"}=$opn+$i*$add; @@ -155,24 +147,7 @@ sub Interval { sub ShowOpGraph { - my ($InpStr, $Int_No)=@_; - - $r->print(< - - function display(name) { - document.forms.displayform.elements.dis.value=name; - window.status=name; - } - function cleardisplay() { - document.forms.displayform.elements.dis.value=''; - window.status='No Concept in particular'; - } - - -ENDPOP - my ($rid,$part)=split(/\:/,substr($InpStr,8)); $ConceptData{"Interval"}=$Int_No; my $symb=&InitAnalysis($rid,$students[0]); @@ -181,11 +156,6 @@ ENDPOP my $Src = $hash{'title_'.$rid}; $Src =~ s/\ /"_"/eg; $r->print('
'.$URI.''); - for (my $n=1; $n<=$#Concepts+1; $n++ ) { - my $tmp=$Concepts[$n-1]; - $tmp =~ s/print("
Concept $n:$tmp"); - } $r->rflush(); &Create_PrgWin(); @@ -197,9 +167,7 @@ ENDPOP &Close_PrgWin(); for (my $k=0; $k<$Int_No; $k++ ) { - my $data1=''; - my $data2=''; - &DrawGraph(&AdjustData($k).'+'.$Src.'+'.($k+1)); + &DrawGraph($k,$Src); } #$Apache::lonxml::debug=1; #&Apache::lonhomework::showhash(%ConceptData); @@ -208,85 +176,71 @@ ENDPOP $r->print("
Here you can see the Problem:
$Answ"); } -sub AdjustData { - my $k=shift; + +sub DrawGraph { + my ($k,$Src)=@_; my $Max=0; my @data1; my @data2; + my $Correct=0; + my $Wrong=0; + # Adjust Data and find the Max for (my $n=0; $n<=$#Concepts; $n++ ) { my $tmp=$Concepts[$n]; $data1[$n]=$ConceptData{"$tmp.$k.true"}; + $Correct+=$data1[$n]; $data2[$n]=$ConceptData{"$tmp.$k.false"}; + $Wrong+=$data2[$n]; my $Sum=$data1[$n]+$data2[$n]; if ( $Max<$Sum ) {$Max=$Sum;} - $ConceptData{"$tmp.true"}+=$data1[$n]; - $ConceptData{"$tmp.false"}+=$data2[$n]; } for (my $n=0; $n<=$#Concepts; $n++ ) { if ($data1[$n]+$data2[$n]<$Max) { $data2[$n]+=$Max-($data1[$n]+$data2[$n]); } } - return join(',',@data1).'+'. - join(',',@data2).'+'. - $Max.'+'.($#data1+1); -} + my $P_No = $#data1+1; +# $r->print('
From: ['.localtime($ConceptData{'Int.'.($k-1)}). +# '] To: ['.localtime($ConceptData{"Int.$k"}).']'); + my $Str = "\n".''. + "\n".''. + "\n".''. + "\n".''. + "\n".''. + "\n".''. + "\n".''; + for (my $n=0; $n<=$#Concepts; $n++ ) { + $Str .= "\n"."". + "\n"."". + "\n"."". + "\n"."". + "\n"."". + "\n".""; + } + $Str.='"; -sub DrawGraph { - my $data=shift; - my($data1,$data2,$Max,$P_No,$Src,$k)=split(/\+/,$data); + $Str .= "\n".'
# Concept Correct Wrong
".($n+1)." ".$Concepts[$n]." ".$data1[$n]." ".$data2[$n]."
From:['.localtime($ConceptData{'Int.'.($k-1)}). + '] To: ['.localtime($ConceptData{"Int.$k"}). + "]$Correct$Wrong
'; - my $Str="\n".''. - "\n".''. - "\n".''. - "\n".''. - "\n".''. - "\n".''. - "\n".''. - "\n"."". - "\n"."". - "\n"."". - "\n"."". - "\n"."". - "\n"."
Correct Answers Wrong Answers From To
$data1 $data2 ".localtime($ConceptData{'Int.'.($k-1)})." ".localtime($ConceptData{'Int.'.$k}-1)."
"; $r->print($Str); -# $r->print('
Correct Answers: '.$data1. -# '
Wrong Answers: '.$data2); -# $r->print('
From: '.localtime($ConceptData{'Int.'.($k-1)}). -# '
To: '.localtime($ConceptData{"Int.$k"})); - -# if ( $Max > 1 ) { -# $Max += (10 - $Max % 10); -# $Max = int($Max); -# } -# else { $Max = 1; } + + if ( $Max > 1 ) { + $Max += (10 - $Max % 10); + $Max = int($Max); + } else { $Max = 1; } + + if ( $Max > 1 ) { + $Max += (10 - $Max % 10); + $Max = int($Max); + } else { $Max = 1; } my $Titr=($ConceptData{'Interval'}>1) ? $Src.'_interval_'.$k : $Src; - $GData=$Titr.'&'.'Concepts'.'&'.'Answers'.'&'.$Max.'&'.$P_No.'&'.$data1.'&'.$data2; - if($ConceptData{'Interval'}>1){ - $r->print('
'); - return; - } - $r->print('
Move your mouse over a bar to find out the concept'); - my $ptr=''; - $ptr.="\n".'
'; - $ptr.="\n".'

'. - "\n".''; - my $gap=12; - my $Size=340; - my $barsize=($P_No) ? int($Size/$P_No) : 1; - for (my $i=0; $i<$P_No; $i++) { - my $x1=80+$gap*$i+($i*$barsize); - my $x2=$x1+$barsize; - my $y1=25; - my $y2=350; - my $j=$i+1; - $ptr.="\n".''; - } - $ptr.="\n".''; - $ptr.="\n".'

'; - $r->print('
'.$ptr.'
'); +# $GData=$Titr.'&Concepts'.'&'.'Answers'.'&'.$Max.'&'.$P_No.'&'.$data1.'&'.$data2; + $GData="$Titr&Concepts&Answers&$Max&$P_No&". + (join(',',@data1)).'&'.(join(',',@data2)); + + $r->print('
'); } @@ -354,47 +308,32 @@ sub OpStatus { my @True = (); my @False = (); my $flag=0; - @shown=(); if ($reshash{'version'}) { + my $tries=0; + &Apache::lonhomework::showhash(%Answer); for (my $version=1;$version<=$reshash{'version'};$version++) { my $time=$reshash{"$version:timestamp"}; - foreach (sort(split(/\:/,$reshash{$version.':keys'}))) { - if (($_=~/\.(\w+)\.(\w+)\.submission$/)) { - #my $Id1=$1; my $Id2=$2; - my $Resp = $reshash{$_}; + + foreach my $key (sort(split(/\:/,$reshash{$version.':keys'}))) { + if (($key=~/\.(\w+)\.(\w+)\.submission$/)) { + my $Id1 = $1; my $Id2 = $2; + #check if this is a repeat submission, if so skip it + if ($reshash{"$version:resource.$Id1.previous"}) { next; } + #if no solved this wasn't a real submission, ignore it + if (!defined($reshash{"$version:resource.$Id1.solved"})) { + &Apache::lonxml::debug("skipping "); + next; + } + my $Resp = $reshash{"$version:$key"}; my %submission=&Apache::lonnet::str2hash($Resp); foreach (keys %submission) { - my $Ansr = $ConceptData{"$_"}; - #my $Ansr = $Answer{"$Id1.$Id2.foil.value.$_"}; - #$r->print("
shown: ".join(',',@shown)." size=$#shown"); + my $Ansr = $Answer{"$Id1.$Id2.foil.value.$_"}; if ($submission{$_}) { - #if($#shown==-1){ - #my @str=split(/\&/,$Resp); - #my $garb; - #for(my $j=0;$j<=$#str;$j++){ - # ($shown[$j],$garb)=split(/\=/,$str[$j]); - #} - ##$r->print("
shown: ".join(',',@shown)." size=$#shown"); - #} if ($submission{$_} eq $Ansr) { &Decide("true",$_,$time ); } else {&Decide("false",$_,$time );} } - #else { - # if ($#shown==-1 && $flag==0) { - # $flag++; - # &InitAnalysis($rid,$student); - # } - # my @erl=split(/\:/,$_); - # for (my $i=0;$i<=$#shown; $i++){ - # my $Ans=$Answer{"$Id1.$Id2.foil.value.$shown[$i]"}; - # if ($erl[$i] eq $Ans) { - # &Decide("true",$shown[$i],$time); - # } - # else {&Decide("false",$shown[$i],$time);} - # } - #} } } } @@ -598,11 +537,17 @@ sub StudentReport { } sub CreateTable { + my ($Hd, $Hid)=@_; + if ($ENV{'form.showcsv'}) { + if ( $Hd == 1 ) { + $r->print('
"'.$hash{'title_'.$Hid}.'","'.$hash{'src_'.$Hid}.'"'); + } + return; + } my $ColNo=0; foreach (keys(%Header)){ $ColNo++; } - my ($Hd, $Hid)=@_; if ( $Hd == 1 ) { $r->print('
'.$hash{'title_'.$Hid}.''); @@ -619,6 +564,9 @@ sub CreateTable { } sub CloseTable { + if ($ENV{'form.showcsv'}) { + return; + } $r->print("\n".''."\n"); $r->rflush(); } @@ -657,8 +605,8 @@ sub PreStatTable { $Ptr .= '
'.
     '  #Stdnts: Total Number of Students opened the problem.
'. ' Tries : Total Number of Tries for solving the problem.
'. - ' Mod : Maximunm Number of Tries for solving the problem.
'. - ' Mean : Average Number of the tries. [ Tries / #Stdnts ]
'. + ' Max : Maximunm Number of Tries for solving the problem.
'. + ' Avg. : Average Number of the tries. [ Tries / #Stdnts ]
'. ' #YES : Number of students solved the problem correctly.
'. ' #yes : Number of students solved the problem by override.
'. ' %Wrng : Percentage of students tried to solve the problem but'. @@ -666,10 +614,10 @@ sub PreStatTable { # ' DoDiff : Degree of Difficulty of the problem. [ Tries/(#YES+#yes+0.1) ]
'. Kashy formula ' DoDiff : Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]
'. #Gerd formula ' S.D. : Standard Deviation of the tries.'. - '[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1)'. + '[ sqrt(sum((Xi - Avg.)^2)) / (#Stdnts-1)'. ' where Xi denotes every student\'s tries ]
'. ' Skew. : Skewness of the students tries.'. - ' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ]
'. + ' [ (sqrt( sum((Xi - Avg.)^3) / #Stdnts)) / (S.D.^3) ]
'. ' Dis.F. : Discrimination Factor: A Standard for '. 'evaluating the problem according to a Criterion
'. ' [Applied Criterion in %27 Upper Students - '. @@ -681,6 +629,11 @@ sub PreStatTable { '
'; $r->print($Ptr); + + $r->print('Output CSV format: print(' checked'); } + $r->print('>'); + $r->rflush(); if ((-e "$CacheDB")&&($ENV{'form.sort'} ne 'Recalculate Statistics')) { @@ -1230,7 +1183,28 @@ sub TableRow { my ($Str,$Idx,$RealIdx)=@_; my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,$Override, $Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$Prob)=split(/\&/,$Str); - my $Ptr = "\n".''. + if ($ENV{'form.showcsv'}) { + my ($ResId,$Dummy)=split(/\*/,$Prob); + my $Ptr = "\n".'
'. + "\n".'"'.($RealIdx+1).'",'. + "\n".'"'.$hash{'title_'.$ResId}.$Dummy.'",'. + "\n".'"'.$hash{'src_'.$ResId}.'",'. + "\n".'"'.$StdNo.'",'. + "\n".'"'.$TotalTries.'",'. + "\n".'"'.$MxTries.'",'. + "\n".'"'.$Avg.'",'. + "\n".'"'.$YES.'",'. + "\n".'"'.$Override.'",'. + "\n".'"'.$Wrng.'",'. + "\n".'"'.$DoD.'",'. + "\n".'"'.$SD.'",'. + "\n".'"'.$Sk.'",'. + "\n".'"'.$_D1.'",'. + "\n".'"'.$_D2.'"'; + $r->print("\n".$Ptr); + } + else{ + my $Ptr = "\n".''. "\n".''.($RealIdx+1).''. # "\n".''.$PrOrd.$Temp.''. "\n".''.$Temp.''. @@ -1246,7 +1220,8 @@ sub TableRow { "\n".' '.$Sk.''. "\n".' '.$_D1.''. "\n".' '.$_D2.''; - $r->print("\n".$Ptr.'' ); + $r->print("\n".$Ptr.'' ); + } $GraphDat{$RealIdx}=$DoD.':'.$Wrng; } @@ -1332,9 +1307,8 @@ sub ClassList { $firstres=$hash{'map_start_/res/'.$ENV{'request.course.uri'}}; $lastres=$hash{'map_finish_/res/'.$ENV{'request.course.uri'}}; if (($firstres) && ($lastres)) { -# ----------------------------------------------------------------- Render page - my $classlst=&Apache::lonnet::reply - ('dump:'.$cdom.':'.$cnum.':classlist',$chome); + #my %result = &Apache::lonnet::dump('classlist',$sdom,$sname); + my $classlst=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.':classlist',$chome); my $StudNo = 0; my $now=time; unless ($classlst=~/^error\:/) { @@ -1350,9 +1324,6 @@ sub ClassList { ( ($Status eq 'Active') ) ) { $active=0; } if ( ($Status eq 'Expired') && ($end == 0 || $now < $end) ) { $active=0; } -#//new -# $Status = 'Any'; -#end new if ($active) { my $thisindex=$#students+1; $name=&Apache::lonnet::unescape($name); @@ -1419,7 +1390,7 @@ sub Title { sub CreateForm { $r->print("\n".'
'); my $content = $ENV{'form.sort'}; - if ($content eq '' || $content eq 'Return to Menu') { + if (!($ENV{'form.showcsv'}) && ($content eq '' || $content eq 'Return to Menu')) { my $Ptr = '

'; $Ptr .= ''; $Ptr .= '

'; @@ -1449,6 +1420,9 @@ sub CreateForm { sub Menu { &initial(); + #$Apache::lonxml::debug=1; + #&Apache::lonhomework::showhash(%ENV); + #$Apache::lonxml::debug=0; &Title(); &ClassList(); my $InpStr = $ENV{'form.sort'}; @@ -1523,8 +1497,8 @@ sub GetStatus { sub MapSecOptions { # ----------------------------------- Loading the Maps Combobox - my $Ptr = '
'; - $Ptr .= '
'; + my $Ptr = ''; + $Ptr .= ''; $Ptr .= '
Select   Map     '."\n". '