[system] / trunk / pg / macros / PGanswermacros.pl Repository:
ViewVC logotype

Diff of /trunk/pg/macros/PGanswermacros.pl

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

Revision 1931 Revision 1932
130 $functLLimitDefault , 130 $functLLimitDefault ,
131 $functULimitDefault , 131 $functULimitDefault ,
132 $functMaxConstantOfIntegration , 132 $functMaxConstantOfIntegration ,
133 $CA , 133 $CA ,
134 $rh_envir , 134 $rh_envir ,
135 $useBaseTenLog ,
135 $QUESTIONNAIRE_ANSWERS , 136 $QUESTIONNAIRE_ANSWERS ,
136); 137);
137 138
138 139
139 140
158 $functVarDefault = main::PG_restricted_eval(q!$main::functVarDefault!); 159 $functVarDefault = main::PG_restricted_eval(q!$main::functVarDefault!);
159 $functLLimitDefault = main::PG_restricted_eval(q!$main::functLLimitDefault!); 160 $functLLimitDefault = main::PG_restricted_eval(q!$main::functLLimitDefault!);
160 $functULimitDefault = main::PG_restricted_eval(q!$main::functULimitDefault!); 161 $functULimitDefault = main::PG_restricted_eval(q!$main::functULimitDefault!);
161 $functMaxConstantOfIntegration = main::PG_restricted_eval(q!$main::functMaxConstantOfIntegration!); 162 $functMaxConstantOfIntegration = main::PG_restricted_eval(q!$main::functMaxConstantOfIntegration!);
162 $rh_envir = main::PG_restricted_eval(q!\%main::envir!); 163 $rh_envir = main::PG_restricted_eval(q!\%main::envir!);
164 $useBaseTenLog = main::PG_restricted_eval(q!\%main::useBaseTenLog!);
163 $QUESTIONNAIRE_ANSWERS = ''; 165 $QUESTIONNAIRE_ANSWERS = '';
164} 166}
165 167
166 168
167 169
3525 # The code fragment above allows this filter to be used when the input is simply a string 3527 # The code fragment above allows this filter to be used when the input is simply a string
3526 # as well as when the input is an AnswerHash, and options. 3528 # as well as when the input is an AnswerHash, and options.
3527 $in =~s/\bpi\b/(4*atan2(1,1))/ge; 3529 $in =~s/\bpi\b/(4*atan2(1,1))/ge;
3528 $in =~s/\be\b/(exp(1))/ge; 3530 $in =~s/\be\b/(exp(1))/ge;
3529 $in =~s/\^/**/g; 3531 $in =~s/\^/**/g;
3530 if($main::useBaseTenLog) { 3532 if($useBaseTenLog) {
3531 $in =~ s/\blog\b/logten/g; 3533 $in =~ s/\blog\b/logten/g;
3532 } 3534 }
3533 3535
3534 if ($process_ans_hash) { 3536 if ($process_ans_hash) {
3535 $rh_ans->{student_ans}=$in; 3537 $rh_ans->{student_ans}=$in;

Legend:
Removed from v.1931  
changed lines
  Added in v.1932

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9