--- loncom/homework/hint.pm 2008/11/19 18:34:56 1.73 +++ loncom/homework/hint.pm 2009/04/17 01:00:15 1.75 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # implements the tags that control the hints # -# $Id: hint.pm,v 1.73 2008/11/19 18:34:56 jms Exp $ +# $Id: hint.pm,v 1.75 2009/04/17 01:00:15 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,60 +26,7 @@ # http://www.lon-capa.org/ # -=head1 NAME - -Apache::hinttags - -=head1 SYNOPSIS - -This handler coordinates the delivery of hints to students working on LON-CAPA problems and assignments. - -This is part of the LearningOnline Network with CAPA project -described at http://www.lon-capa.org. - -=head1 SUBROUTINES - -=over -=item start_hintgroup() - -=item end_hintgroup() - -=item start_numericalhint() - -=item end_numericalhint() - -=item start_formulahint() - -=item end_formulahint() - -=item start_mathhint() - -=item end_mathhint() - -=item start_customhint() - -=item end_customhint() - -=item start_stringhint() - -=item end_stringhint() - -=item start_hintpart() - -=item end_hintpart() - -=item start_optionhint() - -=item end_optionhint() - -=item start_radiobuttonhint() - -=item end_radiobuttonhint() - -=back - -=cut package Apache::hinttags; @@ -88,6 +35,7 @@ use Apache::lonnet(); use capa; use Apache::caparesponse(); use Apache::lonmaxima(); +use Apache::lonr(); use Apache::response(); use Apache::lonlocal; use Storable qw(dclone); @@ -297,7 +245,7 @@ sub start_mathhint { $result.=&Apache::edit::text_arg('Name:','name',$token); $result.=&Apache::edit::select_arg('Algebra System:', 'cas', - ['maxima'], + ['maxima','R'], $token); $result.=&Apache::edit::text_arg('Argument Array:', 'args',$token); @@ -335,6 +283,10 @@ sub end_mathhint { my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args); } + if ($cas eq 'R') { + my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; + $award=&Apache::lonr::r_run($Apache::response::custom_answer[-1],$response,$args); + } if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') { push (@Apache::hint::which,$name); } @@ -704,3 +656,59 @@ sub end_radiobuttonhint { } 1; __END__ + + +=head1 NAME + +Apache::hinttags + +=head1 SYNOPSIS + +This handler coordinates the delivery of hints to students working on LON-CAPA problems and assignments. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 SUBROUTINES + +=over + +=item start_hintgroup() + +=item end_hintgroup() + +=item start_numericalhint() + +=item end_numericalhint() + +=item start_formulahint() + +=item end_formulahint() + +=item start_mathhint() + +=item end_mathhint() + +=item start_customhint() + +=item end_customhint() + +=item start_stringhint() + +=item end_stringhint() + +=item start_hintpart() + +=item end_hintpart() + +=item start_optionhint() + +=item end_optionhint() + +=item start_radiobuttonhint() + +=item end_radiobuttonhint() + +=back + +=cut