--- loncom/homework/functionplotresponse.pm 2010/11/06 14:37:24 1.23 +++ loncom/homework/functionplotresponse.pm 2011/01/28 16:25:03 1.54 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: functionplotresponse.pm,v 1.23 2010/11/06 14:37:24 www Exp $ +# $Id: functionplotresponse.pm,v 1.54 2011/01/28 16:25:03 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,9 +31,11 @@ use strict; use Apache::response(); 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','functionplotruleset', + 'functionplotelements')); } # @@ -45,7 +47,7 @@ sub geogebra_startcode { my ($id)=@_; return (< + codebase="/adm/geogebra/" width="722" height="447" MAYSCRIPT> ENDSTARTCODE } @@ -59,7 +61,7 @@ sub geogebra_endcode { # sub geogebra_spline_program { return (< + ENDSPLINEPROGRAM } @@ -72,9 +74,8 @@ sub geogebra_default_parameters { - - - + + @@ -107,7 +108,7 @@ sub init_script { $script.="if (param=='applet_$id') { loaded_$id=true; }\n"; } $script.="if (".join(' && ',map { "loaded_$_" } (@Apache::functionplotresponse::callscripts)). - ") { setTimeout('ggbInitAll()',20) }"; + ") { setTimeout('ggbInitAll()',200) }"; my $calls=join("\n",map { "ggbInit_$_();" } (@Apache::functionplotresponse::callscripts)); return (< @@ -157,16 +158,44 @@ sub update_register { } # -# Set a coordinate variable +# Set a point coordinate variable # -sub set_coordinate { - my ($id,$variable,$x,$y)=@_; +sub set_point_coordinate { + my ($id,$variable,$x,$y,$fixed)=@_; + my $mult=($fixed?'a*':''); return (<0)) { $return.=(<0)) { $return.=(< +# # -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('derivativeorder',$parstack,$safeeval); + unless (($derivative==-1) || ($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, + &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('percenterror',$parstack,$safeeval) + ))); + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token,'Function Plot Evaluation Rule'). + &Apache::edit::text_arg('Index/Name:','index', + $token,'10').' '. + &Apache::edit::select_arg(&mt('Function:'),'derivativeorder', + [['0','Function itself'], + ['1','First derivative'], + ['2','Second derivative'], + ['-1','Integral']],$token).'
'. + &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'], + ['end','End of Plot']],$token,'8').'
'. + + &Apache::edit::text_arg('Final x-value (optional):','xfinal', + $token,'8'). + &Apache::edit::select_or_text_arg('Final x-value label (optional):','xfinallabel', + [['end','End of Plot']],$token,'8').'
'. + &Apache::edit::text_arg('Minimum length for range (optional):','minimumlength', + $token,'8'). + &Apache::edit::text_arg('Maximum length for range (optional):','maximumlength', + $token,'8').'
'. + &Apache::edit::select_or_text_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') { + if (($env{'form.'.&Apache::edit::html_element_name('xinitial')} ne '') && ($env{'form.'.&Apache::edit::html_element_name('xinitiallabel')} eq 'start')) { + $env{'form.'.&Apache::edit::html_element_name('xinitiallabel')}=''; + } + if (($env{'form.'.&Apache::edit::html_element_name('xfinal')} ne '') && ($env{'form.'.&Apache::edit::html_element_name('xfinallabel')} eq 'end')) { + $env{'form.'.&Apache::edit::html_element_name('xfinallabel')}=''; + } + 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') { @@ -411,7 +611,7 @@ sub start_spline { &Apache::edit::text_arg('Index:','index', $token,'4').' '. &Apache::edit::select_arg('Order:','order', - ['2','3','4','5','6','7','8','9'],$token).' '. + ['2','3','4','5','6','7','8'],$token).' '. &Apache::edit::text_arg('Initial x-value:','initx', $token,'4').' '. &Apache::edit::text_arg('Initial y-value:','inity', @@ -478,8 +678,8 @@ sub get_answer_from_form_fields { sub cubic_hermite { my ($t,$p1,$s1,$p2,$s2)=@_; - return (2.*$t*$t*$t-3.*$t*$t+1.)*$p1 + 5.*($t*$t*$t-2.*$t*$t+$t)*($s1-$p1)+ - (-2.*$t*$t*$t+3.*$t*$t) *$p2 + 5.*($t*$t*$t-$t*$t) *($s2-$p2); + return (2.*$t*$t*$t-3.*$t*$t+1.)*$p1 + 3.*($t*$t*$t-2.*$t*$t+$t)*($s1-$p1)+ + (-2.*$t*$t*$t+3.*$t*$t) *$p2 + 3.*($t*$t*$t-$t*$t) *($s2-$p2); } # @@ -488,8 +688,8 @@ sub cubic_hermite { sub ddt_cubic_hermite { my ($t,$p1,$s1,$p2,$s2)=@_; - return (6.*$t*$t-6.*$t) *$p1 + 5.*(3.*$t*$t-4.*$t+1.)*($s1-$p1)+ - (-6.*$t*$t+6.*$t)*$p2 + 5.*(3.*$t*$t-2.*$t) *($s2-$p2); + return (6.*$t*$t-6.*$t) *$p1 + 3.*(3.*$t*$t-4.*$t+1.)*($s1-$p1)+ + (-6.*$t*$t+6.*$t)*$p2 + 3.*(3.*$t*$t-2.*$t) *($s2-$p2); } # @@ -498,8 +698,8 @@ sub ddt_cubic_hermite { sub d2dt2_cubic_hermite { my ($t,$p1,$s1,$p2,$s2)=@_; - return (12.*$t-6.) *$p1 + 5.*(6.*$t-4.)*($s1-$p1)+ - (-12.*$t+6.)*$p2 + 5.*(6.*$t-2.)*($s2-$p2); + return (12.*$t-6.) *$p1 + 3.*(6.*$t-4.)*($s1-$p1)+ + (-12.*$t+6.)*$p2 + 3.*(6.*$t-2.)*($s2-$p2); } # @@ -507,95 +707,21 @@ 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)); + if ($x ne '') { + return int(($x-$xmin)/($xmax-$xmin)*400.+0.5); } 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); + return undef; } } # -# 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); -} - -# # Populate the arrays # 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; @@ -616,23 +742,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); } } } @@ -641,7 +778,7 @@ sub populate_arrays { } # -# Implentation of +# Implementation of # sub start_functionplotresponse { @@ -657,6 +794,14 @@ sub start_functionplotresponse { undef %Apache::functionplotresponse::previous; $Apache::functionplotresponse::inputfields=''; $Apache::functionplotresponse::counter=0; +# Remember rules + undef @Apache::functionplotresponse::functionplotrules; +# Remember failed rules + if ($target eq 'grade') { + undef @Apache::functionplotresponse::failedrules; + } +# Delete previous awards + undef $Apache::functionplotresponse::awarddetail; # Part and ID my $partid=$Apache::inputtags::part; my $id=&Apache::response::start_response($parstack,$safeeval); @@ -666,14 +811,7 @@ sub start_functionplotresponse { &decode_previous_answer($Apache::lonhomework::history{"resource.$partid.$id.submission"}); # Parameters of - my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval); - $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 ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval); 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'); @@ -683,7 +821,9 @@ sub start_functionplotresponse { $result.=&Apache::edit::start_table($token) .''.&mt('Function Plot Question').'' .''.&mt('Delete?').' ' - .&Apache::edit::deletelist($target,$token) + .&Apache::edit::deletelist($target,$token).'   ' + .&Apache::edit::insertlist($target,$token).'   ' + .&Apache::loncommon::help_open_topic('Function_Plot_Response_Question','Function Plot Responses') .'' ." " .&Apache::edit::end_row() @@ -696,7 +836,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', @@ -704,31 +844,326 @@ 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). + ['yes','no'],$token).'
'. + &Apache::edit::text_arg('Background plot(s) for answer (function:xmin:xmax,function:xmin:xmax,...):', + 'answerdisplay',$token,'50'); + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'xlabel','xmin','xmax','ylabel','ymin','ymax', - 'xaxisvisible','yaxisvisible','gridvisible'); + 'xaxisvisible','yaxisvisible','gridvisible','answerdisplay'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } elsif ($target eq 'meta') { $result=&Apache::response::meta_package_write('functionplotresponse'); - } elsif ($target eq 'web') { -# paste in the update routine to receive stuff back from the applet - $result.=&update_script($internalid); -# start the initscript for this applet - $result.=&start_init_script($internalid); -# put the axis commands inside - $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 ="".&mt('Rules Log')."
"; + &Apache::lonxml::add_script_result($rules_var); + } + return $result; } +sub compare_rel { + my ($relationship,$value,$realval,$tol)=@_; +# is the real value undefined? + unless (defined($realval)) { +# the real value is not defined + 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; + } + } + +# is the expected value undefined? + if ($value eq 'undef') { +# but by now we know that the real value is defined + return 0; + } + +# both are 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.'
'; +} + +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 ".($derivative<0?'integral':('function itself','first derivative','second derivative')[$derivative])." $relationship $value"); + if ((defined($minimumlength)) || (defined($maximumlength))) { + &addlog("Minimumlength $minimumlength Maximumlength $maximumlength"); + } + 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) || (!defined($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); + } elsif ($derivative==-1) { + $tol=$tol*($xmax-$xmin)/2.; + } + } + my $integral=0; + my $binwidth=($xmax-$xmin)/400.; + if (($derivative<0) && (!$findupper)) { +# definite integral, calculate over whole length + &addlog("Calculating definite integral"); + for (my $i=$li; $i<=$lh; $i++) { + $integral+=$Apache::functionplotresponse::func[$i]*$binwidth; + } + unless (&compare_rel($relationship,$value,$integral,$tol)) { + &addlog("Actual integral ".(defined($integral)?$integral:'undef').", expected $value, tolerance $tol"); + &addlog("Rule $label failed."); + my $hintlabel=$label; + $hintlabel=~s/^R//; + push(@Apache::functionplotresponse::failedrules,$hintlabel); + &addlog("Set hint condition $hintlabel"); + return 0; + } + } else { + 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]; + } elsif ($derivative==-1) { + $integral+=$Apache::functionplotresponse::func[$i]*$binwidth; + $val=$integral; + } else { + $val=$Apache::functionplotresponse::func[$i]; + } + unless (&compare_rel($relationship,$value,$val,$tol)) { + &addlog("Actual value ".(defined($val)?$val:'undef').", expected $value, tolerance $tol"); + &addlog("Condition not fulfilled at x=".&actualval($i,$xmin,$xmax)." (".$Apache::functionplotresponse::actualxval[$i]."; index $i)"); + if (($findupper) && ($i>$li)) { +# Check lengths + unless (&checklength($i,$li,$minimumlength,$maximumlength,$xmin,$xmax,$label)) { return 0; } +# Successfully found a new label, set it + $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$i; + &addlog("Rule $label passed, setting label $xfinallabel"); + return 1; + } else { + &addlog("Rule $label failed."); + &setfailed($label); + return 0; + } + } + } + } +# Corner case where this makes sense: using start or stop as defined labels + unless (&checklength($lh,$li,$minimumlength,$maximumlength,$xmin,$xmax,$label)) { return 0; } + &addlog("Rule $label passed."); + return 1; +} + +# +# check for minimum and maximum lengths +# + +sub checklength { + my ($i,$li,$minimumlength,$maximumlength,$xmin,$xmax,$label)=@_; + unless (($minimumlength) || ($maximumlength)) { return 1; } + 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"); + &setfailed($label); + return 0; + } + } + if ($maximumlength) { + if ($length>$maximumlength) { + &addlog("Rule $label failed, actual length $length, maximum length $maximumlength"); + &setfailed($label); + return 0; + } + } + return 1; +} + +sub setfailed { + my ($label)=@_; + my $hintlabel=$label; + $hintlabel=~s/^R//; + push(@Apache::functionplotresponse::failedrules,$hintlabel); + &addlog("Set hint condition $hintlabel"); +} + +sub start_functionplotruleset { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + if ($target eq 'edit') { + return &Apache::edit::start_table($token). + ''.&mt('Function Plot Rule Set').'' + .''.&mt('Delete?').' ' + .&Apache::edit::deletelist($target,$token).'   '. + &Apache::edit::insertlist($target,$token).'   ' + .&Apache::loncommon::help_open_topic('Function_Plot_Response_Rule_Set','Function Plot Rules') + .'' + ." " + .&Apache::edit::end_row() + .&Apache::edit::start_spanning_row() + ."\n"; + } +} + +sub end_functionplotruleset { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + + if ($target eq 'edit' ) { + return &Apache::edit::end_table(); + } elsif ($target eq 'grade' + && &Apache::response::submitted() + && $Apache::lonhomework::type ne 'exam') { +# +# Actually grade +# + my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-2); + + 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. + foreach my $rule (@Apache::functionplotresponse::functionplotrules) { + unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax)) { + $ad='INCORRECT'; + last; + } + } +# If it's not wrong, it's correct + unless ($ad) { $ad='EXACT_ANS' }; + } + &addlog("Set hint conditions: ".join(",",@Apache::functionplotresponse::failedrules)); + &addlog("Assigned award detail: $ad"); +# Store for later to be assigned at end_functionplotresponse + $Apache::functionplotresponse::awarddetail=$ad; + } +} + + sub end_functionplotresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; &Apache::response::end_response; @@ -743,7 +1178,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() @@ -752,28 +1187,50 @@ sub end_functionplotresponse { $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; my %previous=&Apache::response::check_for_previous($response,$partid,$id); # -# Actually grade +# Assign grade # - my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval); - $xmin=(defined($xmin)?$xmin:-10); - my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval); - $xmax=(defined($xmax)?$xmax:10); - my $ad; - if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') { - $ad='NOT_FUNCTION'; - } else { - $ad='INCORRECT'; - } - + my $ad=$Apache::functionplotresponse::awarddetail; # # Store grading info # $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; &Apache::response::handle_previous(\%previous,$ad); } elsif ($target eq 'web') { + undef @Apache::functionplotresponse::failedrules; + } + return $result; +} + +sub end_functionplotelements { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + if ($target eq 'edit' ) { + $result=&Apache::edit::end_table(); + } elsif ($target eq 'web') { + my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-2); + +# Are we in show answer mode? + my $showanswer=&Apache::response::show_answer(); + if ($showanswer) { +# Render answerdisplay + my $answerdisplay=&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval,-2); + if ($answerdisplay=~/\S/s) { + foreach my $plot (split(/\s*\,\s*/,$answerdisplay)) { + my ($func,$xl,$xh)=split(/\s*\:\s*/,$plot); + if ((!defined($xl)) || ($xl eq '')) { $xl=$xmin; } + if ((!defined($xh)) || ($xh eq '')) { $xh=$xmax; } + $result.=&plot_script($internalid,$func,1,'','00aa00',$xl,$xh,6); + } + } + } + my $fixed=0; + if (($showanswer) || (&Apache::response::check_status()>=2)) { $fixed=1; } # Now is the time to render all of the stored splines foreach my $label (keys(%Apache::functionplotresponse::splineorder)) { - $result.=&generate_spline($internalid,$label); + $result.=&generate_spline($internalid,$label,$xmin,$xmax,$ymin,$ymax,$fixed); } # close the init script $result.=&end_init_script(); @@ -797,6 +1254,65 @@ sub end_functionplotresponse { } return $result; } + +sub boundaries { + my ($parstack,$safeeval,$level)=@_; + my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval,$level); + $xmin=(defined($xmin)?$xmin:-10); + my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval,$level); + $xmax=(defined($xmax)?$xmax:10); + my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval,$level); + $ymin=(defined($ymin)?$ymin:-10); + my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval,$level); + $ymax=(defined($ymax)?$ymax:10); + if ($xmax<=$xmin) { + $xmax=$xmin+20; + } + if ($ymax<=$ymin) { + $ymax=$ymin+20; + } + return ($xmin,$xmax,$ymin,$ymax); +} + +sub start_functionplotelements { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + + if ($target eq 'edit') { + return &Apache::edit::start_table($token). + ''.&mt('Function Plot Elements').'' + .''.&mt('Delete?').' ' + .&Apache::edit::deletelist($target,$token).'   '. + &Apache::edit::insertlist($target,$token).'   ' + .&Apache::loncommon::help_open_topic('Function_Plot_Response_Elements','Function Plot Elements') + .'' + ." " + .&Apache::edit::end_row() + .&Apache::edit::start_spanning_row() + ."\n"; + } elsif ($target eq 'web') { + my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-2); + my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval,-2)=~/on|true|yes|1/i?'true':'false'); + my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval,-2)=~/on|true|yes|1/i?'true':'false'); + my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval,-2)=~/on|true|yes|1/i?'true':'false'); + my $xlabel=&Apache::lonxml::get_param('xlabel',$parstack,$safeeval,-2); + my $ylabel=&Apache::lonxml::get_param('ylabel',$parstack,$safeeval,-2); + + +# paste in the update routine to receive stuff back from the applet + $result.=&update_script($internalid); +# start the initscript for this applet + $result.=&start_init_script($internalid); +# put the axis commands inside + $result.=&axes_script($internalid,$xmin,$xmax,$ymin,$ymax,$xaxisvisible,$yaxisvisible,$gridvisible); + $result.=&axes_label($internalid,$xmin,$xmax,$ymin,$ymax,$xlabel,$ylabel); +# init script is left open + } + return $result; +} 1;