--- loncom/homework/functionplotresponse.pm 2010/11/24 02:53:13 1.47 +++ loncom/homework/functionplotresponse.pm 2012/02/28 22:42:31 1.93 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA -# option list style responses +# Functionplot responses # -# $Id: functionplotresponse.pm,v 1.47 2010/11/24 02:53:13 www Exp $ +# $Id: functionplotresponse.pm,v 1.93 2012/02/28 22:42:31 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,9 +31,15 @@ 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', + 'plotobject','plotvector', + 'functionplotvectorrule','functionplotvectorsumrule', + 'drawvectorsum', + 'functionplotcustomrule', 'functionplotrule','functionplotruleset', 'functionplotelements')); } @@ -44,10 +50,14 @@ BEGIN { # sub geogebra_startcode { - my ($id)=@_; + my ($id,$width,$height)=@_; + $width=int(1.*$width); + $height=int(1.*$height); + unless ($width) { $width=700; } + unless ($height) { $height=400; } return (< + codebase="/adm/geogebra/" width="$width" height="$height" MAYSCRIPT> ENDSTARTCODE } @@ -61,7 +71,7 @@ sub geogebra_endcode { # sub geogebra_spline_program { return (< + ENDSPLINEPROGRAM } @@ -74,8 +84,8 @@ sub geogebra_default_parameters { - - + + @@ -108,7 +118,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 (< @@ -161,9 +171,19 @@ sub update_register { # Set a point coordinate variable # sub set_point_coordinate { - my ($id,$variable,$x,$y)=@_; + 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 (<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; +} + +# # Subroutine that generates code for spline $label based on stored information # sub generate_spline { - my ($id,$label,$xmin,$xmax,$ymin,$ymax)=@_; + my ($id,$label,$xmin,$xmax,$ymin,$ymax,$fixed)=@_; my $result=''; my $order=$Apache::functionplotresponse::splineorder{$label}; my $x=$Apache::functionplotresponse::splineinitx{$label}; @@ -375,17 +477,199 @@ sub generate_spline { my $sy=$Apache::functionplotresponse::splinescaley{$label}; my @coords=(); foreach my $i (1..$order) { - $result.=&new_point_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_slope_coordinate($id,$label.'S'.$i,$x,$y+$sy,$label.'P'.$i,$xp,$y,$xmin,$xmax,$ymin,$ymax); + $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; } + my $fixed=0; + if ((&Apache::response::show_answer()) || (&Apache::response::check_status()>=2)) { $fixed=1; } + $result.=&plotvector_script($internalid,$label,$tailx,$taily,$tipx,$tipy,$xmin,$xmax,$fixed); + } 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; +} + + +# +# Vector sum - have GeoGebra draw a sum of specified vectors to help students draw +# + +sub start_drawvectorsum { + 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 $vectorlist=&Apache::lonxml::get_param('vectorlist',$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($vectorlist)) { $vectorlist=''; } + my @vectors=split(/\,/,$vectorlist); + if ($#vectors>0) { + my @sumx=(); + my @sumy=(); + foreach my $thisvector (@vectors) { + $thisvector=~s/\W//gs; + $thisvector=ucfirst($thisvector); + unless ($thisvector) { next; } + my $vectorx=$thisvector.'X'; + my $vectory=$thisvector.'Y'; + $result.=(<'. + &Apache::edit::text_arg('Vector List:','vectorlist', + $token,'40'). + &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','vectorlist'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + + +sub end_drawvectorsum { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; +} + + + # # # @@ -457,10 +741,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 @@ -497,7 +777,7 @@ sub start_functionplotrule { &Apache::lonxml::get_param('percenterror',$parstack,$safeeval) ))); } elsif ($target eq 'edit') { - $result=&Apache::edit::tag_start($target,$token,'Function Plot Evaluation Rule'). + $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', @@ -527,11 +807,17 @@ 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,'8'). + [['undef','not defined']],$token,'30'). &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', @@ -553,6 +839,225 @@ 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); + + push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( + $label, + 'vector', + $internalid, + $vector, + &Apache::lonxml::get_param('attachpoint',$parstack,$safeeval), + &Apache::lonxml::get_param('notattachpoint',$parstack,$safeeval), + &Apache::lonxml::get_param('tailpoint',$parstack,$safeeval), + &Apache::lonxml::get_param('tippoint',$parstack,$safeeval), + &Apache::lonxml::get_param('nottailpoint',$parstack,$safeeval), + &Apache::lonxml::get_param('nottippoint',$parstack,$safeeval), + &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')}); + 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 @@ -709,7 +1214,7 @@ 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; @@ -737,12 +1242,19 @@ sub populate_arrays { 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; @@ -786,6 +1298,7 @@ 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; @@ -812,13 +1325,18 @@ sub start_functionplotresponse { .''.&mt('Function Plot Question').'' .''.&mt('Delete?').' ' .&Apache::edit::deletelist($target,$token).'   ' - .&Apache::edit::insertlist($target,$token) + .&Apache::edit::insertlist($target,$token).'   ' + .&Apache::loncommon::help_open_topic('Function_Plot_Response_Question','Function Plot Responses') .'' ." " .&Apache::edit::end_row() .&Apache::edit::start_spanning_row() ."\n"; - $result.=&Apache::edit::text_arg('Label x-axis:','xlabel', + $result.=&Apache::edit::text_arg('Width (pixels):','width', + $token,'6').' '. + &Apache::edit::text_arg('Height (pixels):','height', + $token,'6').'
'. + &Apache::edit::text_arg('Label x-axis:','xlabel', $token,'6').' '. &Apache::edit::text_arg('Minimum x-value:','xmin', $token,'4').' '. @@ -836,13 +1354,12 @@ sub start_functionplotresponse { ['yes','no'],$token).'
'. &Apache::edit::select_arg('Grid visible:','gridvisible', ['yes','no'],$token).'
'. - &Apache::edit::text_arg('Background plot(s) for answer (function:xmin:xmax,function:xmin:xmax,...):', - 'answerdisplay',$token,'50'); - + &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', + $safeeval,'width','height','xlabel','xmin','xmax','ylabel','ymin','ymax', 'xaxisvisible','yaxisvisible','gridvisible','answerdisplay'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } @@ -852,27 +1369,16 @@ sub start_functionplotresponse { ($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); - } - + &Apache::lonxml::add_script_result( + &Apache::loncommon::modal_adhoc_window($function_name,700,500, + '
'.$Apache::functionplotresponse::ruleslog.'
', + &mt('Rules Log'))."
"); + } return $result; } @@ -923,6 +1429,7 @@ sub compare_rel { sub addlog { my ($text)=@_; + $text=~s/\'/\\\'/g; $Apache::functionplotresponse::ruleslog.=$text.'
'; } @@ -930,15 +1437,331 @@ 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,$objects,$xmin,$xmax,$ymin,$ymax)=@_; + my ($xs,$xe,$ys,$ye)=&vectorcoords($id,$vector); + my $tolx=($xmax-$xmin)/100.; + my $toly=($ymax-$ymin)/100.; + my $tail=0; + my $tip=0; + foreach my $obj (split(/\s*\,\s*/,$objects)) { + $obj=~s/\W//g; + unless ($obj) { next; } + $obj=ucfirst($obj); + my ($xo,$yo)=&objectcoords($id,$obj); + &addlog("Proximity $vector ($xs,$ys)-($xe,$ye) to $obj ($xo,$yo)"); + if ((abs($xs-$xo)<$tolx) && (abs($ys-$yo)<$toly)) { + $tail=1; + &addlog("Attached tail: $obj"); + } + if ((abs($xe-$xo)<$tolx) && (abs($ye-$yo)<$toly)) { + $tip=1; + &addlog("Attached tip: $obj"); + } + } + &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,$ymin,$ymax)=@_; + 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/) && ($value ne 'undef')) { + $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; @@ -1010,10 +1833,7 @@ sub functionplotrulecheck { 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"); + &setfailed($label); return 0; } } else { @@ -1033,38 +1853,58 @@ sub functionplotrulecheck { &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 for minimum and maximum lengths - 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"); - return 0; - } - } - if ($maximumlength) { - if ($length>$maximumlength) { - &addlog("Rule $label failed, actual length $length, maximum length $maximumlength"); - return 0; - } - } +# 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."); - my $hintlabel=$label; - $hintlabel=~s/^R//; - push(@Apache::functionplotresponse::failedrules,$hintlabel); - &addlog("Set hint condition $hintlabel"); + &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 ($hintlabel)=@_; + $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') { @@ -1072,7 +1912,8 @@ sub start_functionplotruleset { ''.&mt('Function Plot Rule Set').'' .''.&mt('Delete?').' ' .&Apache::edit::deletelist($target,$token).'   '. - &Apache::edit::insertlist($target,$token) + &Apache::edit::insertlist($target,$token).'   ' + .&Apache::loncommon::help_open_topic('Function_Plot_Response_Rule_Set','Function Plot Rules') .'' ." " .&Apache::edit::end_row() @@ -1102,7 +1943,7 @@ sub end_functionplotruleset { $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 ". @@ -1112,7 +1953,14 @@ sub end_functionplotruleset { # 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)) { + 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; } @@ -1183,17 +2031,25 @@ sub end_functionplotelements { 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 @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,$xmin,$xmax,$ymin,$ymax); + $result.=&generate_spline($internalid,$label,$xmin,$xmax,$ymin,$ymax,$fixed); } # close the init script $result.=&end_init_script(); @@ -1207,7 +2063,9 @@ sub end_functionplotelements { # generate the input fields $result.=$Apache::functionplotresponse::inputfields; # actually start the -tag - $result.=&geogebra_startcode($internalid); + $result.=&geogebra_startcode($internalid, + &Apache::lonxml::get_param('width',$parstack,$safeeval,-2), + &Apache::lonxml::get_param('height',$parstack,$safeeval,-2)); # load the spline bytecode $result.=&geogebra_spline_program(); # set default parameters @@ -1249,7 +2107,8 @@ sub start_functionplotelements { ''.&mt('Function Plot Elements').'' .''.&mt('Delete?').' ' .&Apache::edit::deletelist($target,$token).'   '. - &Apache::edit::insertlist($target,$token) + &Apache::edit::insertlist($target,$token).'   ' + .&Apache::loncommon::help_open_topic('Function_Plot_Response_Elements','Function Plot Elements') .'' ." " .&Apache::edit::end_row()