--- loncom/homework/functionplotresponse.pm 2011/11/19 13:45:36 1.75 +++ loncom/homework/functionplotresponse.pm 2011/11/20 00:34:52 1.78 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # Functionplot responses # -# $Id: functionplotresponse.pm,v 1.75 2011/11/19 13:45:36 www Exp $ +# $Id: functionplotresponse.pm,v 1.78 2011/11/20 00:34:52 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,7 +35,7 @@ use Apache::run; BEGIN { &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline', - 'plotobject','plotvector','functionplotvectorrule', + 'plotobject','plotvector','functionplotvectorrule','functionplotvectorsumrule', 'functionplotrule','functionplotruleset', 'functionplotelements')); } @@ -389,6 +389,7 @@ sub plotobject_script { $Apache::functionplotresponse::counter++; $label='O'.$Apache::functionplotresponse::counter; } + &generate_input_field($id,$label,$x,$y); return "document.ggbApplet_$id.evalCommand('a=1');\n". "document.ggbApplet_$id.setVisible('a', false);\n". "document.ggbApplet_$id.setLabelVisible('a', false);\n". @@ -509,7 +510,7 @@ sub start_plotobject { $token,'8'). &Apache::edit::end_row(); } elsif ($target eq 'modified') { - $env{'form.'.&Apache::edit::html_element_name('label')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('label')}); + $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); } } @@ -564,7 +565,7 @@ sub start_plotvector { &Apache::edit::end_row(); } elsif ($target eq 'modified') { - $env{'form.'.&Apache::edit::html_element_name('label')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('label')}); + $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); } } @@ -777,9 +778,23 @@ sub start_functionplotvectorrule { 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); @@ -796,7 +811,11 @@ sub start_functionplotvectorrule { push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( $label, + 'vector', + $internalid, $vector, + $attachpoint, + $notattachpoint, $tailpoint, $tippoint, $nottailpoint, @@ -812,6 +831,10 @@ sub start_functionplotvectorrule { $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', @@ -830,13 +853,15 @@ sub start_functionplotvectorrule { $token,'8'). &Apache::edit::end_row(); } elsif ($target eq 'modified') { - $env{'form.'.&Apache::edit::html_element_name('vector')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('vector')}); - $env{'form.'.&Apache::edit::html_element_name('tailpoint')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('tailpoint')}); - $env{'form.'.&Apache::edit::html_element_name('tippoint')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('tippoint')}); - $env{'form.'.&Apache::edit::html_element_name('nottailpoint')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('nottailpoint')}); - $env{'form.'.&Apache::edit::html_element_name('nottippoint')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('nottippoint')}); + $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', + $safeeval,'index','vector','attachpoint','notattachpoint', 'tailpoint','tippoint','nottailpoint','nottipoint', 'length','angle', 'lengthpercenterror','anglepercenterror'); @@ -854,7 +879,81 @@ sub end_functionplotvectorrule { 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='V'.$Apache::functionplotresponse::counter; + } else { + $label='V'.$label; + } + if ($Apache::functionplotresponse::splineorder{$label}) { + &Apache::lonxml::error(&mt('Rule indices must be unique.')); + } + if ($target eq 'grade') { +# Simply remember - in order - for later + my $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); + push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( + $label, + 'sum', + $internalid, + $object, + &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), + ))); + } 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('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', + $token,'8'). + &Apache::edit::text_arg('Percent error angle:','anglepercenterror', + $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', + 'length','angle', + 'lengthpercenterror','lengthabserror','anglepercenterror'); + 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; +} # # @@ -1271,6 +1370,82 @@ sub fpr_d2fdx2 { $Apache::functionplotresponse::fpr_xmax, $arg)]; } + + +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 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); + } +} + +sub vectorcheck { + my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_; + my ($label,$type,$id,$vector, + $attachpoint,$notattachpoint, + $tailpoint,$tippoint,$nottailpoint,$nottippoint, + $length,$angle,$lengthpercenterror,$anglepercenterror)=split(/\:/,$rule); + &addlog("Vector Rule $label for vector ".$vector); + +} + +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); +} + +# +# Evaluate a functionplotrule +# sub functionplotrulecheck { my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_; @@ -1495,6 +1670,13 @@ sub end_functionplotruleset { $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; + } } # If it's not wrong, it's correct unless ($ad) { $ad='EXACT_ANS' };