--- loncom/homework/functionplotresponse.pm 2010/11/09 02:29:52 1.30
+++ 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.30 2010/11/09 02:29:52 www Exp $
+# $Id: functionplotresponse.pm,v 1.34 2010/11/11 15:57:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -389,7 +389,8 @@ sub start_functionplotrule {
&Apache::lonxml::get_param('xfinal',$parstack,$safeeval),
$endinglabel,
$relationship,
- &Apache::lonxml::get_param('value',$parstack,$safeeval)
+ &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').
@@ -398,17 +399,17 @@ sub start_functionplotrule {
&Apache::edit::select_arg(&mt('Function:'),'derivative',
[['0','Function itself'],
['1','First derivative'],
- ['2','Second derivative']],$token).' '.
+ ['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').' '.
+ [['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').' '.
+ [['end','End of Plot']],$token,'8').'
'.
&Apache::edit::select_arg(&mt('Relationship:'),'relationship',
[['eq','equal'],
@@ -638,14 +639,10 @@ sub populate_arrays {
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)) {
+# Second derivative
$Apache::functionplotresponse::d2funcdx2[$xi]=
- &d2dt2_cubic_hermite($t,@yparms)/($dxdt*$dxdt)
- +&ddt_cubic_hermite($t,@yparms)/$d2xdt2;
+ ($dxdt*&d2dt2_cubic_hermite($t,@yparms)-&ddt_cubic_hermite($t,@yparms)*&d2dt2_cubic_hermite($t,@xparms))/
+ ($dxdt*$dxdt*$dxdt);
}
}
}
@@ -719,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',
@@ -727,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();
@@ -791,14 +788,28 @@ sub compare_rel {
}
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)
+ 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);
@@ -808,15 +819,18 @@ sub functionplotrulecheck {
$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);
}
- if (defined($Apache::functionplotresponse::functionplotrulelabels{$xfinallabel})) {
- $lh=$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel};
- } else {
- $lh=&array_index($xmin,$xmax,$xfinal);
+ 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; }
@@ -824,12 +838,15 @@ sub functionplotrulecheck {
if ($li>$lh) {
$lh=$li;
}
- &Apache::lonnet::logthis("Init $xinitial=$li Final $xfinal=$lh");
- my $tol=$tolfunc;
- if ($derivative==2) {
- $tol=$told2fdx2;
- } elsif ($derivative==1) {
- $tol=$toldfdx;
+
+# &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;
@@ -840,7 +857,16 @@ sub functionplotrulecheck {
} else {
$val=$Apache::functionplotresponse::func[$i];
}
- unless (&compare_rel($relationship,$value,$val,$tol)) { return 0; };
+ 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;
}
@@ -879,17 +905,6 @@ sub end_functionplotresponse {
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='';
undef %Apache::functionplotresponse::functionplotrulelabels;
$Apache::functionplotresponse::functionplotrulelabels{'start'}=400;
@@ -899,7 +914,7 @@ sub end_functionplotresponse {
} else {
# 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,$tolfunc,$toldfdx,$told2fdx2)) {
+ unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax)) {
$ad='INCORRECT';
last;
}