--- loncom/homework/functionplotresponse.pm 2011/11/18 19:32:48 1.74
+++ loncom/homework/functionplotresponse.pm 2012/02/28 22:42:31 1.93
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# Functionplot responses
#
-# $Id: functionplotresponse.pm,v 1.74 2011/11/18 19:32:48 www Exp $
+# $Id: functionplotresponse.pm,v 1.93 2012/02/28 22:42:31 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,10 +32,14 @@ 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',
+ 'drawvectorsum',
+ 'functionplotcustomrule',
'functionplotrule','functionplotruleset',
'functionplotelements'));
}
@@ -46,10 +50,14 @@ BEGIN {
#
sub geogebra_startcode {
- my ($id)=@_;
+ my ($id,$width,$height)=@_;
+ $width=int(1.*$width);
+ $height=int(1.*$height);
+ unless ($width) { $width=700; }
+ unless ($height) { $height=400; }
return (<<ENDSTARTCODE);
<applet name="ggbApplet_$id" code="geogebra.GeoGebraApplet" archive="geogebra.jar"
- codebase="/adm/geogebra/" width="722" height="447" MAYSCRIPT>
+ codebase="/adm/geogebra/" width="$width" height="$height" MAYSCRIPT>
<param name="java_arguments" value="-Xmx512m -Djnlp.packEnabled=true"/>
ENDSTARTCODE
}
@@ -389,6 +397,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".
@@ -402,7 +411,7 @@ sub plotobject_script {
#
sub plotvector_script {
- my ($id,$label,$xs,$ys,$xe,$ye,$xmin,$xmax)=@_;
+ my ($id,$label,$xs,$ys,$xe,$ye,$xmin,$xmax,$fixed)=@_;
unless ($label) {
$Apache::functionplotresponse::counter++;
$label='V'.$Apache::functionplotresponse::counter;
@@ -413,8 +422,8 @@ sub plotvector_script {
my $pointx=2.*($xmax-$xmin)+$xmax;
my $anglelabel=$label.'Angle';
return
- &new_point_coordinate($id,$startlabel,$xs,$ys,0).
- &new_point_coordinate($id,$endlabel,$xe,$ye,0).
+ &new_point_coordinate($id,$startlabel,$xs,$ys,$fixed).
+ &new_point_coordinate($id,$endlabel,$xe,$ye,$fixed).
(<<ENDVECTOR);
document.ggbApplet_$id.evalCommand("$label=Vector[$startlabel,$endlabel]");
document.ggbApplet_$id.setLabelVisible("$label",true);
@@ -509,6 +518,7 @@ sub start_plotobject {
$token,'8').
&Apache::edit::end_row();
} elsif ($target eq 'modified') {
+ $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); }
}
@@ -547,7 +557,9 @@ sub start_plotvector {
unless (defined($taily)) { $taily=$ymin; }
unless (defined($tipx)) { $tipx=$xmin; }
unless (defined($tipy)) { $tipy=$ymin; }
- $result.=&plotvector_script($internalid,$label,$tailx,$taily,$tipx,$tipy,$xmin,$xmax);
+ my $fixed=0;
+ if ((&Apache::response::show_answer()) || (&Apache::response::check_status()>=2)) { $fixed=1; }
+ $result.=&plotvector_script($internalid,$label,$tailx,$taily,$tipx,$tipy,$xmin,$xmax,$fixed);
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token,'Plot Vector').
&Apache::edit::text_arg('Label on Plot:','label',
@@ -563,6 +575,7 @@ sub start_plotvector {
&Apache::edit::end_row();
} elsif ($target eq 'modified') {
+ $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); }
}
@@ -579,6 +592,83 @@ sub end_plotvector {
}
+#
+# Vector sum - have GeoGebra draw a sum of specified vectors to help students draw
+#
+
+sub start_drawvectorsum {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
+ my $tailx=&Apache::lonxml::get_param('tailx',$parstack,$safeeval);
+ my $taily=&Apache::lonxml::get_param('taily',$parstack,$safeeval);
+ my $vectorlist=&Apache::lonxml::get_param('vectorlist',$parstack,$safeeval);
+ my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
+ $label=~s/\W//gs;
+ $label=ucfirst($label);
+ unless ($label) { $label="NewVector"; }
+ if ($target eq 'web') {
+ my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-3);
+ unless (defined($tailx)) { $tailx=$xmin; }
+ unless (defined($taily)) { $taily=$ymin; }
+ unless (defined($vectorlist)) { $vectorlist=''; }
+ my @vectors=split(/\,/,$vectorlist);
+ if ($#vectors>0) {
+ my @sumx=();
+ my @sumy=();
+ foreach my $thisvector (@vectors) {
+ $thisvector=~s/\W//gs;
+ $thisvector=ucfirst($thisvector);
+ unless ($thisvector) { next; }
+ my $vectorx=$thisvector.'X';
+ my $vectory=$thisvector.'Y';
+ $result.=(<<ENDADDVEC);
+document.ggbApplet_$internalid.evalCommand("$vectorx=x($thisvector)");
+document.ggbApplet_$internalid.evalCommand("$vectory=y($thisvector)");
+document.ggbApplet_$internalid.evalCommand("Include$thisvector$label=Checkbox[]");
+ENDADDVEC
+ push(@sumx,"If[Include$thisvector$label,$vectorx,0]");
+ push(@sumy,"If[Include$thisvector$label,$vectory,0]");
+ }
+ $result.="document.ggbApplet_$internalid.evalCommand(".'"'."xTot$label=".join('+',@sumx).'");'."\n";
+ $result.="document.ggbApplet_$internalid.evalCommand(".'"'."yTot$label=".join('+',@sumy).'");'."\n";
+ $result.=(<<ENDMAKEVECTOR);
+document.ggbApplet_$internalid.evalCommand("$label=Vector[($tailx,$taily),($tailx+xTot$label,$taily+yTot$label)]");
+document.ggbApplet_$internalid.setLabelVisible("$label",true);
+document.ggbApplet_$internalid.setLineThickness("$label",8);
+document.ggbApplet_$internalid.setColor("$label",255,0,0);
+ENDMAKEVECTOR
+ }
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token,'Draw Vector Sum').
+ &Apache::edit::text_arg('Label on Plot:','label',
+ $token,'16').
+ &Apache::edit::text_arg('Tail x:','tailx',
+ $token,'8').
+ &Apache::edit::text_arg('Tail y:','taily',
+ $token,'8').'<br />'.
+ &Apache::edit::text_arg('Vector List:','vectorlist',
+ $token,'40').
+ &Apache::edit::end_row();
+ } elsif ($target eq 'modified') {
+ $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','vectorlist');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
+
+
+sub end_drawvectorsum {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+
#
# <backgroundplot function="..." fixed="yes/no" />
@@ -651,10 +741,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
@@ -691,7 +777,7 @@ sub start_functionplotrule {
&Apache::lonxml::get_param('percenterror',$parstack,$safeeval)
)));
} elsif ($target eq 'edit') {
- $result=&Apache::edit::tag_start($target,$token,'Function Plot Evaluation Rule').
+ $result=&Apache::edit::tag_start($target,$token,'Function Plot Graph Rule').
&Apache::edit::text_arg('Index/Name:','index',
$token,'10').' '.
&Apache::edit::select_arg(&mt('Function:'),'derivativeorder',
@@ -753,6 +839,225 @@ sub end_functionplotrule {
#
+# <functionplotvectorrule ... />
+#
+sub start_functionplotvectorrule {
+ 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;
+ }
+
+ 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);
+
+ push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
+ $label,
+ 'vector',
+ $internalid,
+ $vector,
+ &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),
+ &Apache::lonxml::get_param('angleerror',$parstack,$safeeval),
+ )));
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token,'Function Plot Vector Rule').
+ &Apache::edit::text_arg('Index/Name:','index',
+ $token,'10').' '.
+ &Apache::edit::text_arg('Vector:','vector',
+ $token,'16').'<br />'.
+ &Apache::edit::text_arg('Attached to object:','attachpoint',
+ $token,'16').
+ &Apache::edit::text_arg('Not attached to object:','notattachpoint',
+ $token,'16').'<br />'.
+ &Apache::edit::text_arg('Tail attached to object:','tailpoint',
+ $token,'16').
+ &Apache::edit::text_arg('Tip attached to object:','tippoint',
+ $token,'16').
+ &Apache::edit::text_arg('Tail not attached to object:','nottailpoint',
+ $token,'16').
+ &Apache::edit::text_arg('Tip not attached to object:','nottippoint',
+ $token,'16').'<br />'.
+ &Apache::edit::text_arg('Length:','length',
+ $token,'30').
+ &Apache::edit::text_arg('Absolute error length:','lengtherror',
+ $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();
+ } elsif ($target eq 'modified') {
+ $env{'form.'.&Apache::edit::html_element_name('vector')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('vector')});
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'index','vector','attachpoint','notattachpoint',
+ 'tailpoint','tippoint','nottailpoint','nottipoint',
+ 'length','angle',
+ 'lengtherror','angleerror');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
+
+sub end_functionplotvectorrule {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+#
+# <functionplotvectorsumrule ... />
+#
+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='R'.$Apache::functionplotresponse::counter;
+ } else {
+ $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 $vectors=&Apache::lonxml::get_param('vectors',$parstack,$safeeval);
+ push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
+ $label,
+ 'sum',
+ $internalid,
+ $vectors,
+ &Apache::lonxml::get_param('length',$parstack,$safeeval),
+ &Apache::lonxml::get_param('angle',$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('Comma-separated list of vectors:','vectors',
+ $token,'30').'<br />'.
+ &Apache::edit::text_arg('Sum vector length:','length',
+ $token,'30').
+ &Apache::edit::text_arg('Absolute error length:','lengtherror',
+ $token,'8').'<br />'.
+ &Apache::edit::text_arg('Sum vector angle:','angle',
+ $token,'30').
+ &Apache::edit::text_arg('Absolute error angle:','angleerror',
+ $token,'8').
+ &Apache::edit::end_row();
+ } 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;
+}
+
+sub end_functionplotvectorsumrule {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+#
+# <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
@@ -993,6 +1298,7 @@ sub start_functionplotresponse {
$Apache::functionplotresponse::counter=0;
# Remember rules
undef @Apache::functionplotresponse::functionplotrules;
+ undef @Apache::functionplotresponse::functionplotvectorrules;
# Remember failed rules
if ($target eq 'grade') {
undef @Apache::functionplotresponse::failedrules;
@@ -1026,7 +1332,11 @@ sub start_functionplotresponse {
.&Apache::edit::end_row()
.&Apache::edit::start_spanning_row()
."\n";
- $result.=&Apache::edit::text_arg('Label x-axis:','xlabel',
+ $result.=&Apache::edit::text_arg('Width (pixels):','width',
+ $token,'6').' '.
+ &Apache::edit::text_arg('Height (pixels):','height',
+ $token,'6').'<br />'.
+ &Apache::edit::text_arg('Label x-axis:','xlabel',
$token,'6').' '.
&Apache::edit::text_arg('Minimum x-value:','xmin',
$token,'4').' '.
@@ -1049,7 +1359,7 @@ sub start_functionplotresponse {
&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',
+ $safeeval,'width','height','xlabel','xmin','xmax','ylabel','ymin','ymax',
'xaxisvisible','yaxisvisible','gridvisible','answerdisplay');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
@@ -1059,27 +1369,16 @@ sub start_functionplotresponse {
($env{'form.answer_output_mode'} ne 'tex') &&
($Apache::lonhomework::viewgrades == 'F')) {
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
- my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
- my $start_page = &Apache::loncommon::start_page('Rules Log', undef,
- {'only_body' => 1,
- 'bgcolor' => '#FFFFFF',
- 'js_ready' => 1,});
- my $end_page = &Apache::loncommon::end_page({'js_ready' => 1,});
$uname =~s/\W//g;
$udom =~s/\W//g;
my $function_name =
join('_','LONCAPA_scriptvars',$uname,$udom,
$env{'form.counter'},$Apache::lonxml::curdepth);
- my $rules_var ="<script type=\"text/javascript\">
-// <![CDATA[
- function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>".
- $Apache::functionplotresponse::ruleslog.
- "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
-// ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt('Rules Log')."</a><br />";
- &Apache::lonxml::add_script_result($rules_var);
- }
-
+ &Apache::lonxml::add_script_result(
+ &Apache::loncommon::modal_adhoc_window($function_name,700,500,
+ '<pre>'.$Apache::functionplotresponse::ruleslog.'</pre>',
+ &mt('Rules Log'))."<br />");
+ }
return $result;
}
@@ -1166,6 +1465,278 @@ sub fpr_d2fdx2 {
$Apache::functionplotresponse::fpr_xmax,
$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)=@_;
+ 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 attached {
+ my ($id,$vector,$objects,$xmin,$xmax,$ymin,$ymax)=@_;
+ my ($xs,$xe,$ys,$ye)=&vectorcoords($id,$vector);
+ my $tolx=($xmax-$xmin)/100.;
+ my $toly=($ymax-$ymin)/100.;
+ my $tail=0;
+ my $tip=0;
+ 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);
+}
+
+
+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);
+ } elsif ($type eq 'custom') {
+ return &customcheck($rule,$safeeval);
+ }
+}
+
+sub vectorcheck {
+ my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_;
+ my ($label,$type,$id,$vector,
+ $attachpoint,$notattachpoint,
+ $tailpoint,$tippoint,$nottailpoint,$nottippoint,
+ $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,$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)");
+ if ($length ne '') {
+ &addlog("Checking length $length with error $lengtherror");
+ $length=&Apache::run::run($length,$safeeval);
+ &addlog("Evaluated to $length");
+ my $thislength=&vectorlength($sumx,$sumy);
+ &addlog("Actual length $thislength");
+ if (abs($length-$thislength)>$lengtherror) {
+ &setfailed($label);
+ return 0;
+ }
+ }
+ if ($angle ne '') {
+ &addlog("Checking angle $angle with error $angleerror");
+ $angle=&Apache::run::run($angle,$safeeval);
+ &addlog("Evaluated to $angle");
+ my $thisangle=&vectorangle($sumx,$sumy);
+ &addlog("Actual 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;
+ }
+ }
+ &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;
+}
+
+#
+# Evaluate a functionplotrule
+#
sub functionplotrulecheck {
my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_;
@@ -1178,7 +1749,7 @@ sub functionplotrulecheck {
#
# Evaluate the value
#
- if ($value=~/\D/) {
+ if (($value=~/\D/) && ($value ne 'undef')) {
$Apache::functionplotresponse::fpr_xmin=$xmin;
$Apache::functionplotresponse::fpr_xmax=$xmax;
$value=&Apache::run::run($value,$safeeval);
@@ -1262,10 +1833,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 {
@@ -1331,8 +1899,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");
@@ -1391,6 +1958,13 @@ sub end_functionplotruleset {
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' };
}
@@ -1489,7 +2063,9 @@ sub end_functionplotelements {
# generate the input fields
$result.=$Apache::functionplotresponse::inputfields;
# actually start the <applet>-tag
- $result.=&geogebra_startcode($internalid);
+ $result.=&geogebra_startcode($internalid,
+ &Apache::lonxml::get_param('width',$parstack,$safeeval,-2),
+ &Apache::lonxml::get_param('height',$parstack,$safeeval,-2));
# load the spline bytecode
$result.=&geogebra_spline_program();
# set default parameters