version 1.19, 2010/10/30 15:32:36
|
version 1.29, 2010/11/07 21:10:14
|
Line 33 use Apache::lonlocal;
|
Line 33 use Apache::lonlocal;
|
use Apache::lonnet; |
use Apache::lonnet; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','splinerule')); |
&Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','functionplotrule')); |
} |
} |
|
|
# |
# |
Line 339 sub end_backgroundplot {
|
Line 339 sub end_backgroundplot {
|
} |
} |
|
|
# |
# |
# <splinerule ... /> |
# <functionplotrule ... /> |
# |
# |
sub start_splinerule { |
sub start_functionplotrule { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1]; |
my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval); |
if ($target eq 'edit') { |
$Apache::functionplotresponse::counter++; |
$result=&Apache::edit::tag_start($target,$token,'Spline Evaluation Rule'). |
if ($label=~/\W/) { |
&Apache::edit::end_row(); |
&Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.')); |
|
} |
|
$label=~s/\W//gs; |
|
unless ($label) { |
|
$label='R'.$Apache::functionplotresponse::counter; |
|
} else { |
|
$label='R'.$label; |
|
} |
|
if ($Apache::functionplotresponse::splineorder{$label}) { |
|
&Apache::lonxml::error(&mt('Rule indices must be unique.')); |
|
} |
|
|
|
|
|
if ($target eq 'grade') { |
|
# Simply remember - in order - for later |
|
my $beginninglabel=&Apache::lonxml::get_param('xinitiallabel',$parstack,$safeeval); |
|
my $endinglabel=&Apache::lonxml::get_param('xfinallabel',$parstack,$safeeval); |
|
if (($beginninglabel=~/\W/) || ($endinglabel=~/W/)) { |
|
&Apache::lonxml::warning(&mt('Rule labels must be alphanumeric.')); |
|
} |
|
$beginninglabel=~s/\W//gs; |
|
$endinglabel=~s/\W//gs; |
|
my $relationship=&Apache::lonxml::get_param('relationship',$parstack,$safeeval); |
|
$relationship=~s/\W//gs; |
|
$relationship=lc($relationship); |
|
unless ($relationship=~/^(eq|ge|gt|le|lt|ne)$/) { |
|
&Apache::lonxml::warning(&mt('Rule relationship not defined.')); |
|
$relationship='eq'; |
|
} |
|
my $derivative=&Apache::lonxml::get_param('derivative',$parstack,$safeeval); |
|
unless (($derivative==0) || ($derivative==1) || ($derivative==2)) { |
|
&Apache::lonxml::warning(&mt('Rule derivative not defined.')); |
|
$derivative=0; |
|
} |
|
push(@Apache::functionplotresponse::functionplotrules,join(':',( |
|
$label, |
|
$derivative, |
|
&Apache::lonxml::get_param('xinitial',$parstack,$safeeval), |
|
$beginninglabel, |
|
&Apache::lonxml::get_param('xfinal',$parstack,$safeeval), |
|
$endinglabel, |
|
$relationship, |
|
&Apache::lonxml::get_param('value',$parstack,$safeeval) |
|
))); |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::tag_start($target,$token,'Function Plot Evaluation Rule'). |
|
&Apache::edit::text_arg('Index:','index', |
|
$token,'4').' '. |
|
&Apache::edit::select_arg(&mt('Function:'),'derivative', |
|
[['0','Function itself'], |
|
['1','First derivative'], |
|
['2','Second derivative']],$token). |
|
&Apache::edit::text_arg('(Initial) x-value:','xinitial', |
|
$token,'4').' '. |
|
&Apache::edit::text_arg('Final x-value for ranges:','xfinal', |
|
$token,'4').' '. |
|
&Apache::edit::select_arg(&mt('Relationship:'),'relationship', |
|
[['eq','equal'], |
|
['ne','not equal'], |
|
['ge','greater than or equal'], |
|
['gt','greater than'], |
|
['lt','less than'], |
|
['le','less than or equal']],$token). |
|
$result.= &Apache::edit::select_or_text_arg('Value:','value', |
|
[['undef','not defined']],$token,'4'). |
|
&Apache::edit::text_arg('Percent error:','percenterror', |
|
$token,'4'). |
|
&Apache::edit::end_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'index','derivative','xinitial','xfinal','relationship', |
|
'value','percenterror'); |
|
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub end_splinerule { |
sub end_functionplotrule { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
Line 363 sub end_splinerule {
|
Line 435 sub end_splinerule {
|
|
|
|
|
# |
# |
# <spline label="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." /> |
# <spline index="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." /> |
# |
# |
# Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them |
# Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them |
# |
# |
Line 371 sub start_spline {
|
Line 443 sub start_spline {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval); |
my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval); |
$Apache::functionplotresponse::counter++; |
$Apache::functionplotresponse::counter++; |
if ($label=~/\W/) { |
if ($label=~/\W/) { |
&Apache::lonxml::warning(&mt('Spline labels should only contain alphanumeric characters.')); |
&Apache::lonxml::warning(&mt('Spline indices should only contain alphanumeric characters.')); |
} |
} |
$label=~s/\W//gs; |
$label=~s/\W//gs; |
unless ($label) { $label='S'.$Apache::functionplotresponse::counter; } |
unless ($label) { |
|
$label='S'.$Apache::functionplotresponse::counter; |
|
} else { |
|
$label='S'.$label; |
|
} |
if ($Apache::functionplotresponse::splineorder{$label}) { |
if ($Apache::functionplotresponse::splineorder{$label}) { |
&Apache::lonxml::error(&mt('Spline labels must be unique.')); |
&Apache::lonxml::error(&mt('Spline indices must be unique.')); |
} |
} |
|
|
my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval); |
my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval); |
Line 404 sub start_spline {
|
Line 480 sub start_spline {
|
$Apache::functionplotresponse::splinescaley{$label}=$sy; |
$Apache::functionplotresponse::splinescaley{$label}=$sy; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token,'Spline'). |
$result=&Apache::edit::tag_start($target,$token,'Spline'). |
&Apache::edit::text_arg('Label:','label', |
&Apache::edit::text_arg('Index:','index', |
$token,'4').' '. |
$token,'4').' '. |
&Apache::edit::select_arg('Order:','order', |
&Apache::edit::select_arg('Order:','order', |
['2','3','4','5','6','7','8','9'],$token).' '. |
['2','3','4','5','6','7','8','9'],$token).' '. |
Line 419 sub start_spline {
|
Line 495 sub start_spline {
|
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'label','order','initx','inity', |
$safeeval,'index','order','initx','inity', |
'scalex','scaley'); |
'scalex','scaley'); |
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } |
} |
} |
Line 503 sub d2dt2_cubic_hermite {
|
Line 579 sub d2dt2_cubic_hermite {
|
# |
# |
sub array_index { |
sub array_index { |
my ($xmin,$xmax,$x)=@_; |
my ($xmin,$xmax,$x)=@_; |
my $index=int(($x-$xmin)/($xmax-$xmin)*200.+0.5); |
return int(($x-$xmin)/($xmax-$xmin)*400.+0.5); |
return $index; |
|
} |
} |
|
|
# |
# |
Line 513 sub array_index {
|
Line 588 sub array_index {
|
|
|
sub populate_arrays { |
sub populate_arrays { |
my ($id,$xmin,$xmax)=@_; |
my ($id,$xmin,$xmax)=@_; |
for (my $i=0; $i<=200; $i++) { |
for (my $i=0; $i<=400; $i++) { |
$Apache::functionplotresponse::func[$i]=undef; |
$Apache::functionplotresponse::func[$i]=undef; |
$Apache::functionplotresponse::dfunddx[$i]=undef; |
$Apache::functionplotresponse::dfuncdx[$i]=undef; |
$Apache::functionplotresponse::d2funcd2x[$i]=undef; |
$Apache::functionplotresponse::d2funcd2x[$i]=undef; |
} |
} |
unless ($xmax>$xmin) { return 'no_func'; } |
unless ($xmax>$xmin) { return 'no_func'; } |
Line 534 sub populate_arrays {
|
Line 609 sub populate_arrays {
|
$env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_y'}, |
$env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_y'}, |
$env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_y'}); |
$env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_y'}); |
# Run in small steps over spline parameter |
# Run in small steps over spline parameter |
for (my $t=0; $t<=1; $t+=0.00025) { |
for (my $t=0; $t<=1; $t+=0.0001) { |
my $xi=&array_index($xmin,$xmax,&cubic_hermite($t,@xparms)); |
my $xi=&array_index($xmin,$xmax,&cubic_hermite($t,@xparms)); |
if ($xi<$xiold) { return 'no_func'; } |
if ($xi<$xiold) { return 'no_func'; } |
if (($xi>$xiold) && ($xi>=0) && ($xi<=200)) { |
if (($xi>$xiold) && ($xi>=0) && ($xi<=400)) { |
if (defined($Apache::functionplotresponse::func[$xi])) { return 'no_func'; } |
if (defined($Apache::functionplotresponse::func[$xi])) { return 'no_func'; } |
$xiold=$xi; |
$xiold=$xi; |
|
# Function value |
$Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms); |
$Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms); |
|
# Chain rule |
|
# dy/dx=dy/dt/(dx/dt) |
|
my $dxdt=&ddt_cubic_hermite($t,@xparms); |
|
if ($dxdt) { |
|
$Apache::functionplotresponse::dfuncdx[$xi]=&ddt_cubic_hermite($t,@yparms)/$dxdt; |
|
} |
|
# Faa di Bruno |
|
# d^2y/dx^2=(d^2y/dt^2)/(dx/dt)^2+(dy/dt)/(d^2x/dt^2) |
|
my $d2xdt2=&d2dt2_cubic_hermite($t,@xparms); |
|
if (($dxdt) && ($d2xdt2)) { |
|
$Apache::functionplotresponse::d2funcdx2[$xi]= |
|
&d2dt2_cubic_hermite($t,@yparms)/($dxdt*$dxdt) |
|
+&ddt_cubic_hermite($t,@yparms)/$d2xdt2; |
|
} |
} |
} |
} |
} |
} |
} |
Line 564 sub start_functionplotresponse {
|
Line 654 sub start_functionplotresponse {
|
undef %Apache::functionplotresponse::previous; |
undef %Apache::functionplotresponse::previous; |
$Apache::functionplotresponse::inputfields=''; |
$Apache::functionplotresponse::inputfields=''; |
$Apache::functionplotresponse::counter=0; |
$Apache::functionplotresponse::counter=0; |
|
# Remember rules |
|
undef @Apache::functionplotresponse::functionplotrules; |
# Part and ID |
# Part and ID |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
my $id=&Apache::response::start_response($parstack,$safeeval); |
my $id=&Apache::response::start_response($parstack,$safeeval); |
Line 581 sub start_functionplotresponse {
|
Line 673 sub start_functionplotresponse {
|
$ymin=(defined($ymin)?$ymin:-10); |
$ymin=(defined($ymin)?$ymin:-10); |
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval); |
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval); |
$ymax=(defined($ymax)?$ymax:10); |
$ymax=(defined($ymax)?$ymax:10); |
|
if ($xmax<=$xmin) { |
|
&Apache::lonxml::warning('Maximum x-value needs to be larger than minimum value.'); |
|
$xmax=$xmin+20; |
|
} |
|
if ($ymax<=$ymin) { |
|
&Apache::lonxml::warning('Maximum y-value needs to be larger than minimum value.'); |
|
$ymax=$ymin+20; |
|
} |
my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false'); |
my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false'); |
my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false'); |
my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false'); |
my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false'); |
my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false'); |
Line 636 sub start_functionplotresponse {
|
Line 736 sub start_functionplotresponse {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub compare_rel { |
|
my ($relationship,$value,$realval,$tol)=@_; |
|
|
|
|
|
&Apache::lonnet::logthis("Rel $relationship Val $value RV $realval T $tol"); |
|
# is the real value defined? |
|
unless (defined($realval)) { |
|
if ($relationship eq 'eq') { |
|
if ($value eq 'undef') { |
|
return 1; |
|
} else { |
|
return 0; |
|
} |
|
} elsif ($relationship eq 'ne') { |
|
if ($value eq 'undef') { |
|
return 0; |
|
} else { |
|
return 1; |
|
} |
|
} else { |
|
return 0; |
|
} |
|
} |
|
|
|
# it is defined. |
|
if ($relationship eq 'gt') { |
|
return ($realval>$value); |
|
} elsif ($relationship eq 'ge') { |
|
return ($realval>$value-$tol); |
|
} elsif ($relationship eq 'lt') { |
|
return ($realval<$value); |
|
} elsif ($relationship eq 'le') { |
|
return ($realval<$value+$tol); |
|
} elsif ($relationship eq 'ne') { |
|
return (abs($value-$realval)>$tol); |
|
} else { |
|
return (abs($value-$realval)<$tol); |
|
} |
|
return 0; |
|
} |
|
|
|
sub functionplotrulecheck { |
|
my ($rule,$xmin,$xmax,$tolfunc,$toldfdx,$told2fdx2)=@_; |
|
&Apache::lonnet::logthis("Rule $rule TolFunc $tolfunc TolDfDx $toldfdx TolD2fDx2 $told2fdx2"); |
|
my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$relationship,$value) |
|
=split(/\:/,$rule); |
|
# if a hard value is set for the boundaries, it overrides the label |
|
if (($xinitial ne '') && ($xinitiallabel ne '')) { |
|
$Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel}=$xinitial; |
|
} |
|
if (($xfinal ne '') && ($xfinallabel ne '')) { |
|
$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$xfinal; |
|
} |
|
if (defined($Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel})) { |
|
$xinitial=$Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel}; |
|
} |
|
if (defined($Apache::functionplotresponse::functionplotrulelabels{$xfinallabel})) { |
|
$xfinal=$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}; |
|
} |
|
# Basic sanity checks |
|
if ($xinitial eq '') { |
|
$xinitial=0; |
|
} |
|
if ($xfinal eq '') { |
|
$xfinal=$xinitial; |
|
} |
|
if ($xinitial>$xfinal) { |
|
$xfinal=$xinitial; |
|
} |
|
&Apache::lonnet::logthis("Init $xinitial Final $xfinal"); |
|
my $tol=$tolfunc; |
|
if ($derivative==2) { |
|
$tol=$told2fdx2; |
|
} elsif ($derivative==1) { |
|
$tol=$toldfdx; |
|
} |
|
|
|
my $li=&array_index($xmin,$xmax,$xinitial); |
|
my $lh=&array_index($xmin,$xmax,$xfinal); |
|
for (my $i=$li; $i<=$lh; $i++) { |
|
my $val; |
|
if ($derivative==2) { |
|
$val=$Apache::functionplotresponse::d2funcdx2[$i]; |
|
} elsif ($derivative==1) { |
|
$val=$Apache::functionplotresponse::dfuncdx[$i]; |
|
} else { |
|
$val=$Apache::functionplotresponse::func[$i]; |
|
} |
|
unless (&compare_rel($relationship,$value,$val,$tol)) { return 0; }; |
|
} |
|
return 1; |
|
} |
|
|
sub end_functionplotresponse { |
sub end_functionplotresponse { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
&Apache::response::end_response; |
&Apache::response::end_response; |
Line 650 sub end_functionplotresponse {
|
Line 843 sub end_functionplotresponse {
|
&& &Apache::response::submitted() |
&& &Apache::response::submitted() |
&& $Apache::lonhomework::type eq 'exam') { |
&& $Apache::lonhomework::type eq 'exam') { |
|
|
#&Apache::response::scored_response($partid,$id); |
&Apache::response::scored_response($partid,$id); |
|
|
} elsif ($target eq 'grade' |
} elsif ($target eq 'grade' |
&& &Apache::response::submitted() |
&& &Apache::response::submitted() |
Line 665 sub end_functionplotresponse {
|
Line 858 sub end_functionplotresponse {
|
$xmin=(defined($xmin)?$xmin:-10); |
$xmin=(defined($xmin)?$xmin:-10); |
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval); |
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval); |
$xmax=(defined($xmax)?$xmax:10); |
$xmax=(defined($xmax)?$xmax:10); |
my $ad; |
my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval); |
|
$ymin=(defined($ymin)?$ymin:-10); |
|
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval); |
|
$ymax=(defined($ymax)?$ymax:10); |
|
|
|
my $percent=&Apache::lonxml::get_param('percenterror',$parstack,$safeeval); |
|
$percent=(defined($percent)?$percent:5); |
|
|
|
my $tolfunc=$percent*($ymax-$ymin)/100.; |
|
my $toldfdx=1; |
|
my $told2fdx2=1; |
|
if ($xmax>$xmin) { |
|
$toldfdx=$tolfunc/($xmax-$xmin); |
|
$told2fdx2=$toldfdx/($xmax-$xmin); |
|
} |
|
|
|
my $ad=''; |
if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') { |
if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') { |
$ad='BAD_FORMULA'; |
$ad='NOT_FUNCTION'; |
} else { |
} else { |
$ad='INCORRECT'; |
# We have a function that we can actually grade, go through the spline rules. |
|
undef %Apache::functionplotresponse::functionplotrulelabels; |
|
foreach my $rule (@Apache::functionplotresponse::functionplotrules) { |
|
unless (&functionplotrulecheck($rule,$xmin,$xmax,$tolfunc,$toldfdx,$told2fdx2)) { |
|
$ad='INCORRECT'; |
|
last; |
|
} |
|
} |
|
# If it's not wrong, it's correct |
|
unless ($ad) { $ad='EXACT_ANS' }; |
} |
} |
|
|
# |
# |
# Store grading info |
# Store grading info |
# |
# |