--- loncom/homework/functionplotresponse.pm 2011/11/20 00:34:52 1.78 +++ loncom/homework/functionplotresponse.pm 2011/11/21 20:20:48 1.82 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # Functionplot responses # -# $Id: functionplotresponse.pm,v 1.78 2011/11/20 00:34:52 www Exp $ +# $Id: functionplotresponse.pm,v 1.82 2011/11/21 20:20:48 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -654,10 +654,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 @@ -768,12 +764,9 @@ sub start_functionplotvectorrule { } $label=~s/\W//gs; unless ($label) { - $label='V'.$Apache::functionplotresponse::counter; + $label='R'.$Apache::functionplotresponse::counter; } else { - $label='V'.$label; - } - if ($Apache::functionplotresponse::splineorder{$label}) { - &Apache::lonxml::error(&mt('Rule indices must be unique.')); + $label='R'.$label; } if ($target eq 'grade') { @@ -822,8 +815,8 @@ sub start_functionplotvectorrule { $nottippoint, &Apache::lonxml::get_param('length',$parstack,$safeeval), &Apache::lonxml::get_param('angle',$parstack,$safeeval), - &Apache::lonxml::get_param('lengthpercenterror',$parstack,$safeeval), - &Apache::lonxml::get_param('anglepercenterror',$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'). @@ -847,9 +840,9 @@ sub start_functionplotvectorrule { $token,'16'). &Apache::edit::text_arg('Angle:','angle', $token,'16'). - &Apache::edit::text_arg('Percent error length:','lengthpercenterror', + &Apache::edit::text_arg('Absolute error length:','lengtherror', $token,'8'). - &Apache::edit::text_arg('Percent error angle:','anglepercenterror', + &Apache::edit::text_arg('Absolute error angle:','angleerror', $token,'8'). &Apache::edit::end_row(); } elsif ($target eq 'modified') { @@ -864,7 +857,7 @@ sub start_functionplotvectorrule { $safeeval,'index','vector','attachpoint','notattachpoint', 'tailpoint','tippoint','nottailpoint','nottipoint', 'length','angle', - 'lengthpercenterror','anglepercenterror'); + 'lengtherror','angleerror'); if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } } return $result; @@ -892,55 +885,47 @@ sub start_functionplotvectorsumrule { } $label=~s/\W//gs; unless ($label) { - $label='V'.$Apache::functionplotresponse::counter; + $label='R'.$Apache::functionplotresponse::counter; } else { - $label='V'.$label; - } - if ($Apache::functionplotresponse::splineorder{$label}) { - &Apache::lonxml::error(&mt('Rule indices must be unique.')); + $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 $object=&Apache::lonxml::get_param('object',$parstack,$safeeval); - $object=~s/\W//gs; - $object=ucfirst($object); + my $vectors=&Apache::lonxml::get_param('vectors',$parstack,$safeeval); push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( $label, 'sum', $internalid, - $object, + $vectors, &Apache::lonxml::get_param('length',$parstack,$safeeval), &Apache::lonxml::get_param('angle',$parstack,$safeeval), - &Apache::lonxml::get_param('lengthpercenterror',$parstack,$safeeval), - &Apache::lonxml::get_param('lengthabserror',$parstack,$safeeval), - &Apache::lonxml::get_param('anglepercenterror',$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('Vectors attached to object:','object', - $token,'16').'
'. + &Apache::edit::text_arg('Comma-separated list of vectors:','vectors', + $token,'30').'
'. &Apache::edit::text_arg('Sum vector length:','length', $token,'16'). &Apache::edit::text_arg('Sum vector angle:','angle', $token,'16'). - &Apache::edit::text_arg('Percent error length:','lengthpercenterror', - $token,'8'). - &Apache::edit::text_arg('Absolute error length:','lengthabserror', + &Apache::edit::text_arg('Error length:','lengtherror', $token,'8'). - &Apache::edit::text_arg('Percent error angle:','anglepercenterror', + &Apache::edit::text_arg('Error angle:','angleerror', $token,'8'). &Apache::edit::end_row(); } elsif ($target eq 'modified') { $env{'form.'.&Apache::edit::html_element_name('object')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('object')}); my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'index','object', + $safeeval,'index','vectors', 'length','angle', - 'lengthpercenterror','lengthabserror','anglepercenterror'); + ,'lengtherror','angleerror'); if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } } return $result; @@ -1385,6 +1370,22 @@ sub objectcoords { 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)=@_; @@ -1432,15 +1433,103 @@ sub vectorcheck { my ($label,$type,$id,$vector, $attachpoint,$notattachpoint, $tailpoint,$tippoint,$nottailpoint,$nottippoint, - $length,$angle,$lengthpercenterror,$anglepercenterror)=split(/\:/,$rule); + $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,$object,$length,$angle,$lengthpercenterror,$lengthabserror,$anglepercenterror)=split(/\:/,$rule); - &addlog("Vector Sum Rule $label for vectors attached to ".$object); + 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)"); + &addlog("Rule $label passed."); + return 1; } # @@ -1542,10 +1631,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 { @@ -1611,8 +1697,7 @@ sub checklength { } sub setfailed { - my ($label)=@_; - my $hintlabel=$label; + my ($hintlabel)=@_; $hintlabel=~s/^R//; push(@Apache::functionplotresponse::failedrules,$hintlabel); &addlog("Set hint condition $hintlabel");