--- loncom/homework/functionplotresponse.pm 2010/11/06 16:12:39 1.24
+++ loncom/homework/functionplotresponse.pm 2010/11/12 02:16:20 1.35
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: functionplotresponse.pm,v 1.24 2010/11/06 16:12:39 www Exp $
+# $Id: functionplotresponse.pm,v 1.35 2010/11/12 02:16:20 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,15 +339,15 @@ sub end_backgroundplot {
}
#
-# <splinerule ... />
+# <functionplotrule ... />
#
-sub start_splinerule {
+sub start_functionplotrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval);
$Apache::functionplotresponse::counter++;
if ($label=~/\W/) {
- &Apache::lonxml::warning(&mt('Spline Rule indices should only contain alphanumeric characters.'));
+ &Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.'));
}
$label=~s/\W//gs;
unless ($label) {
@@ -356,16 +356,16 @@ sub start_splinerule {
$label='R'.$label;
}
if ($Apache::functionplotresponse::splineorder{$label}) {
- &Apache::lonxml::error(&mt('Spline Rule indices must be unique.'));
+ &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('beginninglabel',$parstack,$safeeval);
- my $endinglabel=&Apache::lonxml::get_param('endinglabel',$parstack,$safeeval);
+ 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('Spline Rule labels must be alphanumeric.'));
+ &Apache::lonxml::warning(&mt('Rule labels must be alphanumeric.'));
}
$beginninglabel=~s/\W//gs;
$endinglabel=~s/\W//gs;
@@ -373,32 +373,72 @@ sub start_splinerule {
$relationship=~s/\W//gs;
$relationship=lc($relationship);
unless ($relationship=~/^(eq|ge|gt|le|lt|ne)$/) {
- &Apache::lonxml::warning(&mt('Spline Rule relationship not defined.'));
+ &Apache::lonxml::warning(&mt('Rule relationship not defined.'));
$relationship='eq';
}
- my $derivative=&Apache::lonxml::get_param('derivative',$parstack,$safeeval);
+ my $derivative=&Apache::lonxml::get_param('derivativeorder',$parstack,$safeeval);
unless (($derivative==0) || ($derivative==1) || ($derivative==2)) {
- &Apache::lonxml::warning(&mt('Spline Rule derivative not defined.'));
+ &Apache::lonxml::warning(&mt('Rule derivative not defined.'));
$derivative=0;
}
- push(@Apache::functionplotresponse::splinerules,join(':',(
+ push(@Apache::functionplotresponse::functionplotrules,join(':',(
$label,
$derivative,
- &Apache::lonxml::get_param('beginningvalue',$parstack,$safeeval),
+ &Apache::lonxml::get_param('xinitial',$parstack,$safeeval),
$beginninglabel,
- &Apache::lonxml::get_param('endingvalue',$parstack,$safeeval),
+ &Apache::lonxml::get_param('xfinal',$parstack,$safeeval),
$endinglabel,
+ &Apache::lonxml::get_param('minimumlength',$parstack,$safeeval),
+ &Apache::lonxml::get_param('maximumlength',$parstack,$safeeval),
$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,'Spline Evaluation Rule').
- &Apache::edit::end_row();
+ $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:'),'derivativeorder',
+ [['0','Function itself'],
+ ['1','First derivative'],
+ ['2','Second derivative']],$token).'<br />'.
+ &Apache::edit::text_arg('(Initial) x-value:','xinitial',
+ $token,'8').
+ &Apache::edit::select_or_text_arg('(Initial) x-value label:','xinitiallabel',
+ [['start','Start of Plot']],$token,'8').'<br />'.
+
+ &Apache::edit::text_arg('Optional final x-value for ranges:','xfinal',
+ $token,'8').
+ &Apache::edit::select_or_text_arg('Optional final x-value label:','xfinallabel',
+ [['end','End of Plot']],$token,'8').'<br />'.
+ &Apache::edit::text_arg('Optional minimum length for range:','minimumlength',
+ $token,'8').
+ &Apache::edit::text_arg('Optional maximum length for range:','maximumlength',
+ $token,'8').'<br />'.
+ &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,'8').
+ &Apache::edit::text_arg('Percent error:','percenterror',
+ $token,'8').
+ &Apache::edit::end_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'index','derivativeorder',
+ 'xinitial','xinitiallabel','xfinal','xfinallabel',
+ 'minimumlength','maximumlength',
+ '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') {
@@ -553,86 +593,7 @@ sub d2dt2_cubic_hermite {
#
sub array_index {
my ($xmin,$xmax,$x)=@_;
- return int(($x-$xmin)/($xmax-$xmin)*200.+0.5);
-}
-
-#
-# Actual x-value of array index
-#
-
-sub index_x {
- my ($xmin,$xmax,$i)=@_;
- return $i*($xmax-$xmin)/200.+$xmin;
-}
-
-#
-# Assume function to be linear between array points
-# Return the two indices and the scale factor
-#
-
-sub indices_scale {
- my ($xmin,$xmax,$x)=@_;
- my $i=&array_index($xmin,$xmax,$x);
- my $xr=&index_x($xmin,$xmax,$i);
- if ($xr<$x) {
-# Desired x is right of array index
- if ($i>=200) { return (200,200,0); }
- return($i,$i+1,200.*($x-$xr)/($xmax-$xmin));
- } elsif ($xr>$x) {
-# Desired x is left of array index
- if ($i<=0) { return (0,0,0); }
- return($i-1,$i,1.-200.*($xr-$x)/($xmax-$xmin));
- } else {
-# Desired x is at array index (unlikely, but ...)
- if ($i>=200) { return (200,200,0); }
- if ($i<=0) { return (0,0,0); }
- return ($i,$i,0);
- }
-}
-
-#
-# Function value
-#
-
-sub func_val {
- my ($xmin,$xmax,$x)=@_;
- my ($il,$ih,$factor)=&indices_scale($xmin,$xmax,$x);
- my $fl=$Apache::functionplotresponse::func[$il];
- my $fh=$Apache::functionplotresponse::func[$ih];
- unless (defined($fl) || defined($fh)) { return undef; }
- unless (defined($fl)) { return $fh; }
- unless (defined($fh)) { return $fl; }
- return $fl+$factor*($fh-$fl);
-}
-
-#
-# First derivative
-#
-
-sub dfuncdx_val {
- my ($xmin,$xmax,$x)=@_;
- my ($il,$ih,$factor)=&indices_scale($xmin,$xmax,$x);
- my $fl=$Apache::functionplotresponse::dfuncdx[$il];
- my $fh=$Apache::functionplotresponse::dfuncdx[$ih];
- unless (defined($fl) || defined($fh)) { return undef; }
- unless (defined($fl)) { return $fh; }
- unless (defined($fh)) { return $fl; }
- return $fl+$factor*($fh-$fl);
-}
-
-#
-# Second derivative
-#
-
-sub d2funcdx2_val {
- my ($xmin,$xmax,$x)=@_;
- my ($il,$ih,$factor)=&indices_scale($xmin,$xmax,$x);
- my $fl=$Apache::functionplotresponse::d2funcdx2[$il];
- my $fh=$Apache::functionplotresponse::d2funcdx2[$ih];
- unless (defined($fl) || defined($fh)) { return undef; }
- unless (defined($fl)) { return $fh; }
- unless (defined($fh)) { return $fl; }
- return $fl+$factor*($fh-$fl);
+ return int(($x-$xmin)/($xmax-$xmin)*400.+0.5);
}
#
@@ -641,7 +602,8 @@ sub d2funcdx2_val {
sub populate_arrays {
my ($id,$xmin,$xmax)=@_;
- for (my $i=0; $i<=200; $i++) {
+ for (my $i=0; $i<=400; $i++) {
+ $Apache::functionplotresponse::actualxval[$i]=undef;
$Apache::functionplotresponse::func[$i]=undef;
$Apache::functionplotresponse::dfuncdx[$i]=undef;
$Apache::functionplotresponse::d2funcd2x[$i]=undef;
@@ -662,23 +624,34 @@ 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) {
- my $xi=&array_index($xmin,$xmax,&cubic_hermite($t,@xparms));
+ for (my $t=0; $t<=1; $t+=0.0001) {
+ my $xreal=&cubic_hermite($t,@xparms);
+ my $xi=&array_index($xmin,$xmax,$xreal);
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::actualxval[$xi]=$xreal;
# Function value
- $Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms);
+ 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;
- }
-# d^2y/dx^2
- my $d2xdt2=&d2dt2_cubic_hermite($t,@xparms);
- if ($d2xdt2) {
- $Apache::functionplotresponse::d2funcd2x[$xi]=&d2dt2_cubic_hermite($t,@yparms)/$d2xdt2;
+# 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);
}
}
}
@@ -704,7 +677,7 @@ sub start_functionplotresponse {
$Apache::functionplotresponse::inputfields='';
$Apache::functionplotresponse::counter=0;
# Remember rules
- undef @Apache::functionplotresponse::splinerules;
+ undef @Apache::functionplotresponse::functionplotrules;
# Part and ID
my $partid=$Apache::inputtags::part;
my $id=&Apache::response::start_response($parstack,$safeeval);
@@ -722,6 +695,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');
@@ -744,7 +725,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).'<br />'.
&Apache::edit::text_arg('Label y-axis:','ylabel',
$token,'6').' '.
&Apache::edit::text_arg('Minimum y-value:','ymin',
@@ -752,7 +733,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).'<br />'.
&Apache::edit::select_arg('Grid visible:','gridvisible',
['yes','no'],$token).
&Apache::edit::end_row().&Apache::edit::start_spanning_row();
@@ -773,15 +754,187 @@ sub start_functionplotresponse {
$result.=&axes_script($internalid,$xmin,$xmax,$ymin,$ymax,$xaxisvisible,$yaxisvisible,$gridvisible);
$result.=&axes_label($internalid,$xlabel,$ylabel);
# init script is left open
- }
+ } elsif (($target eq 'answer') &&
+ ($env{'form.answer_output_mode'} ne 'tex') &&
+ ($Apache::lonhomework::viewgrades == 'F')) {
+ my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
+ my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+ my $start_page = &Apache::loncommon::start_page('Rules Log', undef,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',
+ 'js_ready' => 1,});
+ my $end_page = &Apache::loncommon::end_page({'js_ready' => 1,});
+ $uname =~s/\W//g;
+ $udom =~s/\W//g;
+ my $function_name =
+ join('_','LONCAPA_scriptvars',$uname,$udom,
+ $env{'form.counter'},$Apache::lonxml::curdepth);
+ my $rules_var ="<script type=\"text/javascript\">
+// <![CDATA[
+ function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>".
+ $Apache::functionplotresponse::ruleslog.
+ "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
+// ]]>
+</script><a href=\"javascript:$function_name();void(0);\">".&mt('Rules Log')."</a><br />";
+ &Apache::lonxml::add_script_result($rules_var);
+ }
+
return $result;
}
-sub splinerulecheck {
- my ($rule)=@_;
+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 addlog {
+ my ($text)=@_;
+ $Apache::functionplotresponse::ruleslog.=$text.'<br />';
+}
+
+sub actualval {
+ my ($i,$xmin,$xmax)=@_;
+ return $xmin+$i/400.*($xmax-$xmin);
+}
+
+sub functionplotrulecheck {
+ my ($rule,$xmin,$xmax,$ymin,$ymax)=@_;
+
+ my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$minimumlength,$maximumlength,$relationship,$value,$percent)
+ =split(/\:/,$rule);
+ $percent=($percent>0?$percent:5);
+ &addlog("=================");
+ &addlog("Rule $label for ".('function itself','first derivative','second derivative')[$derivative]." $relationship $value");
+ 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})) {
+ &addlog("Using lower label $xinitiallabel");
+ $li=$Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel};
+ } else {
+ $li=&array_index($xmin,$xmax,$xinitial);
+ }
+ unless ($findupper) {
+ if (defined($Apache::functionplotresponse::functionplotrulelabels{$xfinallabel})) {
+ &addlog("Using upper label $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;
+ }
+
+ &addlog("Boundaries: x=".&actualval($li,$xmin,$xmax)." (".$Apache::functionplotresponse::actualxval[$li]."; index $li)) to x=".
+ &actualval($lh,$xmin,$xmax)." (".$Apache::functionplotresponse::actualxval[$lh]."; index $lh))");
+ if ($findupper) {
+ &addlog("Looking for label $xfinallabel");
+ }
+ 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)) {
+ &addlog("Condition not fulfilled at x=".&actualval($i,$xmin,$xmax)." (".$Apache::functionplotresponse::actualxval[$i]."; index $i)");
+ &addlog("Actual value ".(defined($val)?$val:'undef').", expected $value, tolerance $tol");
+ if (($findupper) && ($i>$li)) {
+# check for minimum and maximum lengths
+ my $length=&actualval($i,$xmin,$xmax)-&actualval($li,$xmin,$xmax);
+ if ($minimumlength) {
+ if ($length<$minimumlength) {
+ &addlog("Rule $label failed, actual length $length, minimum length $minimumlength");
+ return 0;
+ }
+ }
+ if ($maximumlength) {
+ if ($length>$maximumlength) {
+ &addlog("Rule $label failed, actual length $length, maximum length $maximumlength");
+ return 0;
+ }
+ }
+ $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$i;
+ &addlog("Rule $label passed, setting label $xfinallabel");
+ return 1;
+ } else {
+ &addlog("Rule $label failed.");
+ return 0;
+ }
+ }
+ }
+ &addlog("Rule $label passed.");
+ return 1;
+}
sub end_functionplotresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -797,7 +950,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()
@@ -812,14 +965,27 @@ sub end_functionplotresponse {
$xmin=(defined($xmin)?$xmin:-10);
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
$xmax=(defined($xmax)?$xmax:10);
+ 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::ruleslog='';
+ $Apache::functionplotresponse::functionplotrulelabels{'start'}=400;
+ $Apache::functionplotresponse::functionplotrulelabels{'end'}=0;
if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') {
$ad='NOT_FUNCTION';
} else {
+ &addlog("Start of function ".&actualval($Apache::functionplotresponse::functionplotrulelabels{'start'},$xmin,$xmax)." (index ".
+ $Apache::functionplotresponse::functionplotrulelabels{'start'}.")");
+ &addlog("End of function ".&actualval($Apache::functionplotresponse::functionplotrulelabels{'end'},$xmin,$xmax)." (index ".
+ $Apache::functionplotresponse::functionplotrulelabels{'end'}.")");
+
# We have a function that we can actually grade, go through the spline rules.
- undef %Apache::functionplotresponse::splinerulelabels;
- foreach my $rule (@Apache::functionplotresponse::splinerules) {
- unless (&splinerulecheck($rule)) {
+ foreach my $rule (@Apache::functionplotresponse::functionplotrules) {
+ unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax)) {
$ad='INCORRECT';
last;
}