version 1.26, 2010/11/07 11:15:37
|
version 1.28, 2010/11/07 13:15:28
|
Line 557 sub array_index {
|
Line 557 sub array_index {
|
} |
} |
|
|
# |
# |
# Actual x-value of array index |
|
# |
|
|
|
sub index_x { |
|
my ($xmin,$xmax,$i)=@_; |
|
return $i*($xmax-$xmin)/400.+$xmin; |
|
} |
|
|
|
# |
|
# Function value |
|
# |
|
|
|
sub func_val { |
|
my ($xmin,$xmax,$x)=@_; |
|
return $Apache::functionplotresponse::func[&array_index($xmin,$xmax,$x)]; |
|
} |
|
|
|
# |
|
# First derivative |
|
# |
|
|
|
sub dfuncdx_val { |
|
my ($xmin,$xmax,$x)=@_; |
|
return $Apache::functionplotresponse::dfuncdx[&array_index($xmin,$xmax,$x)]; |
|
} |
|
|
|
# |
|
# Second derivative |
|
# |
|
|
|
sub d2funcdx2_val { |
|
my ($xmin,$xmax,$x)=@_; |
|
return $Apache::functionplotresponse::d2funcdx2[&array_index($xmin,$xmax,$x)]; |
|
} |
|
|
|
# |
|
# Populate the arrays |
# Populate the arrays |
# |
# |
|
|
Line 627 sub populate_arrays {
|
Line 591 sub populate_arrays {
|
$xiold=$xi; |
$xiold=$xi; |
# Function value |
# Function value |
$Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms); |
$Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms); |
|
# Chain rule |
# dy/dx=dy/dt/(dx/dt) |
# dy/dx=dy/dt/(dx/dt) |
my $dxdt=&ddt_cubic_hermite($t,@xparms); |
my $dxdt=&ddt_cubic_hermite($t,@xparms); |
if ($dxdt) { |
if ($dxdt) { |
$Apache::functionplotresponse::dfuncdx[$xi]=&ddt_cubic_hermite($t,@yparms)/$dxdt; |
$Apache::functionplotresponse::dfuncdx[$xi]=&ddt_cubic_hermite($t,@yparms)/$dxdt; |
} |
} |
# d^2y/dx^2 |
# Faa di Bruno |
|
# d^2y/dx^2=(d^2y/dt^2)/(dx/dt)^2+(dy/dt)/(d^2x/dt^2) |
my $d2xdt2=&d2dt2_cubic_hermite($t,@xparms); |
my $d2xdt2=&d2dt2_cubic_hermite($t,@xparms); |
if ($d2xdt2) { |
if (($dxdt) && ($d2xdt2)) { |
$Apache::functionplotresponse::d2funcd2x[$xi]=&d2dt2_cubic_hermite($t,@yparms)/$d2xdt2; |
$Apache::functionplotresponse::d2funcdx2[$xi]= |
|
&d2dt2_cubic_hermite($t,@yparms)/($dxdt*$dxdt) |
|
+&ddt_cubic_hermite($t,@yparms)/$d2xdt2; |
} |
} |
} |
} |
} |
} |
Line 744 sub start_functionplotresponse {
|
Line 712 sub start_functionplotresponse {
|
|
|
sub compare_rel { |
sub compare_rel { |
my ($relationship,$value,$realval,$tol)=@_; |
my ($relationship,$value,$realval,$tol)=@_; |
|
|
|
|
|
&Apache::lonnet::logthis("Rel $relationship Val $value RV $realval T $tol"); |
# is the real value defined? |
# is the real value defined? |
unless (defined($realval)) { |
unless (defined($realval)) { |
if ($relationship eq 'eq') { |
if ($relationship eq 'eq') { |
Line 802 sub functionplotrulecheck {
|
Line 773 sub functionplotrulecheck {
|
if ($xinitial eq '') { |
if ($xinitial eq '') { |
$xinitial=0; |
$xinitial=0; |
} |
} |
if ($xfinal ne '') { |
if ($xfinal eq '') { |
if ($xinitial>$xfinal) { |
$xfinal=$xinitial; |
$xfinal=$xinitial; |
} |
} |
if ($xinitial>$xfinal) { |
|
$xfinal=$xinitial; |
} |
} |
&Apache::lonnet::logthis("Init $xinitial Final $xfinal"); |
&Apache::lonnet::logthis("Init $xinitial Final $xfinal"); |
if (($xfinal eq '') || ($xinitial==$xfinal)) { |
my $tol=$tolfunc; |
# This is only one point |
if ($derivative==2) { |
&Apache::lonnet::logthis("One point $xinitial"); |
$tol=$told2fdx2; |
my $tol; |
} elsif ($derivative==1) { |
|
$tol=$toldfdx; |
|
} |
|
|
|
my $li=&array_index($xmin,$xmax,$xinitial); |
|
my $lh=&array_index($xmin,$xmax,$xfinal); |
|
for (my $i=$li; $i<=$lh; $i++) { |
my $val; |
my $val; |
if ($derivative==2) { |
if ($derivative==2) { |
$val=&d2funcdx2_val($xmin,$xmax,$xinitial); |
&Apache::lonnet::logthis("Second ". |
$tol=$told2fdx2; |
|
|
$Apache::functionplotresponse::d2funcdx2[$i-1].'__'.$Apache::functionplotresponse::d2funcdx2[$i].'__'.$Apache::functionplotresponse::d2funcdx2[$i+1]); |
|
$val=$Apache::functionplotresponse::d2funcdx2[$i]; |
} elsif ($derivative==1) { |
} elsif ($derivative==1) { |
$val=&dfuncdx_val($xmin,$xmax,$xinitial); |
$val=$Apache::functionplotresponse::dfuncdx[$i]; |
$tol=$toldfdx; |
|
} else { |
} else { |
$val=&func_val($xmin,$xmax,$xinitial); |
$val=$Apache::functionplotresponse::func[$i]; |
$tol=$tolfunc; |
|
} |
} |
&Apache::lonnet::logthis("Value $value ActVal $val Tol $tol"); |
unless (&compare_rel($relationship,$value,$val,$tol)) { return 0; }; |
return &compare_rel($relationship,$value,$val,$tol); |
|
} else { |
|
# This is a range |
|
} |
} |
return 0; |
return 1; |
} |
} |
|
|
|
|
sub end_functionplotresponse { |
sub end_functionplotresponse { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
&Apache::response::end_response; |
&Apache::response::end_response; |
Line 846 sub end_functionplotresponse {
|
Line 820 sub end_functionplotresponse {
|
&& &Apache::response::submitted() |
&& &Apache::response::submitted() |
&& $Apache::lonhomework::type eq 'exam') { |
&& $Apache::lonhomework::type eq 'exam') { |
|
|
#&Apache::response::scored_response($partid,$id); |
&Apache::response::scored_response($partid,$id); |
|
|
} elsif ($target eq 'grade' |
} elsif ($target eq 'grade' |
&& &Apache::response::submitted() |
&& &Apache::response::submitted() |
Line 865 sub end_functionplotresponse {
|
Line 839 sub end_functionplotresponse {
|
$ymin=(defined($ymin)?$ymin:-10); |
$ymin=(defined($ymin)?$ymin:-10); |
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval); |
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval); |
$ymax=(defined($ymax)?$ymax:10); |
$ymax=(defined($ymax)?$ymax:10); |
my $tolfunc=5.*($ymax-$ymin)/100.; |
|
|
my $percent=&Apache::lonxml::get_param('percenterror',$parstack,$safeeval); |
|
$percent=(defined($percent)?$percent:5); |
|
|
|
my $tolfunc=$percent*($ymax-$ymin)/100.; |
my $toldfdx=1; |
my $toldfdx=1; |
my $told2fdx2=1; |
my $told2fdx2=1; |
if ($xmax>$xmin) { |
if ($xmax>$xmin) { |