--- loncom/homework/functionplotresponse.pm	2010/10/30 02:31:27	1.18
+++ loncom/homework/functionplotresponse.pm	2010/11/07 01:57:50	1.25
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: functionplotresponse.pm,v 1.18 2010/10/30 02:31:27 www Exp $
+# $Id: functionplotresponse.pm,v 1.25 2010/11/07 01:57:50 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,66 @@ sub end_backgroundplot {
 }
 
 #
-# <splinerule ... />
+# <functionplotrule ... />
 #
-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)
+          )));
+   } elsif ($target eq 'edit') {
+      $result=&Apache::edit::tag_start($target,$token,'Function Plot Evaluation Rule').
+              &Apache::edit::end_row();
    }
    return $result;
 }
 
-sub end_splinerule {
+sub end_functionplotrule {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $result='';
    if ($target eq 'edit') {
@@ -363,7 +409,7 @@ 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
 #
@@ -371,15 +417,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 +454,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').'&nbsp;'.
              &Apache::edit::select_arg('Order:','order',
                                   ['2','3','4','5','6','7','8','9'],$token).'&nbsp;'.
@@ -419,7 +469,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 +553,86 @@ 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)*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);
 }
 
 #
@@ -514,16 +642,16 @@ sub array_index {
 sub populate_arrays {
     my ($id,$xmin,$xmax)=@_;
     for (my $i=0; $i<=200; $i++) {
-       undef $Apache::functionplotresponse::func[$i];
-       undef $Apache::functionplotresponse::dfunddx[$i];
-       undef $Apache::functionplotresponse::d2funcd2x[$i];
+       $Apache::functionplotresponse::func[$i]=undef;
+       $Apache::functionplotresponse::dfuncdx[$i]=undef;
+       $Apache::functionplotresponse::d2funcd2x[$i]=undef;
     }
-    unless ($xmax>$xmin) { return; }
+    unless ($xmax>$xmin) { return 'no_func'; }
 # Run over all splines in response
     foreach my $label (split(/\,/,$env{"form.HWVAL_AllSplines_$id"})) {
+        my $xiold=-1;
 # Run over all points in spline
-        for (my $i=0; $i<$env{"form.HWVAL_SplineOrder_".$id."_".$label}; $i++) {
-            my $xiold=-1;
+        for (my $i=1; $i<$env{"form.HWVAL_SplineOrder_".$id."_".$label}; $i++) {
             my $ni=$i+1;
             my @xparms=($env{'form.HWVAL_'.$id.'_'.$label.'P'.$i.'_x'},
                         $env{'form.HWVAL_'.$id.'_'.$label.'S'.$i.'_x'},
@@ -533,14 +661,25 @@ sub populate_arrays {
                         $env{'form.HWVAL_'.$id.'_'.$label.'S'.$i.'_y'},
                         $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));
-                if ($xi<$xiold-5) { return 'no_func'; }
-                if ($xi>$xiold) {
+                if ($xi<$xiold) { return 'no_func'; }
+                if (($xi>$xiold) && ($xi>=0) && ($xi<=200)) {
+                   if (defined($Apache::functionplotresponse::func[$xi])) { return 'no_func'; }
                    $xiold=$xi;
+# Function value
                    $Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms);
+# 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;
+                   }
                 }
             }
         }
@@ -564,6 +703,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 +722,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');
@@ -636,6 +785,64 @@ sub start_functionplotresponse {
   return $result;
 }
 
+sub compare_rel {
+   my ($relationship,$value,$val,$tol)=@_;
+   if (abs($value-$val)<$tol) { return 1; }
+   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 ne '') {
+      if ($xinitial>$xfinal) {
+         $xfinal=$xinitial;
+      }
+   }
+   &Apache::lonnet::logthis("Init $xinitial Final $xfinal");
+   if (($xfinal eq '') || ($xinitial==$xfinal)) {
+# This is only one point
+        &Apache::lonnet::logthis("One point $xinitial");
+        my $tol;
+        my $val;
+        if ($derivative==2) {
+           $val=&d2funcdx2_val($xmin,$xmax,$xinitial);
+           $tol=$told2fdx2;
+        } elsif ($derivative==1) {
+           $val=&dfuncdx_val($xmin,$xmax,$xinitial);
+           $tol=$toldfdx;
+        } else {
+           $val=&func_val($xmin,$xmax,$xinitial);
+           $tol=$tolfunc;
+        }
+        &Apache::lonnet::logthis("Value $value ActVal $val Tol $tol");
+        return &compare_rel($relationship,$value,$val,$tol);
+   } else {
+# This is a range
+   }
+   return 0;
+}
+
+
 sub end_functionplotresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;
@@ -665,12 +872,34 @@ 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 $tolfunc=($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') {
-           $ad='BAD_FORMULA';
+           $ad='NOT_FUNCTION';
         } 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
 #