--- loncom/homework/functionplotresponse.pm 2010/10/30 15:32:36 1.19
+++ loncom/homework/functionplotresponse.pm 2010/11/11 15:57:49 1.34
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: functionplotresponse.pm,v 1.19 2010/10/30 15:32:36 www Exp $
+# $Id: functionplotresponse.pm,v 1.34 2010/11/11 15:57:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@ use Apache::lonlocal;
use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','splinerule'));
+ &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','functionplotrule'));
}
#
@@ -339,20 +339,100 @@ sub end_backgroundplot {
}
#
-#
+#
#
-sub start_splinerule {
+sub start_functionplotrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
- if ($target eq 'edit') {
- $result=&Apache::edit::tag_start($target,$token,'Spline Evaluation Rule').
- &Apache::edit::end_row();
+ my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval);
+ $Apache::functionplotresponse::counter++;
+ if ($label=~/\W/) {
+ &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),
+ &Apache::lonxml::get_param('percenterror',$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::select_or_text_arg('(Initial) x-value label:','xinitiallabel',
+ [['start','Start of Plot']],$token,'8').'
'.
+
+ &Apache::edit::text_arg('Optional final x-value for ranges:','xfinal',
+ $token,'4').
+ &Apache::edit::select_or_text_arg('Optional final x-value label:','xfinallabel',
+ [['end','End of Plot']],$token,'8').'
'.
+
+ &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','xinitiallabel','xfinal','xfinallabel','relationship',
+ 'value','percenterror');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
return $result;
}
-sub end_splinerule {
+sub end_functionplotrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'edit') {
@@ -363,7 +443,7 @@ sub end_splinerule {
#
-#
+#
#
# Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them
#
@@ -371,15 +451,19 @@ sub start_spline {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
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++;
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;
- unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
+ unless ($label) {
+ $label='S'.$Apache::functionplotresponse::counter;
+ } else {
+ $label='S'.$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);
@@ -404,7 +488,7 @@ sub start_spline {
$Apache::functionplotresponse::splinescaley{$label}=$sy;
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token,'Spline').
- &Apache::edit::text_arg('Label:','label',
+ &Apache::edit::text_arg('Index:','index',
$token,'4').' '.
&Apache::edit::select_arg('Order:','order',
['2','3','4','5','6','7','8','9'],$token).' '.
@@ -419,7 +503,7 @@ sub start_spline {
&Apache::edit::end_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'label','order','initx','inity',
+ $safeeval,'index','order','initx','inity',
'scalex','scaley');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
@@ -503,8 +587,7 @@ sub d2dt2_cubic_hermite {
#
sub array_index {
my ($xmin,$xmax,$x)=@_;
- my $index=int(($x-$xmin)/($xmax-$xmin)*200.+0.5);
- return $index;
+ return int(($x-$xmin)/($xmax-$xmin)*400.+0.5);
}
#
@@ -513,9 +596,9 @@ sub array_index {
sub populate_arrays {
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::dfunddx[$i]=undef;
+ $Apache::functionplotresponse::dfuncdx[$i]=undef;
$Apache::functionplotresponse::d2funcd2x[$i]=undef;
}
unless ($xmax>$xmin) { return 'no_func'; }
@@ -534,13 +617,33 @@ sub populate_arrays {
$env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_y'},
$env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_y'});
# 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));
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'; }
$xiold=$xi;
- $Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms);
+# Function value
+ my $funcval=&cubic_hermite($t,@yparms);
+ $Apache::functionplotresponse::func[$xi]=$funcval;
+ if (defined($funcval)) {
+ if ($xi<$Apache::functionplotresponse::functionplotrulelabels{'start'}) {
+ $Apache::functionplotresponse::functionplotrulelabels{'start'}=$xi;
+ }
+ if ($xi>$Apache::functionplotresponse::functionplotrulelabels{'end'}) {
+ $Apache::functionplotresponse::functionplotrulelabels{'end'}=$xi;
+ }
+ }
+# 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;
+# Second derivative
+ $Apache::functionplotresponse::d2funcdx2[$xi]=
+ ($dxdt*&d2dt2_cubic_hermite($t,@yparms)-&ddt_cubic_hermite($t,@yparms)*&d2dt2_cubic_hermite($t,@xparms))/
+ ($dxdt*$dxdt*$dxdt);
+ }
}
}
}
@@ -564,6 +667,8 @@ sub start_functionplotresponse {
undef %Apache::functionplotresponse::previous;
$Apache::functionplotresponse::inputfields='';
$Apache::functionplotresponse::counter=0;
+# Remember rules
+ undef @Apache::functionplotresponse::functionplotrules;
# Part and ID
my $partid=$Apache::inputtags::part;
my $id=&Apache::response::start_response($parstack,$safeeval);
@@ -581,6 +686,14 @@ sub start_functionplotresponse {
$ymin=(defined($ymin)?$ymin:-10);
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval);
$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 $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');
@@ -603,7 +716,7 @@ sub start_functionplotresponse {
&Apache::edit::text_arg('Maximum x-value:','xmax',
$token,'4').' '.
&Apache::edit::select_arg('x-axis visible:','xaxisvisible',
- ['yes','no'],$token).' '.
+ ['yes','no'],$token).'
'.
&Apache::edit::text_arg('Label y-axis:','ylabel',
$token,'6').' '.
&Apache::edit::text_arg('Minimum y-value:','ymin',
@@ -611,7 +724,7 @@ sub start_functionplotresponse {
&Apache::edit::text_arg('Maximum y-value:','ymax',
$token,'4').' '.
&Apache::edit::select_arg('y-axis visible:','yaxisvisible',
- ['yes','no'],$token).' '.
+ ['yes','no'],$token).'
'.
&Apache::edit::select_arg('Grid visible:','gridvisible',
['yes','no'],$token).
&Apache::edit::end_row().&Apache::edit::start_spanning_row();
@@ -636,6 +749,128 @@ sub start_functionplotresponse {
return $result;
}
+sub compare_rel {
+ my ($relationship,$value,$realval,$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,$ymin,$ymax)=@_;
+
+# &Apache::lonnet::logthis("Rule $rule $xmin $xmax $ymin $ymax");
+
+ my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$relationship,$value,$percent)
+ =split(/\:/,$rule);
+ $percent=($percent>0?$percent:5);
+
+ my $li=0;
+ my $lh=400;
+
+# Special case: the upper boundary was not defined
+# and needs to be set to the value where
+# the condition is not true anymore => set flag
+
+ my $findupper=0;
+ if (($xfinal eq '')
+ && (!defined($Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}))
+ && ($xfinallabel)) {
+ $findupper=1;
+ }
+
+# if a hard value is set for the boundaries, it overrides the label
+ if (($xinitial ne '') && ($xinitiallabel ne '') && ($xinitiallabel ne 'start')) {
+ $li=&array_index($xmin,$xmax,$xinitial);
+ $Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel}=$li;
+ }
+ if (($xfinal ne '') && ($xfinallabel ne '') && ($xfinallabel ne 'end')) {
+ $lh=&array_index($xmin,$xmax,$xfinal);
+ $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$lh;
+ }
+# if the label is defined, use it
+ if (defined($Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel})) {
+ $li=$Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel};
+ } else {
+ $li=&array_index($xmin,$xmax,$xinitial);
+ }
+ unless ($findupper) {
+ if (defined($Apache::functionplotresponse::functionplotrulelabels{$xfinallabel})) {
+ $lh=$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}-1;
+ } else {
+ $lh=&array_index($xmin,$xmax,$xfinal);
+ }
+ }
+# Basic sanity checks
+ if ($li<0) { $li=0; }
+ if ($lh>400) { $lh=400; }
+ if ($li>$lh) {
+ $lh=$li;
+ }
+
+# &Apache::lonnet::logthis("Init $xinitial=$li Final $xfinal=$lh Findupper: $findupper");
+ my $tol=$percent*($ymax-$ymin)/100;
+ if ($xmax>$xmin) {
+ if ($derivative==2) {
+ $tol=4.*$tol/($xmax-$xmin);
+ } elsif ($derivative==1) {
+ $tol=2.*$tol/($xmax-$xmin);
+ }
+ }
+ 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)) {
+# &Apache::lonnet::logthis("Condition false $findupper at $i with $val tol:$tol from $value");
+ if (($findupper) && ($i>$li)) {
+ $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$i;
+# &Apache::lonnet::logthis("Setting $xfinallabel to $i");
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+ }
+ return 1;
+}
+
sub end_functionplotresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
&Apache::response::end_response;
@@ -650,7 +885,7 @@ sub end_functionplotresponse {
&& &Apache::response::submitted()
&& $Apache::lonhomework::type eq 'exam') {
- #&Apache::response::scored_response($partid,$id);
+ &Apache::response::scored_response($partid,$id);
} elsif ($target eq 'grade'
&& &Apache::response::submitted()
@@ -665,12 +900,29 @@ sub end_functionplotresponse {
$xmin=(defined($xmin)?$xmin:-10);
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
$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 $ad='';
+ undef %Apache::functionplotresponse::functionplotrulelabels;
+ $Apache::functionplotresponse::functionplotrulelabels{'start'}=400;
+ $Apache::functionplotresponse::functionplotrulelabels{'end'}=0;
if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') {
- $ad='BAD_FORMULA';
+ $ad='NOT_FUNCTION';
} else {
- $ad='INCORRECT';
+# We have a function that we can actually grade, go through the spline rules.
+ foreach my $rule (@Apache::functionplotresponse::functionplotrules) {
+ unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax)) {
+ $ad='INCORRECT';
+ last;
+ }
+ }
+# If it's not wrong, it's correct
+ unless ($ad) { $ad='EXACT_ANS' };
}
+
#
# Store grading info
#