--- loncom/homework/functionplotresponse.pm 2011/11/21 21:45:32 1.84
+++ loncom/homework/functionplotresponse.pm 2011/11/24 15:43:08 1.87
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# Functionplot responses
#
-# $Id: functionplotresponse.pm,v 1.84 2011/11/21 21:45:32 www Exp $
+# $Id: functionplotresponse.pm,v 1.87 2011/11/24 15:43:08 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'));
}
@@ -780,39 +783,17 @@ sub start_functionplotvectorrule {
$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);
- my $tippoint=&Apache::lonxml::get_param('tippoint',$parstack,$safeeval);
- $tippoint=~s/\W//gs;
- $tippoint=ucfirst($tippoint);
-
- my $nottailpoint=&Apache::lonxml::get_param('nottailpoint',$parstack,$safeeval);
- $nottailpoint=~s/\W//gs;
- $nottailpoint=ucfirst($nottailpoint);
- my $nottippoint=&Apache::lonxml::get_param('nottippoint',$parstack,$safeeval);
- $nottippoint=~s/\W//gs;
- $nottippoint=ucfirst($nottippoint);
-
push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
$label,
'vector',
$internalid,
$vector,
- $attachpoint,
- $notattachpoint,
- $tailpoint,
- $tippoint,
- $nottailpoint,
- $nottippoint,
+ &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),
@@ -847,12 +828,6 @@ sub start_functionplotvectorrule {
&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')});
- $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','attachpoint','notattachpoint',
'tailpoint','tippoint','nottailpoint','nottipoint',
@@ -920,13 +895,12 @@ sub start_functionplotvectorsumrule {
&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 +915,65 @@ sub end_functionplotvectorsumrule {
}
#
+#
+#
+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
@@ -1409,16 +1442,27 @@ sub objectcoords {
}
sub attached {
- my ($id,$vector,$object,$xmin,$xmax,$ymin,$ymax)=@_;
+ my ($id,$vector,$objects,$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; }
+ 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);
}
@@ -1462,6 +1506,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);
}
}
@@ -1595,6 +1641,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;
}
#