--- loncom/homework/functionplotresponse.pm 2010/11/10 22:41:29 1.31 +++ loncom/homework/functionplotresponse.pm 2010/11/10 22:53:32 1.32 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: functionplotresponse.pm,v 1.31 2010/11/10 22:41:29 www Exp $ +# $Id: functionplotresponse.pm,v 1.32 2010/11/10 22:53:32 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -398,17 +398,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'], @@ -719,7 +719,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 +727,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(); @@ -792,7 +792,7 @@ sub compare_rel { sub functionplotrulecheck { my ($rule,$xmin,$xmax,$tolfunc,$toldfdx,$told2fdx2)=@_; - &Apache::lonnet::logthis("Rule $rule TolFunc $tolfunc TolDfDx $toldfdx TolD2fDx2 $told2fdx2"); +# &Apache::lonnet::logthis("Rule $rule TolFunc $tolfunc TolDfDx $toldfdx TolD2fDx2 $told2fdx2"); my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$relationship,$value) =split(/\:/,$rule); @@ -839,7 +839,7 @@ sub functionplotrulecheck { $lh=$li; } - &Apache::lonnet::logthis("Init $xinitial=$li Final $xfinal=$lh Findupper: $findupper"); +# &Apache::lonnet::logthis("Init $xinitial=$li Final $xfinal=$lh Findupper: $findupper"); my $tol=$tolfunc; if ($derivative==2) { $tol=$told2fdx2; @@ -856,10 +856,10 @@ sub functionplotrulecheck { $val=$Apache::functionplotresponse::func[$i]; } unless (&compare_rel($relationship,$value,$val,$tol)) { - &Apache::lonnet::logthis("Condition false $findupper at $i with $val"); +# &Apache::lonnet::logthis("Condition false $findupper at $i with $val"); if (($findupper) && ($i>$li)) { $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$i; - &Apache::lonnet::logthis("Setting $xfinallabel to $i"); +# &Apache::lonnet::logthis("Setting $xfinallabel to $i"); return 1; } else { return 0;