[system] / trunk / webwork / system / courseScripts / PGcomplexmacros.pl Repository:
ViewVC logotype

Diff of /trunk/webwork/system/courseScripts/PGcomplexmacros.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 58 Revision 102
1#!/usr/local/bin/webwork-perl 1#!/usr/local/bin/webwork-perl
2# This file is PGcomplexmacros.pl
3# This includes the subroutines for the ANS macros, that
4# is, macros allowing a more flexible answer checking
5####################################################################
6# Copyright @ 1995-2001 The WeBWorK Team
7# All Rights Reserved
8####################################################################
9#$Id$
10
11
2BEGIN{ 12BEGIN{
3 be_strict(); 13 be_strict();
4 sub i(); 14
5} 15}
16# export functions from Complex1.
6 17
7foreach my $f (@Complex1::EXPORT) { 18foreach my $f (@Complex1::EXPORT) {
8 PG_restricted_eval("\*$f = \*Complex1::$f"); 19 #PG_restricted_eval("\*$f = \*Complex1::$f"); # this is too clever --
20 # the original subroutines are destroyed
21 next if $f eq 'sqrt'; #exporting the square root caused conflicts with the standard version
22 # You can still use Complex1::sqrt to take square root of complex numbers
23 local($main::string) = qq{
24 sub main::$f {
25 &Complex1::$f;
26 }
27 };
28 PG_restricted_eval($main::string);
9} 29}
10 30
11# You need to add 31# You need to add
12# sub i(); # to your problem or else to dangerousMacros.pl 32# sub i(); # to your problem or else to dangerousMacros.pl
13# in order to use expressions such as 1 +3*i; 33# in order to use expressions such as 1 +3*i;
29} 49}
30sub cplx_cmp { 50sub cplx_cmp {
31 my $correctAns = shift; 51 my $correctAns = shift;
32 my %options = @_; 52 my %options = @_;
33 $correctAns = cplx($correctAns,0) unless ref($correctAns) =~/Complex/; 53 $correctAns = cplx($correctAns,0) unless ref($correctAns) =~/Complex/;
54 assign_option_aliases( \%options,
55 'reltol' => 'relTol',
56 );
34 set_default_options(\%options, 57 set_default_options(\%options,
35 reltol => .01 58 'tolType' => (defined($options{tol}) ) ? 'absolute' : 'relative',
59 # default mode should be relative, to obtain this tol must not be defined
60 'tol' => $main::numAbsTolDefault,
61 'relTol' => $main::numRelPercentTolDefault,
62 'zeroLevel' => $main::numZeroLevelDefault,
63 'zeroLevelTol' => $main::numZeroLevelTolDefault,
64 'format' => $main::numFormatDefault,
65 'debug' => 0,
66
36 ); 67 );
37 my $tol = .01*$options{reltol}; 68
69
38 my $ans_eval = sub { 70 my $ans_eval = sub {
39 my $in = shift; 71 my $in = shift;
40 my $rh_ans = new AnswerHash; 72 my $rh_ans = new AnswerHash;
73 $rh_ans->{correct_ans} = $correctAns;
74 unless (defined($in) and $in =~/\S/ ) { #bail on empty answer
75 $rh_ans->{student_ans} = "error: empty";
76 return $rh_ans;
77 }
41 my($PG_errors,$PG_errors_long); 78 my($PG_errors,$PG_errors_long);
42 $rh_ans->{correct_ans} = $correctAns; 79
43 $rh_ans->input($in); 80 $rh_ans->input($in);
81
82 $rh_ans->{student_ans}=math_constants($rh_ans->{student_ans});
83 $rh_ans->{student_ans} =~ s/e\^/exp /g; #try to handle exponents
44 $rh_ans=check_syntax($rh_ans); 84 $rh_ans=check_syntax($rh_ans);
45 $rh_ans->{student_ans} =~ s/e\^/exp /g; #try to handle exponents
46 $rh_ans->{student_ans} =~ s/-\s*i/-1*i/g; #try to keep -i being recognized as a file reference 85 $rh_ans->{student_ans} =~ s/\bi\b/(i)/g; #try to keep -i being recognized as a file reference
86 # and recognized as a function whose output is an imaginary number
87
88
89
90 warn $rh_ans->pretty_print() if defined($options{debug}) and $options{debug}==1;
47 ($in,$PG_errors,$PG_errors_long) = PG_restricted_eval($rh_ans->{student_ans}); 91 ($in,$PG_errors,$PG_errors_long) = PG_restricted_eval($rh_ans->{student_ans});
92 $in = $in +0*i; # force the input to be complex
48 if ($PG_errors_long) { 93 if ($PG_errors_long) {
49 $rh_ans->{error}=1; 94 $rh_ans->{error}=1;
50 $rh_ans->{ans_message} = $PG_errors; 95 $rh_ans->{ans_message} = $PG_errors;
51 } else { 96 } else {
52 $in->display_format('cartesian') if ref($in) =~/Complex/; 97 $in->display_format('cartesian') if ref($in) =~/Complex/;
53 $rh_ans->{student_ans}="$in"; 98 $rh_ans->{student_ans}="$in";
99 my $permitted_error;
100 if (defined($options{tolType}) && $options{tolType} eq 'absolute') {
101 $permitted_error = $options{tol};
102 } elsif ( abs($correctAns) <= $options{zeroLevel}) {
103 $permitted_error = $options{zeroLevelTol}; ## want $tol to be non zero
104 } else {
105 $permitted_error = abs(.01*$options{relTol}*$correctAns); # relative tolerance is given in per cent
106 }
54 $rh_ans->{score} = (abs($in - $correctAns)<$tol*abs($correctAns) )? 1:0; 107 $rh_ans->{score} = (abs($in - $correctAns)<$permitted_error )? 1:0;
55 108
56 } 109 }
110
57 $rh_ans; 111 $rh_ans;
58 }; 112 };
59 $ans_eval; 113 $ans_eval;
60} 114}
61 115

Legend:
Removed from v.58  
changed lines
  Added in v.102

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9