--- loncom/homework/functionplotresponse.pm	2010/11/07 21:10:14	1.29
+++ loncom/homework/functionplotresponse.pm	2010/11/11 03:52:35	1.33
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: functionplotresponse.pm,v 1.29 2010/11/07 21:10:14 www Exp $
+# $Id: functionplotresponse.pm,v 1.33 2010/11/11 03:52:35 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,11 +399,18 @@ sub start_functionplotrule {
              &Apache::edit::select_arg(&mt('Function:'),'derivative',
                                   [['0','Function itself'],
                                    ['1','First derivative'],
-                                   ['2','Second derivative']],$token).
+                                   ['2','Second derivative']],$token).'<br />'.
+
              &Apache::edit::text_arg('(Initial) x-value:','xinitial',
-                                     $token,'4').'&nbsp;'.
-             &Apache::edit::text_arg('Final x-value for ranges:','xfinal',
-                                     $token,'4').'&nbsp;'.
+                                      $token,'4').
+             &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,'4').
+             &Apache::edit::select_or_text_arg('Optional final x-value label:','xfinallabel',
+                                               [['end','End of Plot']],$token,'8').'<br />'.
+
              &Apache::edit::select_arg(&mt('Relationship:'),'relationship',
                                   [['eq','equal'],
                                    ['ne','not equal'],
@@ -417,7 +425,7 @@ sub start_functionplotrule {
              &Apache::edit::end_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-                                                 $safeeval,'index','derivative','xinitial','xfinal','relationship',
+                                                 $safeeval,'index','derivative','xinitial','xinitiallabel','xfinal','xfinallabel','relationship',
                                                            'value','percenterror');
     if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
    }
@@ -616,7 +624,16 @@ sub populate_arrays {
                    if (defined($Apache::functionplotresponse::func[$xi])) { return 'no_func'; }
                    $xiold=$xi;
 # 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);
@@ -703,7 +720,7 @@ sub start_functionplotresponse {
              &Apache::edit::text_arg('Maximum x-value:','xmax',
                                      $token,'4').'&nbsp;'.
              &Apache::edit::select_arg('x-axis visible:','xaxisvisible',
-                                  ['yes','no'],$token).'&nbsp;&nbsp;'.
+                                  ['yes','no'],$token).'<br />'.
              &Apache::edit::text_arg('Label y-axis:','ylabel',
                                      $token,'6').'&nbsp;'.
              &Apache::edit::text_arg('Minimum y-value:','ymin',
@@ -711,7 +728,7 @@ sub start_functionplotresponse {
              &Apache::edit::text_arg('Maximum y-value:','ymax',
                                      $token,'4').'&nbsp;'.
              &Apache::edit::select_arg('y-axis visible:','yaxisvisible',
-                                  ['yes','no'],$token).'&nbsp;&nbsp;'.
+                                  ['yes','no'],$token).'<br />'.
              &Apache::edit::select_arg('Grid visible:','gridvisible',
                                   ['yes','no'],$token).
              &Apache::edit::end_row().&Apache::edit::start_spanning_row();
@@ -738,9 +755,6 @@ sub start_functionplotresponse {
 
 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') {
@@ -778,43 +792,66 @@ 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);
-# if a hard value is set for the boundaries, it overrides the label
-   if (($xinitial ne '') && ($xinitiallabel ne '')) {
-      $Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel}=$xinitial;
+   $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 (($xfinal ne '') && ($xfinallabel ne '')) {
-      $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$xfinal;
+
+# 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})) {
-      $xinitial=$Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel};
+      $li=$Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel};
+   } else {
+      $li=&array_index($xmin,$xmax,$xinitial);
    }
-   if (defined($Apache::functionplotresponse::functionplotrulelabels{$xfinallabel})) {
-      $xfinal=$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel};
+   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 ($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;
+   if ($li<0) { $li=0; }
+   if ($lh>400) { $lh=400; }
+   if ($li>$lh) {
+       $lh=$li;
    }
 
-   my $li=&array_index($xmin,$xmax,$xinitial);
-   my $lh=&array_index($xmin,$xmax,$xfinal);
+#   &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) {
@@ -824,7 +861,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;
 }
@@ -863,25 +909,16 @@ 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;
+        $Apache::functionplotresponse::functionplotrulelabels{'end'}=0;
         if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') {
            $ad='NOT_FUNCTION';
         } else {
 # 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)) {
+              unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax)) {
                  $ad='INCORRECT';
                  last;
               }