[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 218 Revision 219
7# All Rights Reserved 7# All Rights Reserved
8#################################################################### 8####################################################################
9#$Id$ 9#$Id$
10 10
11 11
12=head1 NAME
13
14 Macros for complex numbers for the PG language
15
16=head1 SYNPOSIS
17
18
19
20=head1 DESCRIPTION
21
22=cut
23
24
12BEGIN{ 25BEGIN{
13 be_strict(); 26 be_strict();
14 27
28}
29sub _PGcomplexmacros_init {
15} 30}
16# export functions from Complex1. 31# export functions from Complex1.
17 32
18foreach my $f (@Complex1::EXPORT) { 33foreach my $f (@Complex1::EXPORT) {
19 #PG_restricted_eval("\*$f = \*Complex1::$f"); # this is too clever -- 34 #PG_restricted_eval("\*$f = \*Complex1::$f"); # this is too clever --
20 # the original subroutines are destroyed 35 # the original subroutines are destroyed
21 next if $f eq 'sqrt'; #exporting the square root caused conflicts with the standard version 36 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 37 # You can still use Complex1::sqrt to take square root of complex numbers
23 local($main::string) = qq{ 38 next if $f eq 'log'; #exporting loq caused conflicts with the standard version
39 # You can still use Complex1::log to take square root of complex numbers
40
41 my $string = qq{
24 sub main::$f { 42 sub main::$f {
25 &Complex1::$f; 43 &Complex1::$f;
26 } 44 }
27 }; 45 };
28 PG_restricted_eval($main::string); 46 PG_restricted_eval($string);
29} 47}
30 48
31# You need to add 49# You need to add
32# sub i(); # to your problem or else to dangerousMacros.pl 50# sub i(); # to your problem or else to dangerousMacros.pl
33# in order to use expressions such as 1 +3*i; 51# in order to use expressions such as 1 +3*i;
34# Without this prototype you would have to write 1+3*i(); 52# Without this prototype you would have to write 1+3*i();
35# The prototype has to be defined at compile time, but dangerousMacros.pl is complied first. 53# The prototype has to be defined at compile time, but dangerousMacros.pl is complied first.
36#Complex1::display_format('cartesian'); 54#Complex1::display_format('cartesian');
55
56
57
37 58
38sub polar{ 59sub polar{
39 my $z = shift; 60 my $z = shift;
40 my %options = @_; 61 my %options = @_;
41 my $r = rho($z); 62 my $r = rho($z);
45 $r_format=":" . $options{r_format} if defined($options{r_format}); 66 $r_format=":" . $options{r_format} if defined($options{r_format});
46 $theta_format = ":" . $options{theta_format} if defined($options{theta_format}); 67 $theta_format = ":" . $options{theta_format} if defined($options{theta_format});
47 "{$r$r_format} e^{i {$theta$theta_format}}"; 68 "{$r$r_format} e^{i {$theta$theta_format}}";
48 69
49} 70}
71
50sub cplx_cmp { 72sub cplx_cmp {
51 my $correctAns = shift; 73 my $correctAns = shift;
52 my %options = @_; 74 my %options = @_;
53 $correctAns = cplx($correctAns,0) unless ref($correctAns) =~/Complex/; 75 $correctAns = cplx($correctAns,0) unless ref($correctAns) =~/Complex/;
54 assign_option_aliases( \%options, 76 assign_option_aliases( \%options,

Legend:
Removed from v.218  
changed lines
  Added in v.219

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9