--- loncom/homework/functionplotresponse.pm 2010/11/10 22:53:32 1.32 +++ loncom/homework/functionplotresponse.pm 2011/11/22 02:13:37 1.85 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA -# option list style responses +# Functionplot responses # -# $Id: functionplotresponse.pm,v 1.32 2010/11/10 22:53:32 www Exp $ +# $Id: functionplotresponse.pm,v 1.85 2011/11/22 02:13:37 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,9 +31,16 @@ use strict; use Apache::response(); use Apache::lonlocal; use Apache::lonnet; - +use Apache::run; +use LONCAPA; + BEGIN { - &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','functionplotrule')); + &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline', + 'plotobject','plotvector', + 'functionplotvectorrule','functionplotvectorsumrule', + 'functionplotcustomrule', + 'functionplotrule','functionplotruleset', + 'functionplotelements')); } # @@ -45,7 +52,7 @@ sub geogebra_startcode { my ($id)=@_; return (< + codebase="/adm/geogebra/" width="722" height="447" MAYSCRIPT> ENDSTARTCODE } @@ -59,7 +66,7 @@ sub geogebra_endcode { # sub geogebra_spline_program { return (< + ENDSPLINEPROGRAM } @@ -72,9 +79,8 @@ sub geogebra_default_parameters { - - - + + @@ -107,7 +113,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 +163,52 @@ 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*':''); +# Get rid of wild exponents, make sure it's a number + $x=1.*$x; + $y=1.*$y; +# GeoGebra does not understand "E" + $x=~s/[e|E]/\*10\^/; + $x=~s/\+//; + $y=~s/[e|E]/\*10\^/; + $y=~s/\+//; return (<0)) { $return.=(<0)) { $return.=(<8) { $order=8; } + $Apache::functionplotresponse::counter++; + my $label='CSpline'.$Apache::functionplotresponse::counter; + my $output='document.ggbApplet_'.$id.'.evalCommand("'.$label.'=Spline'.$order.'['; + for (my $i=0;$i<=$#points;$i+=4) { + $output.="($points[$i],$points[$i+1]),($points[$i+2],$points[$i+3]),"; + } + $output=~s/\,$//; + $output.=']");'."\n"; + for (my $i=2; $i<2*$order; $i+=2) { + $output.='document.ggbApplet_'.$id.'.setColor("'.$label.'_'.($i>=10?'{':'').$i.($i>=10?'}':'').'",0,170,0);'."\n"; + } + for (my $i=1; $i<2*$order; $i+=2) { + $output.='document.ggbApplet_'.$id.'.setVisible("'.$label.'_'.($i>=10?'{':'').$i.($i>=10?'}':'').'",false);'."\n"; + } + + return $output; } # @@ -282,7 +463,7 @@ ENDPLOTSCRIPT # sub generate_spline { - my ($id,$label)=@_; + my ($id,$label,$xmin,$xmax,$ymin,$ymax,$fixed)=@_; my $result=''; my $order=$Apache::functionplotresponse::splineorder{$label}; my $x=$Apache::functionplotresponse::splineinitx{$label}; @@ -291,16 +472,120 @@ sub generate_spline { my $sy=$Apache::functionplotresponse::splinescaley{$label}; my @coords=(); foreach my $i (1..$order) { - $result.=&new_coordinate($id,$label.'P'.$i,$x,$y); + $result.=&new_point_coordinate($id,$label.'P'.$i,$x,$y,$fixed); + my $xp=$x; $x+=$sx/(2.*($order-1)); push(@coords,$label.'P'.$i); - $result.=&new_coordinate($id,$label.'S'.$i,$x,$y+$sy); + $result.=&new_slope_coordinate($id,$label.'S'.$i,$x,$y+$sy,$label.'P'.$i,$xp,$y,$xmin,$xmax,$ymin,$ymax,$fixed); $x+=$sx/(2.*($order-1)); push(@coords,$label.'S'.$i); } $result.='document.ggbApplet_'.$id.'.evalCommand("Spline'.$order.'['.join(',',@coords).']");'."\n"; return $result; } + +# +# Object +# + +sub start_plotobject { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1]; + my $x=&Apache::lonxml::get_param('x',$parstack,$safeeval); + my $y=&Apache::lonxml::get_param('y',$parstack,$safeeval); + my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval); + $label=~s/\W//gs; + $label=ucfirst($label); + unless ($label) { $label="NewObject"; } + if ($target eq 'web') { + my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-3); + unless (defined($x)) { $x=$xmin; } + unless (defined($y)) { $y=$ymin; } + $result.=&plotobject_script($internalid,$label,$x,$y); + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token,'Plot Object'). + &Apache::edit::text_arg('Label on Plot:','label', + $token,'16'). + &Apache::edit::text_arg('x:','x', + $token,'8'). + &Apache::edit::text_arg('y:','y', + $token,'8'). + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + $env{'form.'.&Apache::edit::html_element_name('label')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('label')}); + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'label','x','y'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_plotobject { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; +} + +# +# Vector +# + +sub start_plotvector { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1]; + my $tailx=&Apache::lonxml::get_param('tailx',$parstack,$safeeval); + my $taily=&Apache::lonxml::get_param('taily',$parstack,$safeeval); + my $tipx=&Apache::lonxml::get_param('tipx',$parstack,$safeeval); + my $tipy=&Apache::lonxml::get_param('tipy',$parstack,$safeeval); + + my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval); + $label=~s/\W//gs; + $label=ucfirst($label); + unless ($label) { $label="NewVector"; } + if ($target eq 'web') { + my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-3); + unless (defined($tailx)) { $tailx=$xmin; } + unless (defined($taily)) { $taily=$ymin; } + unless (defined($tipx)) { $tipx=$xmin; } + unless (defined($tipy)) { $tipy=$ymin; } + $result.=&plotvector_script($internalid,$label,$tailx,$taily,$tipx,$tipy,$xmin,$xmax); + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token,'Plot Vector'). + &Apache::edit::text_arg('Label on Plot:','label', + $token,'16'). + &Apache::edit::text_arg('Tail x:','tailx', + $token,'8'). + &Apache::edit::text_arg('Tail y:','taily', + $token,'8'). + &Apache::edit::text_arg('Tip x:','tipx', + $token,'8'). + &Apache::edit::text_arg('Tip y:','tipy', + $token,'8'). + + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + $env{'form.'.&Apache::edit::html_element_name('label')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('label')}); + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'label','tailx','taily','tipx','tipy'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_plotvector { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; +} + + + # # # @@ -309,21 +594,38 @@ sub start_backgroundplot { my $result=''; my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1]; my $function=&Apache::lonxml::get_param('function',$parstack,$safeeval); + my $xinitial=&Apache::lonxml::get_param('xinitial',$parstack,$safeeval); + my $xfinal=&Apache::lonxml::get_param('xfinal',$parstack,$safeeval); + my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval); + my $color=&Apache::lonxml::get_param('color',$parstack,$safeeval); + $color=~s/[^a-fA-F0-9]//gs; + unless (length($color)==6) { $color=''; } my $fixed=(&Apache::lonxml::get_param('fixed',$parstack,$safeeval)=~/on|true|yes|1/i?1:0); unless ($function) { $function="0"; } if ($target eq 'web') { - $result.=&plot_script($internalid,$function,$fixed); + my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-3); + unless (defined($xinitial)) { $xinitial=$xmin; } + unless (defined($xfinal)) { $xfinal=$xmax; } + $result.=&plot_script($internalid,$function,$fixed,$label,$color,$xinitial,$xfinal); } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,'Background Function Plot'). &Apache::edit::text_arg('Function:','function', $token,'16'). + &Apache::edit::text_arg('Initial x-value (optional):','xinitial', + $token,'8'). + &Apache::edit::text_arg('Final x-value (optional):','xfinal', + $token,'8'). + &Apache::edit::text_arg('Label on Plot:','label', + $token,'8'). + &Apache::edit::text_arg('Color (hex code):','color', + $token,'8'). &Apache::edit::select_arg('Fixed location:','fixed', ['yes','no'],$token). &Apache::edit::end_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'function','fixed'); + $safeeval,'function','label','xinitial','xfinal','color','fixed'); if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } } return $result; @@ -355,10 +657,6 @@ sub start_functionplotrule { } 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 @@ -376,8 +674,8 @@ sub start_functionplotrule { &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)) { + 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; } @@ -388,29 +686,36 @@ sub start_functionplotrule { $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('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:','index', - $token,'4').' '. - &Apache::edit::select_arg(&mt('Function:'),'derivative', + $result=&Apache::edit::tag_start($target,$token,'Function Plot Graph 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']],$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').'
'. - - &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', + ['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::select_arg(&mt('Relationship:'),'relationship', + &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'], @@ -418,14 +723,22 @@ sub start_functionplotrule { ['lt','less than'], ['le','less than or equal']],$token). $result.= &Apache::edit::select_or_text_arg('Value:','value', - [['undef','not defined']],$token,'4'). + [['undef','not defined']],$token,'30'). &Apache::edit::text_arg('Percent error:','percenterror', - $token,'4'). + $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','derivative','xinitial','xinitiallabel','xfinal','xfinallabel','relationship', - 'value','percenterror'); + $safeeval,'index','derivativeorder', + 'xinitial','xinitiallabel','xfinal','xfinallabel', + 'minimumlength','maximumlength', + 'relationship','value','percenterror'); if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } } return $result; @@ -442,6 +755,253 @@ sub end_functionplotrule { # +# +# +sub start_functionplotvectorrule { + 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('Rule indices should only contain alphanumeric characters.')); + } + $label=~s/\W//gs; + unless ($label) { + $label='R'.$Apache::functionplotresponse::counter; + } else { + $label='R'.$label; + } + + if ($target eq 'grade') { +# Simply remember - in order - for later + + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + + my $vector=&Apache::lonxml::get_param('vector',$parstack,$safeeval); + $vector=~s/\W//gs; + $vector=ucfirst($vector); + + my $attachpoint=&Apache::lonxml::get_param('attachpoint',$parstack,$safeeval); + $attachpoint=~s/\W//gs; + $attachpoint=ucfirst($attachpoint); + + my $notattachpoint=&Apache::lonxml::get_param('notattachpoint',$parstack,$safeeval); + $notattachpoint=~s/\W//gs; + $notattachpoint=ucfirst($notattachpoint); + + my $tailpoint=&Apache::lonxml::get_param('tailpoint',$parstack,$safeeval); + $tailpoint=~s/\W//gs; + $tailpoint=ucfirst($tailpoint); + my $tippoint=&Apache::lonxml::get_param('tippoint',$parstack,$safeeval); + $tippoint=~s/\W//gs; + $tippoint=ucfirst($tippoint); + + my $nottailpoint=&Apache::lonxml::get_param('nottailpoint',$parstack,$safeeval); + $nottailpoint=~s/\W//gs; + $nottailpoint=ucfirst($nottailpoint); + my $nottippoint=&Apache::lonxml::get_param('nottippoint',$parstack,$safeeval); + $nottippoint=~s/\W//gs; + $nottippoint=ucfirst($nottippoint); + + push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( + $label, + 'vector', + $internalid, + $vector, + $attachpoint, + $notattachpoint, + $tailpoint, + $tippoint, + $nottailpoint, + $nottippoint, + &Apache::lonxml::get_param('length',$parstack,$safeeval), + &Apache::lonxml::get_param('angle',$parstack,$safeeval), + &Apache::lonxml::get_param('lengtherror',$parstack,$safeeval), + &Apache::lonxml::get_param('angleerror',$parstack,$safeeval), + ))); + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token,'Function Plot Vector Rule'). + &Apache::edit::text_arg('Index/Name:','index', + $token,'10').' '. + &Apache::edit::text_arg('Vector:','vector', + $token,'16').'
'. + &Apache::edit::text_arg('Attached to object:','attachpoint', + $token,'16'). + &Apache::edit::text_arg('Not attached to object:','notattachpoint', + $token,'16').'
'. + &Apache::edit::text_arg('Tail attached to object:','tailpoint', + $token,'16'). + &Apache::edit::text_arg('Tip attached to object:','tippoint', + $token,'16'). + &Apache::edit::text_arg('Tail not attached to object:','nottailpoint', + $token,'16'). + &Apache::edit::text_arg('Tip not attached to object:','nottippoint', + $token,'16').'
'. + &Apache::edit::text_arg('Length:','length', + $token,'30'). + &Apache::edit::text_arg('Absolute error length:','lengtherror', + $token,'8').'
'. + &Apache::edit::text_arg('Angle:','angle', + $token,'30'). + &Apache::edit::text_arg('Absolute error angle:','angleerror', + $token,'8'). + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + $env{'form.'.&Apache::edit::html_element_name('vector')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('vector')}); + $env{'form.'.&Apache::edit::html_element_name('attachpoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('attachpoint')}); + $env{'form.'.&Apache::edit::html_element_name('notattachpoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('notattachpoint')}); + $env{'form.'.&Apache::edit::html_element_name('tailpoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('tailpoint')}); + $env{'form.'.&Apache::edit::html_element_name('tippoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('tippoint')}); + $env{'form.'.&Apache::edit::html_element_name('nottailpoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('nottailpoint')}); + $env{'form.'.&Apache::edit::html_element_name('nottippoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('nottippoint')}); + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'index','vector','attachpoint','notattachpoint', + 'tailpoint','tippoint','nottailpoint','nottipoint', + 'length','angle', + 'lengtherror','angleerror'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_functionplotvectorrule { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; +} + +# +# +# +sub start_functionplotvectorsumrule { + 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('Rule indices should only contain alphanumeric characters.')); + } + $label=~s/\W//gs; + unless ($label) { + $label='R'.$Apache::functionplotresponse::counter; + } else { + $label='R'.$label; + } + if ($target eq 'grade') { +# Simply remember - in order - for later + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + my $vectors=&Apache::lonxml::get_param('vectors',$parstack,$safeeval); + push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( + $label, + 'sum', + $internalid, + $vectors, + &Apache::lonxml::get_param('length',$parstack,$safeeval), + &Apache::lonxml::get_param('angle',$parstack,$safeeval), + &Apache::lonxml::get_param('lengtherror',$parstack,$safeeval), + &Apache::lonxml::get_param('angleerror',$parstack,$safeeval), + ))); + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token,'Function Plot Vector Sum Rule'). + &Apache::edit::text_arg('Index/Name:','index', + $token,'10').' '. + &Apache::edit::text_arg('Comma-separated list of vectors:','vectors', + $token,'30').'
'. + &Apache::edit::text_arg('Sum vector length:','length', + $token,'30'). + &Apache::edit::text_arg('Absolute error length:','lengtherror', + $token,'8').'
'. + &Apache::edit::text_arg('Sum vector angle:','angle', + $token,'30'). + &Apache::edit::text_arg('Absolute error angle:','angleerror', + $token,'8'). + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'index','vectors', + 'length','angle', + 'lengtherror','angleerror'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_functionplotvectorsumrule { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; +} + +# +# +# +sub start_functionplotcustomrule { + 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('Rule indices should only contain alphanumeric characters.')); + } + $label=~s/\W//gs; + unless ($label) { + $label='R'.$Apache::functionplotresponse::counter; + } else { + $label='R'.$label; + } + &Apache::lonxml::register('Apache::response',('answer')); + if ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token,'Function Plot Custom Rule'). + &Apache::edit::text_arg('Index/Name:','index',$token,'10'). + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'index'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_functionplotcustomrule { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } elsif ($target eq 'grade') { +# Simply remember - in order - for later + 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; + } + push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( + $label, + 'custom', + &escape($Apache::response::custom_answer[-1]) + ))); + } + &Apache::lonxml::deregister('Apache::response',('answer')); + return $result; +} + + + +# # # # Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them @@ -490,7 +1050,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', @@ -557,8 +1117,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); } # @@ -567,8 +1127,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); } # @@ -577,8 +1137,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); } # @@ -586,7 +1146,11 @@ sub d2dt2_cubic_hermite { # sub array_index { my ($xmin,$xmax,$x)=@_; - return int(($x-$xmin)/($xmax-$xmin)*400.+0.5); + if ($x ne '') { + return int(($x-$xmin)/($xmax-$xmin)*400.+0.5); + } else { + return undef; + } } # @@ -594,8 +1158,9 @@ sub array_index { # sub populate_arrays { - my ($id,$xmin,$xmax)=@_; + my ($id,$xmin,$xmax,$ymin,$ymax)=@_; 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; @@ -617,14 +1182,23 @@ sub populate_arrays { $env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_y'}); # Run in small steps over spline parameter for (my $t=0; $t<=1; $t+=0.0001) { - my $xi=&array_index($xmin,$xmax,&cubic_hermite($t,@xparms)); + 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<=400)) { - if (defined($Apache::functionplotresponse::func[$xi])) { return 'no_func'; } $xiold=$xi; + $Apache::functionplotresponse::actualxval[$xi]=$xreal; # Function value my $funcval=&cubic_hermite($t,@yparms); + +# Do we already have a value for this point, and is it different from the new one? + if ((defined($Apache::functionplotresponse::func[$xi])) && + (abs($Apache::functionplotresponse::func[$xi]-$funcval)>($ymax-$ymin)/100.)) { + return 'no_func'; + } +# Okay, remember the new point $Apache::functionplotresponse::func[$xi]=$funcval; + if (defined($funcval)) { if ($xi<$Apache::functionplotresponse::functionplotrulelabels{'start'}) { $Apache::functionplotresponse::functionplotrulelabels{'start'}=$xi; @@ -638,14 +1212,10 @@ sub populate_arrays { my $dxdt=&ddt_cubic_hermite($t,@xparms); if ($dxdt) { $Apache::functionplotresponse::dfuncdx[$xi]=&ddt_cubic_hermite($t,@yparms)/$dxdt; - } -# Faa di Bruno -# d^2y/dx^2=(d^2y/dt^2)/(dx/dt)^2+(dy/dt)/(d^2x/dt^2) - my $d2xdt2=&d2dt2_cubic_hermite($t,@xparms); - if (($dxdt) && ($d2xdt2)) { +# Second derivative $Apache::functionplotresponse::d2funcdx2[$xi]= - &d2dt2_cubic_hermite($t,@yparms)/($dxdt*$dxdt) - +&ddt_cubic_hermite($t,@yparms)/$d2xdt2; + ($dxdt*&d2dt2_cubic_hermite($t,@yparms)-&ddt_cubic_hermite($t,@yparms)*&d2dt2_cubic_hermite($t,@xparms))/ + ($dxdt*$dxdt*$dxdt); } } } @@ -654,7 +1224,7 @@ sub populate_arrays { } # -# Implentation of +# Implementation of # sub start_functionplotresponse { @@ -672,6 +1242,13 @@ sub start_functionplotresponse { $Apache::functionplotresponse::counter=0; # Remember rules undef @Apache::functionplotresponse::functionplotrules; + undef @Apache::functionplotresponse::functionplotvectorrules; +# 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); @@ -681,22 +1258,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); - 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 ($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'); @@ -706,7 +1268,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() @@ -729,33 +1293,51 @@ sub start_functionplotresponse { &Apache::edit::select_arg('y-axis visible:','yaxisvisible', ['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(x):xmin:xmax,function(x):xmin:xmax,x1:y1:sx1:sy1:x2:y2:sx2:sy2,...):', + '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 defined? +# is the real value undefined? unless (defined($realval)) { +# the real value is not defined if ($relationship eq 'eq') { if ($value eq 'undef') { return 1; @@ -773,7 +1355,13 @@ sub compare_rel { } } -# it is defined. +# 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') { @@ -790,12 +1378,330 @@ sub compare_rel { return 0; } +sub addlog { + my ($text)=@_; + $text=~s/\'/\\\'/g; + $Apache::functionplotresponse::ruleslog.=$text.'
'; +} + +sub actualval { + my ($i,$xmin,$xmax)=@_; + return $xmin+$i/400.*($xmax-$xmin); +} + +sub fpr_val { + my ($arg)=@_; + return &actualval($Apache::functionplotresponse::functionplotrulelabels{$arg}, + $Apache::functionplotresponse::fpr_xmin, + $Apache::functionplotresponse::fpr_xmax); +} + +sub fpr_f { + my ($arg)=@_; + return $Apache::functionplotresponse::func[&array_index($Apache::functionplotresponse::fpr_xmin, + $Apache::functionplotresponse::fpr_xmax, + $arg)]; +} + +sub fpr_dfdx { + my ($arg)=@_; + return $Apache::functionplotresponse::dfuncdx[&array_index($Apache::functionplotresponse::fpr_xmin, + $Apache::functionplotresponse::fpr_xmax, + $arg)]; +} + +sub fpr_d2fdx2 { + my ($arg)=@_; + return $Apache::functionplotresponse::d2funcdx2[&array_index($Apache::functionplotresponse::fpr_xmin, + $Apache::functionplotresponse::fpr_xmax, + $arg)]; +} + +sub fpr_vectorcoords { + my ($arg)=@_; + $arg=~s/\W//gs; + $arg=ucfirst($arg); + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + return ($env{'form.HWVAL_'.$internalid.'_'.$arg.'Start_x'}, + $env{'form.HWVAL_'.$internalid.'_'.$arg.'End_x'}, + $env{'form.HWVAL_'.$internalid.'_'.$arg.'Start_y'}, + $env{'form.HWVAL_'.$internalid.'_'.$arg.'End_y'}); +} + +sub fpr_objectcoords { + my ($arg)=@_; + $arg=~s/\W//gs; + $arg=ucfirst($arg); + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + return ($env{'form.HWVAL_'.$internalid.'_'.$arg.'_x'}, + $env{'form.HWVAL_'.$internalid.'_'.$arg.'_y'}); +} + +sub fpr_vectorlength { + my ($arg)=@_; + my ($xs,$xe,$ys,$ye)=&fpr_vectorcoords($arg); + return sqrt(($xe-$xs)*($xe-$xs)+($ye-$ys)*($ye-$ys)); +} + +sub fpr_vectorangle { + my ($arg)=@_; + my ($xs,$xe,$ys,$ye)=&fpr_vectorcoords($arg); + my $angle=57.2957795*atan2(($ye-$ys),($xe-$xs)); + if ($angle<0) { $angle=360+$angle; } + return $angle; +} + +sub vectorcoords { + my ($id,$label)=@_; + return ($env{'form.HWVAL_'.$id.'_'.$label.'Start_x'}, + $env{'form.HWVAL_'.$id.'_'.$label.'End_x'}, + $env{'form.HWVAL_'.$id.'_'.$label.'Start_y'}, + $env{'form.HWVAL_'.$id.'_'.$label.'End_y'}); +} + +sub objectcoords { + my ($id,$label)=@_; + return ($env{'form.HWVAL_'.$id.'_'.$label.'_x'}, + $env{'form.HWVAL_'.$id.'_'.$label.'_y'}); +} + +sub attached { + my ($id,$vector,$object,$xmin,$xmax,$ymin,$ymax)=@_; + my ($xs,$xe,$ys,$ye)=&vectorcoords($id,$vector); + my ($xo,$yo)=&objectcoords($id,$object); + my $tolx=($xmax-$xmin)/100.; + my $toly=($ymax-$ymin)/100.; + my $tail=0; + my $tip=0; + &addlog("Proximity $vector ($xs,$xe,$ys,$ye) to $object ($xo,$yo)"); + if ((abs($xs-$xo)<$tolx) && (abs($ys-$yo)<$toly)) { $tail=1; } + if ((abs($xe-$xo)<$tolx) && (abs($ye-$yo)<$toly)) { $tip=1; } + &addlog("Result tail:$tail tip:$tip"); + return($tail,$tip); +} + + +sub vectorangle { + my ($x,$y)=@_; + my $angle=57.2957795*atan2($y,$x); + if ($angle<0) { $angle=360+$angle; } + return $angle; +} + +sub vectorlength { + my ($x,$y)=@_; + return sqrt($x*$x+$y*$y); +} + +sub relvector { + my ($xs,$xe,$ys,$ye)=@_; + return ($xe-$xs,$ye-$ys); +} + +sub plotvectorlength { + return &vectorlength(&relvector(&vectorcoords(@_))); +} + +sub plotvectorangle { + return &vectorangle(&relvector(&vectorcoords(@_))); +} + + +# +# Evaluate a functionplotvectorrule +# + +sub functionplotvectorrulecheck { + my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_; + &addlog("================="); + my ($label,$type)=split(/\:/,$rule); + if ($type eq 'vector') { + return &vectorcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval); + } elsif ($type eq 'sum') { + return &sumcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval); + } elsif ($type eq 'custom') { + return &customcheck($rule,$safeeval); + } +} + +sub vectorcheck { + my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_; + my ($label,$type,$id,$vector, + $attachpoint,$notattachpoint, + $tailpoint,$tippoint,$nottailpoint,$nottippoint, + $length,$angle,$lengtherror,$angleerror)=split(/\:/,$rule); + &addlog("Vector Rule $label for vector ".$vector); + if ($length ne '') { + &addlog("Checking for length $length with error $lengtherror"); + $length=&Apache::run::run($length,$safeeval); + &addlog("Length evaluated to $length"); + my $thislength=&plotvectorlength($id,$vector); + &addlog("Found length $thislength"); + if (abs($thislength-$length)>$lengtherror) { + &setfailed($label); + return 0; + } + } + if ($angle ne '') { + &addlog("Checking for angle $angle with error $angleerror"); + $angle=&Apache::run::run($angle,$safeeval); + &addlog("Angle evaluated to $angle"); + my $thisangle=&plotvectorangle($id,$vector); + &addlog("Found angle $thisangle"); + my $anglediff=abs($thisangle-$angle); + &addlog("Angle difference: $anglediff"); + if ($anglediff>360.-$anglediff) { + $anglediff=360.-$anglediff; + } + &addlog("Smallest angle difference: $anglediff"); + if ($anglediff>$angleerror) { + &setfailed($label); + return 0; + } + } + if ($attachpoint ne '') { + &addlog("Checking attached: ".$attachpoint); + my ($tail,$tip)=&attached($id,$vector,$attachpoint,$xmin,$xmax,$ymin,$ymax); + unless ($tail || $tip) { + &setfailed($label); + return 0; + } + } + if ($notattachpoint ne '') { + &addlog("Checking not attached: ".$notattachpoint); + my ($tail,$tip)=&attached($id,$vector,$notattachpoint,$xmin,$xmax,$ymin,$ymax); + if ($tail || $tip) { + &setfailed($label); + return 0; + } + } + if ($tailpoint ne '') { + &addlog("Checking tail: ".$tailpoint); + my ($tail,$tip)=&attached($id,$vector,$tailpoint,$xmin,$xmax,$ymin,$ymax); + unless ($tail) { + &setfailed($label); + return 0; + } + } + if ($nottailpoint ne '') { + &addlog("Checking not tail: ".$nottailpoint); + my ($tail,$tip)=&attached($id,$vector,$nottailpoint,$xmin,$xmax,$ymin,$ymax); + if ($tail) { + &setfailed($label); + return 0; + } + } + if ($tippoint ne '') { + &addlog("Checking tip: ".$tippoint); + my ($tail,$tip)=&attached($id,$vector,$tippoint,$xmin,$xmax,$ymin,$ymax); + unless ($tip) { + &setfailed($label); + return 0; + } + } + if ($nottippoint ne '') { + &addlog("Checking not tip: ".$nottippoint); + my ($tail,$tip)=&attached($id,$vector,$nottippoint,$xmin,$xmax,$ymin,$ymax); + if ($tip) { + &setfailed($label); + return 0; + } + } + + &addlog("Rule $label passed."); + return 1; +} + +sub sumcheck { + my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_; + my ($label,$type,$id,$vectors,$length,$angle,$lengtherror,$angleerror)=split(/\:/,$rule); + &addlog("Vector Sum Rule $label for vectors ".$vectors); + my $sumx=0; + my $sumy=0; + foreach my $sv (split(/\s*\,\s*/,$vectors)) { + my ($rx,$ry)=&relvector(&vectorcoords($id,$sv)); + $sumx+=$rx; + $sumy+=$ry; + } + &addlog("Sum vector ($sumx,$sumy)"); + if ($length ne '') { + &addlog("Checking length $length with error $lengtherror"); + $length=&Apache::run::run($length,$safeeval); + &addlog("Evaluated to $length"); + my $thislength=&vectorlength($sumx,$sumy); + &addlog("Actual length $thislength"); + if (abs($length-$thislength)>$lengtherror) { + &setfailed($label); + return 0; + } + } + if ($angle ne '') { + &addlog("Checking angle $angle with error $angleerror"); + $angle=&Apache::run::run($angle,$safeeval); + &addlog("Evaluated to $angle"); + my $thisangle=&vectorangle($sumx,$sumy); + &addlog("Actual angle $thisangle"); + my $anglediff=abs($thisangle-$angle); + &addlog("Angle difference: $anglediff"); + if ($anglediff>360.-$anglediff) { + $anglediff=360.-$anglediff; + } + &addlog("Smallest angle difference: $anglediff"); + if ($anglediff>$angleerror) { + &setfailed($label); + return 0; + } + } + &addlog("Rule $label passed."); + return 1; +} + +sub customcheck { + my ($rule,$safeeval)=@_; + my ($label,$type,$prg)=split(/\:/,$rule); + &addlog("Custom Rule ".$label); + my $result=&Apache::run::run(&unescape($prg),$safeeval); + &addlog("Algorithm returned $result"); + unless ($result) { + &setfailed($label); + return 0; + } + &addlog("Rule $label passed."); + return 1; +} + +# +# Evaluate a functionplotrule +# + 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,$safeeval)=@_; + + 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"); +# +# Evaluate the value +# + if ($value=~/\D/) { + $Apache::functionplotresponse::fpr_xmin=$xmin; + $Apache::functionplotresponse::fpr_xmax=$xmax; + $value=&Apache::run::run($value,$safeeval); + &addlog("Value evaluated to $value"); + } +# +# Minimum and maximum lengths of the interval +# + if ((defined($minimumlength)) || (defined($maximumlength))) { + &addlog("Minimumlength $minimumlength Maximumlength $maximumlength"); + } my $li=0; my $lh=400; @@ -821,13 +1727,15 @@ sub functionplotrulecheck { } # 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})) { - $lh=$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}; + &addlog("Using upper label $xfinallabel"); + $lh=$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}-1; } else { $lh=&array_index($xmin,$xmax,$xfinal); } @@ -835,95 +1743,164 @@ sub functionplotrulecheck { # Basic sanity checks if ($li<0) { $li=0; } if ($lh>400) { $lh=400; } - if ($li>$lh) { + if (($li>$lh) || (!defined($lh))) { $lh=$li; } -# &Apache::lonnet::logthis("Init $xinitial=$li Final $xfinal=$lh Findupper: $findupper"); - my $tol=$tolfunc; - if ($derivative==2) { - $tol=$told2fdx2; - } elsif ($derivative==1) { - $tol=$toldfdx; + &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.; + } } - for (my $i=$li; $i<=$lh; $i++) { + 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."); + &setfailed($label); + 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)) { -# &Apache::lonnet::logthis("Condition false $findupper at $i with $val"); + &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; -# &Apache::lonnet::logthis("Setting $xfinallabel to $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; } -sub end_functionplotresponse { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - &Apache::response::end_response; +# +# check for minimum and maximum lengths +# - my $result; - my $id=$Apache::inputtags::response[-1]; - my $partid=$Apache::inputtags::part; - my $internalid = $partid.'_'.$id; +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; +} - if ($target eq 'edit') { $result=&Apache::edit::end_table(); } - if ($target eq 'grade' - && &Apache::response::submitted() - && $Apache::lonhomework::type eq 'exam') { +sub setfailed { + my ($hintlabel)=@_; + $hintlabel=~s/^R//; + push(@Apache::functionplotresponse::failedrules,$hintlabel); + &addlog("Set hint condition $hintlabel"); +} - &Apache::response::scored_response($partid,$id); +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"; + } +} - } elsif ($target eq 'grade' +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') { - my ($response,%coords)=&get_answer_from_form_fields($internalid); - $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; - my %previous=&Apache::response::check_for_previous($response,$partid,$id); # # Actually 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 $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 $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 ($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') { + if (&populate_arrays($internalid,$xmin,$xmax,$ymin,$ymax) 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,$tolfunc,$toldfdx,$told2fdx2)) { + unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)) { + $ad='INCORRECT'; + last; + } + } +# And now go through the vector rules + foreach my $rule (@Apache::functionplotresponse::functionplotvectorrules) { + unless (&functionplotvectorrulecheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)) { $ad='INCORRECT'; last; } @@ -931,16 +1908,88 @@ sub end_functionplotresponse { # 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; + + 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(); } + if ($target eq 'grade' + && &Apache::response::submitted() + && $Apache::lonhomework::type eq 'exam') { + &Apache::response::scored_response($partid,$id); + + } elsif ($target eq 'grade' + && &Apache::response::submitted() + && $Apache::lonhomework::type ne 'exam') { + my ($response,%coords)=&get_answer_from_form_fields($internalid); + $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; + my %previous=&Apache::response::check_for_previous($response,$partid,$id); +# +# Assign grade +# + 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 @components=split(/\s*\:\s*/,$plot); + if ($#components<3) { +# Just a simple plot + my ($func,$xl,$xh)=@components; + if ((!defined($xl)) || ($xl eq '')) { $xl=$xmin; } + if ((!defined($xh)) || ($xh eq '')) { $xh=$xmax; } + $result.=&plot_script($internalid,$func,1,'','00aa00',$xl,$xh,6); + } else { +# This is a spline + $result.=&answer_spline_script($internalid,@components); + } + } + } + } + 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(); @@ -964,6 +2013,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;