--- loncom/homework/functionplotresponse.pm 2010/10/09 20:02:02 1.11
+++ loncom/homework/functionplotresponse.pm 2010/10/30 23:43:29 1.20
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: functionplotresponse.pm,v 1.11 2010/10/09 20:02:02 www Exp $
+# $Id: functionplotresponse.pm,v 1.20 2010/10/30 23:43:29 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@ use Apache::lonlocal;
use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline'));
+ &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','splinerule'));
}
#
@@ -101,12 +101,25 @@ ENDDEFAULTPARAMETERS
#
sub init_script {
- if ($Apache::functionplotresponse::callscripts) {
+ if ($#Apache::functionplotresponse::callscripts>=0) {
+ my $script='';
+ foreach my $id (@Apache::functionplotresponse::callscripts) {
+ $script.="if (param=='applet_$id') { loaded_$id=true; }\n";
+ }
+ $script.="if (".join(' && ',map { "loaded_$_" } (@Apache::functionplotresponse::callscripts)).
+ ") { setTimeout('ggbInitAll()',20) }";
+ my $calls=join("\n",map { "ggbInit_$_();" } (@Apache::functionplotresponse::callscripts));
return (<<ENDGGBINIT);
<script type="text/javascript">
// <![CDATA[
+// Function that each applet will call when loaded
+// It will pass "its" parameter
+// Set flags for when an applet is loaded, wait till all are loaded, and then some
function ggbOnInit(param) {
-$Apache::functionplotresponse::callscripts
+$script
+}
+function ggbInitAll() {
+$calls
}
// ]]>
</script>
@@ -194,14 +207,16 @@ sub new_coordinate {
#
sub start_init_script {
my ($id)=@_;
-# Add a line to ggbOnInit-function which calls the right function based on parameter passed from GeoGebra
- $Apache::functionplotresponse::callscripts.="if (param=='applet_$id') { ggbInit_$id(); }\n";
+# Add id to the list of ggbInit_$id functions that need to be called
+ push(@Apache::functionplotresponse::callscripts,$id);
# ... and open this function
return (<<ENDSTARTINIT);
<script type="text/javascript">
// <![CDATA[
// variable that will eventually be passed back to the server
var coordinateMap_$id = [];
+// flag for not loaded yet
+var loaded_$id=false;
// Init-function for applet
function ggbInit_$id() {
ENDSTARTINIT
@@ -224,10 +239,33 @@ sub axes_script {
ENDAXESSCRIPT
}
+sub axes_label {
+ my ($id,$xlabel,$ylabel)=@_;
+ unless ($xlabel || $ylabel) { return ''; }
+ my $return='document.ggbApplet_'.$id.'.evalCommand("topRight=Corner[3]");';
+ if ($xlabel) {
+ $return.=(<<ENDXAXISLABELSCRIPT);
+document.ggbApplet_$id.evalCommand("Xlabel=(x(topRight)-AxisStepX[],AxisStepY[]/6)");
+document.ggbApplet_$id.setVisible("Xlabel",false);
+document.ggbApplet_$id.evalCommand("Text[\\"$xlabel\\", Xlabel]");
+ENDXAXISLABELSCRIPT
+ }
+ if ($ylabel) {
+ $return.=(<<ENDYAXISLABELSCRIPT);
+document.ggbApplet_$id.evalCommand("Ylabel=(AxisStepX[]/6,y(topRight)-AxisStepY[]/3)");
+document.ggbApplet_$id.setVisible("Ylabel",false);
+document.ggbApplet_$id.evalCommand("Text[\\"$ylabel\\", Ylabel]");
+ENDYAXISLABELSCRIPT
+ }
+ return $return;
+}
+
sub plot_script {
my ($id,$function,$fixed)=@_;
if ($fixed) {
# Use stupid trick to nail this to a location
+# Oddly, it seems like only one plot cannot be nailed to a location
+# Non-nailed-down plots apparently get overwritten
return (<<ENDPLOTSCRIPT);
document.ggbApplet_$id.evalCommand("a=1");
document.ggbApplet_$id.setVisible("a",false);
@@ -276,14 +314,54 @@ sub start_backgroundplot {
unless ($function) { $function="0"; }
if ($target eq 'web') {
$result.=&plot_script($internalid,$function,$fixed);
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token,'Background Function Plot').
+ &Apache::edit::text_arg('Function:','function',
+ $token,'16').
+ &Apache::edit::select_arg('Fixed location:','fixed',
+ ['yes','no'],$token).
+ &Apache::edit::end_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'function','fixed');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
+
+sub end_backgroundplot {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
return $result;
}
-sub end_backgroundplot {
- return '';
+#
+# <splinerule ... />
+#
+sub start_splinerule {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
+ if ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token,'Spline Evaluation Rule').
+ &Apache::edit::end_row();
+ }
+ return $result;
}
+sub end_splinerule {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+
#
# <spline label="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." />
#
@@ -291,36 +369,70 @@ sub end_backgroundplot {
#
sub start_spline {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
- $Apache::functionplotresponse::counter++;
- $label=~s/\W//gs;
- unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
-
- my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
- if ($order<2) { $order=2; }
- if ($order>8) { $order=8; }
- $Apache::functionplotresponse::splineorder{$label}=$order;
-
- my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval);
- unless ($x) { $x=0; }
- $Apache::functionplotresponse::splineinitx{$label}=$x;
-
- my $y=&Apache::lonxml::get_param('inity',$parstack,$safeeval);
- unless ($y) { $y=0; }
- $Apache::functionplotresponse::splineinity{$label}=$y;
-
- my $sx=&Apache::lonxml::get_param('scalex',$parstack,$safeeval);
- unless ($sx) { $sx=$order; }
- $Apache::functionplotresponse::splinescalex{$label}=$sx;
-
- my $sy=&Apache::lonxml::get_param('scaley',$parstack,$safeeval);
- unless ($sy) { $sy=2; }
- $Apache::functionplotresponse::splinescaley{$label}=$sy;
- return '';
+ my $result='';
+ if ($target eq 'web') {
+ my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
+ $Apache::functionplotresponse::counter++;
+ if ($label=~/\W/) {
+ &Apache::lonxml::warning(&mt('Spline labels should only contain alphanumeric characters.'));
+ }
+ $label=~s/\W//gs;
+ unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
+ if ($Apache::functionplotresponse::splineorder{$label}) {
+ &Apache::lonxml::error(&mt('Spline labels must be unique.'));
+ }
+
+ my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
+ if ($order<2) { $order=2; }
+ if ($order>8) { $order=8; }
+ $Apache::functionplotresponse::splineorder{$label}=$order;
+
+ my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval);
+ unless ($x) { $x=0; }
+ $Apache::functionplotresponse::splineinitx{$label}=$x;
+
+ my $y=&Apache::lonxml::get_param('inity',$parstack,$safeeval);
+ unless ($y) { $y=0; }
+ $Apache::functionplotresponse::splineinity{$label}=$y;
+
+ my $sx=&Apache::lonxml::get_param('scalex',$parstack,$safeeval);
+ unless ($sx) { $sx=$order; }
+ $Apache::functionplotresponse::splinescalex{$label}=$sx;
+
+ my $sy=&Apache::lonxml::get_param('scaley',$parstack,$safeeval);
+ unless ($sy) { $sy=2; }
+ $Apache::functionplotresponse::splinescaley{$label}=$sy;
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token,'Spline').
+ &Apache::edit::text_arg('Label:','label',
+ $token,'4').' '.
+ &Apache::edit::select_arg('Order:','order',
+ ['2','3','4','5','6','7','8','9'],$token).' '.
+ &Apache::edit::text_arg('Initial x-value:','initx',
+ $token,'4').' '.
+ &Apache::edit::text_arg('Initial y-value:','inity',
+ $token,'4').' '.
+ &Apache::edit::text_arg('Scale x:','scalex',
+ $token,'4').' '.
+ &Apache::edit::text_arg('Scale y:','scaley',
+ $token,'4').
+ &Apache::edit::end_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'label','order','initx','inity',
+ 'scalex','scaley');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
}
sub end_spline {
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
}
sub end_init_script {
@@ -356,6 +468,140 @@ sub get_answer_from_form_fields {
return ($answer,%coords);
}
+#
+# The following functions calculate the cubic-hermite splines server-side
+#
+
+sub cubic_hermite {
+ my ($t,$p1,$s1,$p2,$s2)=@_;
+ return (2.*$t*$t*$t-3.*$t*$t+1.)*$p1 + 5.*($t*$t*$t-2.*$t*$t+$t)*($s1-$p1)+
+ (-2.*$t*$t*$t+3.*$t*$t) *$p2 + 5.*($t*$t*$t-$t*$t) *($s2-$p2);
+}
+
+#
+# d/dt(...)
+#
+
+sub ddt_cubic_hermite {
+ my ($t,$p1,$s1,$p2,$s2)=@_;
+ return (6.*$t*$t-6.*$t) *$p1 + 5.*(3.*$t*$t-4.*$t+1.)*($s1-$p1)+
+ (-6.*$t*$t+6.*$t)*$p2 + 5.*(3.*$t*$t-2.*$t) *($s2-$p2);
+}
+
+#
+# d^2/dt^2(...)
+#
+
+sub d2dt2_cubic_hermite {
+ my ($t,$p1,$s1,$p2,$s2)=@_;
+ return (12.*$t-6.) *$p1 + 5.*(6.*$t-4.)*($s1-$p1)+
+ (-12.*$t+6.)*$p2 + 5.*(6.*$t-2.)*($s2-$p2);
+}
+
+#
+# Array index calculation
+#
+sub array_index {
+ my ($xmin,$xmax,$x)=@_;
+ return int(($x-$xmin)/($xmax-$xmin)*200.+0.5);
+}
+
+#
+# Actual x-value of array index
+#
+
+sub index_x {
+ my ($xmin,$xmax,$i)=@_;
+ return $i*($xmax-$xmin)/200.+$xmin;
+}
+
+#
+# Assume function to be linear between array points
+# Return the two indices and the scale factor
+#
+
+sub indices_scale {
+ my ($xmin,$xmax,$x)=@_;
+ my $i=&array_index($xmin,$xmax,$x);
+ my $xr=&index_x($xmin,$xmax,$i);
+ &Apache::lonnet::logthis("x:$x i:$i xr:$xr");
+ if ($xr<$x) {
+# Desired x is right of array index
+ if ($i>=200) { return (200,200,0); }
+ return($i,$i+1,200.*($x-$xr)/($xmax-$xmin));
+ } elsif ($xr>$x) {
+# Desired x is left of array index
+ if ($i<=0) { return (0,0,0); }
+ return($i-1,$i,1.-200.*($xr-$x)/($xmax-$xmin));
+ } else {
+# Desired x is at array index (unlikely, but ...)
+ if ($i>=200) { return (200,200,0); }
+ if ($i<=0) { return (0,0,0); }
+ return ($i,$i,0);
+ }
+}
+
+#
+# Function value
+#
+
+sub func_val {
+ my ($xmin,$xmax,$x)=@_;
+ my ($il,$ih,$factor)=&indices_scale($xmin,$xmax,$x);
+ my $fl=$Apache::functionplotresponse::func[$il];
+ my $fh=$Apache::functionplotresponse::func[$ih];
+ unless (defined($fl) || defined($fh)) { return undef; }
+ unless (defined($fl)) { return $fh; }
+ unless (defined($fh)) { return $fl; }
+ my $func=$fl+$factor*($fh-$fl);
+ &Apache::lonnet::logthis("x:$x func:$func factor:$factor il:$il ih:$ih fil:$fl fih:$fh");
+ return $func;
+}
+
+#
+# Populate the arrays
+#
+
+sub populate_arrays {
+ my ($id,$xmin,$xmax)=@_;
+ for (my $i=0; $i<=200; $i++) {
+ $Apache::functionplotresponse::func[$i]=undef;
+ $Apache::functionplotresponse::dfunddx[$i]=undef;
+ $Apache::functionplotresponse::d2funcd2x[$i]=undef;
+ }
+ unless ($xmax>$xmin) { return 'no_func'; }
+# Run over all splines in response
+ foreach my $label (split(/\,/,$env{"form.HWVAL_AllSplines_$id"})) {
+ my $xiold=-1;
+# Run over all points in spline
+ for (my $i=1; $i<$env{"form.HWVAL_SplineOrder_".$id."_".$label}; $i++) {
+ my $ni=$i+1;
+ my @xparms=($env{'form.HWVAL_'.$id.'_'.$label.'P'.$i.'_x'},
+ $env{'form.HWVAL_'.$id.'_'.$label.'S'.$i.'_x'},
+ $env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_x'},
+ $env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_x'});
+ my @yparms=($env{'form.HWVAL_'.$id.'_'.$label.'P'.$i.'_y'},
+ $env{'form.HWVAL_'.$id.'_'.$label.'S'.$i.'_y'},
+ $env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_y'},
+ $env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_y'});
+# Run in small steps over spline parameter
+ for (my $t=0; $t<=1; $t+=0.00025) {
+ my $xi=&array_index($xmin,$xmax,&cubic_hermite($t,@xparms));
+ if ($xi<$xiold) { return 'no_func'; }
+ if (($xi>$xiold) && ($xi>=0) && ($xi<=200)) {
+ if (defined($Apache::functionplotresponse::func[$xi])) { return 'no_func'; }
+ $xiold=$xi;
+ $Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms);
+ }
+ }
+ }
+ }
+}
+
+#
+# Implentation of <functionplotresponse>
+#
+
sub start_functionplotresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
@@ -379,26 +625,63 @@ sub start_functionplotresponse {
# Parameters of <functionplotresponse>
my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
- $xmin=($xmin?$xmin:-10);
+ $xmin=(defined($xmin)?$xmin:-10);
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
- $xmax=($xmax?$xmax:10);
+ $xmax=(defined($xmax)?$xmax:10);
my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval);
- $ymin=($ymin?$ymin:-10);
+ $ymin=(defined($ymin)?$ymin:-10);
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval);
- $ymax=($ymax?$ymax:10);
+ $ymax=(defined($ymax)?$ymax:10);
my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
+ my $xlabel=&Apache::lonxml::get_param('xlabel',$parstack,$safeeval);
+ my $ylabel=&Apache::lonxml::get_param('ylabel',$parstack,$safeeval);
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::start_table($token)
+ .'<tr><td><span class="LC_nobreak">'.&mt('Function Plot Question').'</span></td>'
+ .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+ .&Apache::edit::deletelist($target,$token)
+ .'</span></td>'
+ ."<td> "
+ .&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row()
+ ."\n";
+ $result.=&Apache::edit::text_arg('Label x-axis:','xlabel',
+ $token,'6').' '.
+ &Apache::edit::text_arg('Minimum x-value:','xmin',
+ $token,'4').' '.
+ &Apache::edit::text_arg('Maximum x-value:','xmax',
+ $token,'4').' '.
+ &Apache::edit::select_arg('x-axis visible:','xaxisvisible',
+ ['yes','no'],$token).' '.
+ &Apache::edit::text_arg('Label y-axis:','ylabel',
+ $token,'6').' '.
+ &Apache::edit::text_arg('Minimum y-value:','ymin',
+ $token,'4').' '.
+ &Apache::edit::text_arg('Maximum y-value:','ymax',
+ $token,'4').' '.
+ &Apache::edit::select_arg('y-axis visible:','yaxisvisible',
+ ['yes','no'],$token).' '.
+ &Apache::edit::select_arg('Grid visible:','gridvisible',
+ ['yes','no'],$token).
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'xlabel','xmin','xmax','ylabel','ymin','ymax',
+ 'xaxisvisible','yaxisvisible','gridvisible');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
- if ($target eq 'meta') {
+ } elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('functionplotresponse');
- } elsif ($target eq 'web') {
+ } elsif ($target eq 'web') {
# paste in the update routine to receive stuff back from the applet
$result.=&update_script($internalid);
# start the initscript for this applet
$result.=&start_init_script($internalid);
# put the axis commands inside
$result.=&axes_script($internalid,$xmin,$xmax,$ymin,$ymax,$xaxisvisible,$yaxisvisible,$gridvisible);
+ $result.=&axes_label($internalid,$xlabel,$ylabel);
# init script is left open
}
return $result;
@@ -413,7 +696,7 @@ sub end_functionplotresponse {
my $partid=$Apache::inputtags::part;
my $internalid = $partid.'_'.$id;
-# if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
if ($target eq 'grade'
&& &Apache::response::submitted()
&& $Apache::lonhomework::type eq 'exam') {
@@ -425,8 +708,45 @@ sub end_functionplotresponse {
&& $Apache::lonhomework::type ne 'exam') {
my ($response,%coords)=&get_answer_from_form_fields($internalid);
$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
- $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='INCORRECT';
+ my %previous=&Apache::response::check_for_previous($response,$partid,$id);
+#
+# Actually grade
+#
+ my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
+ $xmin=(defined($xmin)?$xmin:-10);
+ my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
+ $xmax=(defined($xmax)?$xmax:10);
+ my $ad;
+ if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') {
+ $ad='BAD_FORMULA';
+ } else {
+ $ad='INCORRECT';
+ }
+ &func_val($xmin,$xmax,3.96);
+
+ &func_val($xmin,$xmax,3.965);
+
+ &func_val($xmin,$xmax,3.97);
+ &func_val($xmin,$xmax,3.975);
+ &func_val($xmin,$xmax,3.98);
+
+ &func_val($xmin,$xmax,3.985);
+ &func_val($xmin,$xmax,3.99);
+ &func_val($xmin,$xmax,3.995);
+ &func_val($xmin,$xmax,4);
+ &func_val($xmin,$xmax,4.05);
+ &func_val($xmin,$xmax,4.1);
+
+ &func_val($xmin,$xmax,4.15);
+ &func_val($xmin,$xmax,4.2);
+ &func_val($xmin,$xmax,4.25);
+
+#
+# Store grading info
+#
+ $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+ &Apache::response::handle_previous(\%previous,$ad);
} elsif ($target eq 'web') {
# Now is the time to render all of the stored splines
foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {
@@ -434,6 +754,13 @@ sub end_functionplotresponse {
}
# close the init script
$result.=&end_init_script();
+# register all splines in this response
+ $result.='<input type="hidden" name="HWVAL_AllSplines_'.$internalid.'" value="'.
+ join(',',keys(%Apache::functionplotresponse::splineorder)).'" />'."\n";
+ foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {
+ $result.='<input type="hidden" name="HWVAL_SplineOrder_'.$internalid.'_'.$label.'" value="'.
+ $Apache::functionplotresponse::splineorder{$label}.'" />'."\n";
+ }
# generate the input fields
$result.=$Apache::functionplotresponse::inputfields;
# actually start the <applet>-tag