--- loncom/homework/functionplotresponse.pm 2011/11/21 20:48:50 1.83
+++ loncom/homework/functionplotresponse.pm 2011/11/24 13:43:21 1.86
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# Functionplot responses
#
-# $Id: functionplotresponse.pm,v 1.83 2011/11/21 20:48:50 www Exp $
+# $Id: functionplotresponse.pm,v 1.86 2011/11/24 13:43:21 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,10 +32,13 @@ 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',
+ 'plotobject','plotvector',
+ 'functionplotvectorrule','functionplotvectorsumrule',
+ 'functionplotcustomrule',
'functionplotrule','functionplotruleset',
'functionplotelements'));
}
@@ -837,11 +840,11 @@ sub start_functionplotvectorrule {
&Apache::edit::text_arg('Tip not attached to object:','nottippoint',
$token,'16').'<br />'.
&Apache::edit::text_arg('Length:','length',
- $token,'16').
- &Apache::edit::text_arg('Angle:','angle',
- $token,'16').
+ $token,'30').
&Apache::edit::text_arg('Absolute error length:','lengtherror',
- $token,'8').
+ $token,'8').'<br />'.
+ &Apache::edit::text_arg('Angle:','angle',
+ $token,'30').
&Apache::edit::text_arg('Absolute error angle:','angleerror',
$token,'8').
&Apache::edit::end_row();
@@ -912,21 +915,20 @@ sub start_functionplotvectorsumrule {
&Apache::edit::text_arg('Comma-separated list of vectors:','vectors',
$token,'30').'<br />'.
&Apache::edit::text_arg('Sum vector length:','length',
- $token,'16').
+ $token,'30').
+ &Apache::edit::text_arg('Absolute error length:','lengtherror',
+ $token,'8').'<br />'.
&Apache::edit::text_arg('Sum vector angle:','angle',
- $token,'16').
- &Apache::edit::text_arg('Error length:','lengtherror',
- $token,'8').
- &Apache::edit::text_arg('Error angle:','angleerror',
+ $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('object')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('object')});
- my $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'index','vectors',
- 'length','angle',
- ,'lengtherror','angleerror');
- if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ } 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;
}
@@ -941,6 +943,65 @@ sub end_functionplotvectorsumrule {
}
#
+# <functionplotcustom ... />
+#
+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;
+}
+
+
+
+#
# <spline index="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." />
#
# Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them
@@ -1356,6 +1417,43 @@ sub fpr_d2fdx2 {
$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)=@_;
@@ -1379,7 +1477,7 @@ sub attached {
my $toly=($ymax-$ymin)/100.;
my $tail=0;
my $tip=0;
- &addlog("Proximity $vector ($xs,$xe,$ys,$ye) to $object ($xo,$yo)");
+ &addlog("Proximity $vector ($xs,$ys)-($xe,$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");
@@ -1425,6 +1523,8 @@ sub functionplotvectorrulecheck {
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);
}
}
@@ -1558,6 +1658,20 @@ sub sumcheck {
}
&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;
}
#