[LON-CAPA-cvs] cvs: loncom /homework edit.pm functionplotresponse.pm insertlist.xml /publisher addid.tab
www
www@source.lon-capa.org
Sun, 07 Nov 2010 01:57:55 -0000
This is a MIME encoded message
--www1289095075
Content-Type: text/plain
www Sun Nov 7 01:57:55 2010 EDT
Modified files:
/loncom/homework edit.pm functionplotresponse.pm insertlist.xml
/loncom/publisher addid.tab
Log:
<splinerule> becomes <functionplotrule>, as other elements may be added
Start implementing rules
Still contains debug code
--www1289095075
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20101107015755.txt"
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.131 loncom/homework/edit.pm:1.132
--- loncom/homework/edit.pm:1.131 Sun Oct 10 00:14:15 2010
+++ loncom/homework/edit.pm Sun Nov 7 01:57:50 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.131 2010/10/10 00:14:15 www Exp $
+# $Id: edit.pm,v 1.132 2010/11/07 01:57:50 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -401,7 +401,7 @@
return '
<functionplotresponse>
<spline />
-<splinerule />
+<functionplotrule />
</functionplotresponse>';
}
@@ -415,9 +415,9 @@
<backgroundplot />';
}
-sub insert_splinerule {
+sub insert_functionplotrule {
return '
-<splinerule />';
+<functionplotrule />';
}
Index: loncom/homework/functionplotresponse.pm
diff -u loncom/homework/functionplotresponse.pm:1.24 loncom/homework/functionplotresponse.pm:1.25
--- loncom/homework/functionplotresponse.pm:1.24 Sat Nov 6 16:12:39 2010
+++ loncom/homework/functionplotresponse.pm Sun Nov 7 01:57:50 2010
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: functionplotresponse.pm,v 1.24 2010/11/06 16:12:39 www Exp $
+# $Id: functionplotresponse.pm,v 1.25 2010/11/07 01:57:50 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@
use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','splinerule'));
+ &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','functionplotrule'));
}
#
@@ -339,15 +339,15 @@
}
#
-# <splinerule ... />
+# <functionplotrule ... />
#
-sub start_splinerule {
+sub start_functionplotrule {
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('Spline Rule indices should only contain alphanumeric characters.'));
+ &Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.'));
}
$label=~s/\W//gs;
unless ($label) {
@@ -356,16 +356,16 @@
$label='R'.$label;
}
if ($Apache::functionplotresponse::splineorder{$label}) {
- &Apache::lonxml::error(&mt('Spline Rule indices must be unique.'));
+ &Apache::lonxml::error(&mt('Rule indices must be unique.'));
}
if ($target eq 'grade') {
# Simply remember - in order - for later
- my $beginninglabel=&Apache::lonxml::get_param('beginninglabel',$parstack,$safeeval);
- my $endinglabel=&Apache::lonxml::get_param('endinglabel',$parstack,$safeeval);
+ my $beginninglabel=&Apache::lonxml::get_param('xinitiallabel',$parstack,$safeeval);
+ my $endinglabel=&Apache::lonxml::get_param('xfinallabel',$parstack,$safeeval);
if (($beginninglabel=~/\W/) || ($endinglabel=~/W/)) {
- &Apache::lonxml::warning(&mt('Spline Rule labels must be alphanumeric.'));
+ &Apache::lonxml::warning(&mt('Rule labels must be alphanumeric.'));
}
$beginninglabel=~s/\W//gs;
$endinglabel=~s/\W//gs;
@@ -373,32 +373,32 @@
$relationship=~s/\W//gs;
$relationship=lc($relationship);
unless ($relationship=~/^(eq|ge|gt|le|lt|ne)$/) {
- &Apache::lonxml::warning(&mt('Spline Rule relationship not defined.'));
+ &Apache::lonxml::warning(&mt('Rule relationship not defined.'));
$relationship='eq';
}
my $derivative=&Apache::lonxml::get_param('derivative',$parstack,$safeeval);
unless (($derivative==0) || ($derivative==1) || ($derivative==2)) {
- &Apache::lonxml::warning(&mt('Spline Rule derivative not defined.'));
+ &Apache::lonxml::warning(&mt('Rule derivative not defined.'));
$derivative=0;
}
- push(@Apache::functionplotresponse::splinerules,join(':',(
+ push(@Apache::functionplotresponse::functionplotrules,join(':',(
$label,
$derivative,
- &Apache::lonxml::get_param('beginningvalue',$parstack,$safeeval),
+ &Apache::lonxml::get_param('xinitial',$parstack,$safeeval),
$beginninglabel,
- &Apache::lonxml::get_param('endingvalue',$parstack,$safeeval),
+ &Apache::lonxml::get_param('xfinal',$parstack,$safeeval),
$endinglabel,
$relationship,
&Apache::lonxml::get_param('value',$parstack,$safeeval)
)));
} elsif ($target eq 'edit') {
- $result=&Apache::edit::tag_start($target,$token,'Spline Evaluation Rule').
+ $result=&Apache::edit::tag_start($target,$token,'Function Plot Evaluation Rule').
&Apache::edit::end_row();
}
return $result;
}
-sub end_splinerule {
+sub end_functionplotrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'edit') {
@@ -704,7 +704,7 @@
$Apache::functionplotresponse::inputfields='';
$Apache::functionplotresponse::counter=0;
# Remember rules
- undef @Apache::functionplotresponse::splinerules;
+ undef @Apache::functionplotresponse::functionplotrules;
# Part and ID
my $partid=$Apache::inputtags::part;
my $id=&Apache::response::start_response($parstack,$safeeval);
@@ -722,6 +722,14 @@
$ymin=(defined($ymin)?$ymin:-10);
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval);
$ymax=(defined($ymax)?$ymax:10);
+ if ($xmax<=$xmin) {
+ &Apache::lonxml::warning('Maximum x-value needs to be larger than minimum value.');
+ $xmax=$xmin+20;
+ }
+ if ($ymax<=$ymin) {
+ &Apache::lonxml::warning('Maximum y-value needs to be larger than minimum value.');
+ $ymax=$ymin+20;
+ }
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');
@@ -777,8 +785,60 @@
return $result;
}
-sub splinerulecheck {
- my ($rule)=@_;
+sub compare_rel {
+ my ($relationship,$value,$val,$tol)=@_;
+ if (abs($value-$val)<$tol) { return 1; }
+ return 0;
+}
+
+sub functionplotrulecheck {
+ my ($rule,$xmin,$xmax,$tolfunc,$toldfdx,$told2fdx2)=@_;
+ &Apache::lonnet::logthis("Rule $rule TolFunc $tolfunc TolDfDx $toldfdx TolD2fDx2 $told2fdx2");
+ my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$relationship,$value)
+ =split(/\:/,$rule);
+# if a hard value is set for the boundaries, it overrides the label
+ if (($xinitial ne '') && ($xinitiallabel ne '')) {
+ $Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel}=$xinitial;
+ }
+ if (($xfinal ne '') && ($xfinallabel ne '')) {
+ $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$xfinal;
+ }
+ if (defined($Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel})) {
+ $xinitial=$Apache::functionplotresponse::functionplotrulelabels{$xinitiallabel};
+ }
+ if (defined($Apache::functionplotresponse::functionplotrulelabels{$xfinallabel})) {
+ $xfinal=$Apache::functionplotresponse::functionplotrulelabels{$xfinallabel};
+ }
+# Basic sanity checks
+ if ($xinitial eq '') {
+ $xinitial=0;
+ }
+ if ($xfinal ne '') {
+ if ($xinitial>$xfinal) {
+ $xfinal=$xinitial;
+ }
+ }
+ &Apache::lonnet::logthis("Init $xinitial Final $xfinal");
+ if (($xfinal eq '') || ($xinitial==$xfinal)) {
+# This is only one point
+ &Apache::lonnet::logthis("One point $xinitial");
+ my $tol;
+ my $val;
+ if ($derivative==2) {
+ $val=&d2funcdx2_val($xmin,$xmax,$xinitial);
+ $tol=$told2fdx2;
+ } elsif ($derivative==1) {
+ $val=&dfuncdx_val($xmin,$xmax,$xinitial);
+ $tol=$toldfdx;
+ } else {
+ $val=&func_val($xmin,$xmax,$xinitial);
+ $tol=$tolfunc;
+ }
+ &Apache::lonnet::logthis("Value $value ActVal $val Tol $tol");
+ return &compare_rel($relationship,$value,$val,$tol);
+ } else {
+# This is a range
+ }
return 0;
}
@@ -812,14 +872,26 @@
$xmin=(defined($xmin)?$xmin:-10);
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
$xmax=(defined($xmax)?$xmax:10);
+ my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval);
+ $ymin=(defined($ymin)?$ymin:-10);
+ my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval);
+ $ymax=(defined($ymax)?$ymax:10);
+ my $tolfunc=($ymax-$ymin)/100.;
+ my $toldfdx=1;
+ my $told2fdx2=1;
+ if ($xmax>$xmin) {
+ $toldfdx=$tolfunc/($xmax-$xmin);
+ $told2fdx2=$toldfdx/($xmax-$xmin);
+ }
+
my $ad='';
if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') {
$ad='NOT_FUNCTION';
} else {
# We have a function that we can actually grade, go through the spline rules.
- undef %Apache::functionplotresponse::splinerulelabels;
- foreach my $rule (@Apache::functionplotresponse::splinerules) {
- unless (&splinerulecheck($rule)) {
+ undef %Apache::functionplotresponse::functionplotrulelabels;
+ foreach my $rule (@Apache::functionplotresponse::functionplotrules) {
+ unless (&functionplotrulecheck($rule,$xmin,$xmax,$tolfunc,$toldfdx,$told2fdx2)) {
$ad='INCORRECT';
last;
}
Index: loncom/homework/insertlist.xml
diff -u loncom/homework/insertlist.xml:1.20 loncom/homework/insertlist.xml:1.21
--- loncom/homework/insertlist.xml:1.20 Sun Oct 10 00:14:15 2010
+++ loncom/homework/insertlist.xml Sun Nov 7 01:57:50 2010
@@ -20,7 +20,7 @@
<description>Response: Function Plot</description>
<color>#77DD55</color>
<insert_sub>insert_functionplotresponse</insert_sub>
- <allow>spline,backgroundplot,splinerule</allow>
+ <allow>spline,backgroundplot,functionplotrule</allow>
</tag>
<tag name="spline">
<description>Spline</description>
@@ -34,10 +34,10 @@
<insert_sub>insert_backgroundplot</insert_sub>
<allow></allow>
</tag>
- <tag name="splinerule">
- <description>Spline Evaluation Rule</description>
+ <tag name="functionplotrule">
+ <description>Function Plot Evaluation Rule</description>
<color>#99ff88</color>
- <insert_sub>insert_splinerule</insert_sub>
+ <insert_sub>insert_functionplotrule</insert_sub>
<allow></allow>
</tag>
<tag name="caparesponse::answergroup">
Index: loncom/publisher/addid.tab
diff -u loncom/publisher/addid.tab:1.23 loncom/publisher/addid.tab:1.24
--- loncom/publisher/addid.tab:1.23 Sat Nov 6 14:37:29 2010
+++ loncom/publisher/addid.tab Sun Nov 7 01:57:55 2010
@@ -34,4 +34,4 @@
Dimension id
Question id
spline index
-splinerule index
+functionplotrule index
--www1289095075--