version 1.64, 2011/09/28 23:33:52
|
version 1.69, 2011/10/27 00:36:37
|
Line 31 use strict;
|
Line 31 use strict;
|
use Apache::response(); |
use Apache::response(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::run; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline', |
&Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline', |
Line 75 sub geogebra_default_parameters {
|
Line 76 sub geogebra_default_parameters {
|
<param name="boxborder" value="false" /> |
<param name="boxborder" value="false" /> |
<param name="centerimage" value="true" /> |
<param name="centerimage" value="true" /> |
<param name="cache_archive" value="geogebra.jar, geogebra_main.jar, geogebra_gui.jar, geogebra_cas.jar, geogebra_export.jar, geogebra_algos.jar, geogebra_javascript.jar, geogebra_properties.jar, jlatexmath.jar, jlm_cyrillic.jar, jlm_greek.jar" /> |
<param name="cache_archive" value="geogebra.jar, geogebra_main.jar, geogebra_gui.jar, geogebra_cas.jar, geogebra_export.jar, geogebra_algos.jar, geogebra_javascript.jar, geogebra_properties.jar, jlatexmath.jar, jlm_cyrillic.jar, jlm_greek.jar" /> |
<param name="cache_version" value="3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0" /> |
<param name="cache_version" value="4.0.1.0,4.0.1.0,4.0.1.0,4.0.1.0,4.0.1.0,4.0.1.0,4.0.1.0,4.0.1.0,4.0.1.0,4.0.1.0,4.0.1.0" /> |
<param name="framePossible" value="false" /> |
<param name="framePossible" value="false" /> |
|
|
<param name="showResetIcon" value="false" /> |
<param name="showResetIcon" value="false" /> |
Line 163 sub update_register {
|
Line 164 sub update_register {
|
sub set_point_coordinate { |
sub set_point_coordinate { |
my ($id,$variable,$x,$y,$fixed)=@_; |
my ($id,$variable,$x,$y,$fixed)=@_; |
my $mult=($fixed?'a*':''); |
my $mult=($fixed?'a*':''); |
|
# Get rid of wild exponents, make sure it's a number |
|
$x=1.*$x; |
|
$y=1.*$y; |
|
# GeoGebra does not understand "E" |
|
$x=~s/[e|E]/\*10\^/; |
|
$x=~s/\+//; |
|
$y=~s/[e|E]/\*10\^/; |
|
$y=~s/\+//; |
return (<<ENDSETVARIABLE); |
return (<<ENDSETVARIABLE); |
document.ggbApplet_$id.evalCommand("a=1"); |
document.ggbApplet_$id.evalCommand("a=1"); |
document.ggbApplet_$id.evalCommand("$variable=$mult($x,$y)"); |
document.ggbApplet_$id.evalCommand("$variable=$mult($x,$y)"); |
Line 563 sub start_functionplotrule {
|
Line 572 sub start_functionplotrule {
|
['lt','less than'], |
['lt','less than'], |
['le','less than or equal']],$token). |
['le','less than or equal']],$token). |
$result.= &Apache::edit::select_or_text_arg('Value:','value', |
$result.= &Apache::edit::select_or_text_arg('Value:','value', |
[['undef','not defined']],$token,'8'). |
[['undef','not defined']],$token,'30'). |
&Apache::edit::text_arg('Percent error:','percenterror', |
&Apache::edit::text_arg('Percent error:','percenterror', |
$token,'8'). |
$token,'8'). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
Line 972 sub compare_rel {
|
Line 981 sub compare_rel {
|
|
|
sub addlog { |
sub addlog { |
my ($text)=@_; |
my ($text)=@_; |
|
$text=~s/\'/\\\'/g; |
$Apache::functionplotresponse::ruleslog.=$text.'<br />'; |
$Apache::functionplotresponse::ruleslog.=$text.'<br />'; |
} |
} |
|
|
Line 979 sub actualval {
|
Line 989 sub actualval {
|
my ($i,$xmin,$xmax)=@_; |
my ($i,$xmin,$xmax)=@_; |
return $xmin+$i/400.*($xmax-$xmin); |
return $xmin+$i/400.*($xmax-$xmin); |
} |
} |
|
|
|
sub fpr_val { |
|
my ($arg)=@_; |
|
return &actualval($Apache::functionplotresponse::functionplotrulelabels{$arg}, |
|
$Apache::functionplotresponse::fpr_xmin, |
|
$Apache::functionplotresponse::fpr_xmax); |
|
} |
|
|
|
sub fpr_f { |
|
my ($arg)=@_; |
|
return $Apache::functionplotresponse::func[&array_index($Apache::functionplotresponse::fpr_xmin, |
|
$Apache::functionplotresponse::fpr_xmax, |
|
$arg)]; |
|
} |
|
|
|
sub fpr_dfdx { |
|
my ($arg)=@_; |
|
return $Apache::functionplotresponse::dfuncdx[&array_index($Apache::functionplotresponse::fpr_xmin, |
|
$Apache::functionplotresponse::fpr_xmax, |
|
$arg)]; |
|
} |
|
|
|
sub fpr_d2fdx2 { |
|
my ($arg)=@_; |
|
return $Apache::functionplotresponse::d2funcdx2[&array_index($Apache::functionplotresponse::fpr_xmin, |
|
$Apache::functionplotresponse::fpr_xmax, |
|
$arg)]; |
|
} |
|
|
sub functionplotrulecheck { |
sub functionplotrulecheck { |
my ($rule,$xmin,$xmax,$ymin,$ymax)=@_; |
my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_; |
|
|
my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$minimumlength,$maximumlength,$relationship,$value,$percent) |
my ($label,$derivative,$xinitial,$xinitiallabel,$xfinal,$xfinallabel,$minimumlength,$maximumlength,$relationship,$value,$percent) |
=split(/\:/,$rule); |
=split(/\:/,$rule); |
$percent=($percent>0?$percent:5); |
$percent=($percent>0?$percent:5); |
&addlog("================="); |
&addlog("================="); |
&addlog("Rule $label for ".($derivative<0?'integral':('function itself','first derivative','second derivative')[$derivative])." $relationship $value"); |
&addlog("Rule $label for ".($derivative<0?'integral':('function itself','first derivative','second derivative')[$derivative])." $relationship $value"); |
|
# |
|
# Evaluate the value |
|
# |
|
if ($value=~/\D/) { |
|
$Apache::functionplotresponse::fpr_xmin=$xmin; |
|
$Apache::functionplotresponse::fpr_xmax=$xmax; |
|
$value=&Apache::run::run($value,$safeeval); |
|
&addlog("Value evaluated to $value"); |
|
} |
|
|
|
# |
|
# Minimum and maximum lengths of the interval |
|
# |
if ((defined($minimumlength)) || (defined($maximumlength))) { |
if ((defined($minimumlength)) || (defined($maximumlength))) { |
&addlog("Minimumlength $minimumlength Maximumlength $maximumlength"); |
&addlog("Minimumlength $minimumlength Maximumlength $maximumlength"); |
} |
} |
Line 1186 sub end_functionplotruleset {
|
Line 1237 sub end_functionplotruleset {
|
|
|
# We have a function that we can actually grade, go through the spline rules. |
# We have a function that we can actually grade, go through the spline rules. |
foreach my $rule (@Apache::functionplotresponse::functionplotrules) { |
foreach my $rule (@Apache::functionplotresponse::functionplotrules) { |
unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax)) { |
unless (&functionplotrulecheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)) { |
$ad='INCORRECT'; |
$ad='INCORRECT'; |
last; |
last; |
} |
} |