--- loncom/homework/functionplotresponse.pm 2010/11/24 02:53:13 1.47 +++ loncom/homework/functionplotresponse.pm 2011/03/31 16:10:07 1.57 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: functionplotresponse.pm,v 1.47 2010/11/24 02:53:13 www Exp $ +# $Id: functionplotresponse.pm,v 1.57 2011/03/31 16:10:07 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,7 +61,7 @@ sub geogebra_endcode { # sub geogebra_spline_program { return (< + ENDSPLINEPROGRAM } @@ -75,7 +75,7 @@ sub geogebra_default_parameters { - + @@ -108,7 +108,7 @@ sub init_script { $script.="if (param=='applet_$id') { loaded_$id=true; }\n"; } $script.="if (".join(' && ',map { "loaded_$_" } (@Apache::functionplotresponse::callscripts)). - ") { setTimeout('ggbInitAll()',20) }"; + ") { setTimeout('ggbInitAll()',200) }"; my $calls=join("\n",map { "ggbInit_$_();" } (@Apache::functionplotresponse::callscripts)); return (< @@ -161,9 +161,11 @@ 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*':''); return (<'.&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() @@ -939,6 +950,9 @@ sub functionplotrulecheck { $percent=($percent>0?$percent:5); &addlog("================="); &addlog("Rule $label for ".($derivative<0?'integral':('function itself','first derivative','second derivative')[$derivative])." $relationship $value"); + if ((defined($minimumlength)) || (defined($maximumlength))) { + &addlog("Minimumlength $minimumlength Maximumlength $maximumlength"); + } my $li=0; my $lh=400; @@ -1033,38 +1047,59 @@ 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 ($label)=@_; + my $hintlabel=$label; + $hintlabel=~s/^R//; + push(@Apache::functionplotresponse::failedrules,$hintlabel); + &addlog("Set hint condition $hintlabel"); +} + sub start_functionplotruleset { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; if ($target eq 'edit') { @@ -1072,7 +1107,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() @@ -1190,10 +1226,11 @@ sub end_functionplotelements { } } } - + 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(); @@ -1249,7 +1286,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()