[LON-CAPA-cvs] cvs: loncom /homework hint.pm /homework/caparesponse caparesponse.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 19 Dec 2006 00:40:44 -0000
This is a MIME encoded message
--albertel1166488844
Content-Type: text/plain
albertel Mon Dec 18 19:40:44 2006 EDT
Modified files:
/loncom/homework hint.pm
/loncom/homework/caparesponse caparesponse.pm
Log:
- make numerical/string/formula hints work in the presence of the new answer stuructures (multiple answers and multiple dimensional answer not yet funtional)
--albertel1166488844
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20061218194044.txt"
Index: loncom/homework/hint.pm
diff -u loncom/homework/hint.pm:1.64 loncom/homework/hint.pm:1.65
--- loncom/homework/hint.pm:1.64 Mon Dec 18 16:37:47 2006
+++ loncom/homework/hint.pm Mon Dec 18 19:40:38 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.64 2006/12/18 21:37:47 www Exp $
+# $Id: hint.pm,v 1.65 2006/12/19 00:40:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,11 +29,13 @@
package Apache::hinttags;
use strict;
-use Apache::lonnet;
+use Apache::lonnet();
use capa;
+use Apache::caparesponse();
use Apache::lonmaxima();
use Apache::response();
use Apache::lonlocal;
+use Storable qw(dclone);
BEGIN {
&Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint'));
@@ -118,12 +120,10 @@
&Apache::loncommon::help_open_topic('Physical_Units');
$result.=&Apache::edit::text_arg('Format:','format',$token,4).
&Apache::loncommon::help_open_topic('Numerical_Response_Format');
- } elsif ($token->[1] eq 'stringhint') {
- $result.=&Apache::edit::select_arg('Type:','type',
- [['cs','Case Sensitive'],['ci','Case Insensitive'],
- ['mc','Case Insensitive, Any Order']],$token);
} elsif ($token->[1] eq 'formulahint') {
- $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
+ $result.=&Apache::edit::text_arg('Sample Points:','samples',
+ $token,40).
+ &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
}
$result.=&Apache::edit::end_row();
$result.=&Apache::edit::start_spanning_row();
@@ -133,10 +133,6 @@
$constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'name',
'answer','unit','format');
- } elsif ($token->[1] eq 'stringhint') {
- $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'name','answer',
- 'type');
} elsif ($token->[1] eq 'formulahint') {
$constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'name','answer',
@@ -160,45 +156,59 @@
&Apache::lonxml::default_homework_load($safeeval);
}
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
- my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ my $hint_name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::response::setup_params('numericalhint',$safeeval);
+
my $partid=$Apache::inputtags::part;
my $id=$Apache::inputtags::hint[-1];
#id submissions occured under
my $submitid=$Apache::inputtags::response[-1];
+
my $response = $Apache::lonhomework::history{
"resource.$partid.$submitid.submission"};
&Apache::lonxml::debug("hintgroup is using $response<br />\n");
+
+ my @args = ('type','tol','sig','ans_fmt','unit','calc','samples');
+ my $args_ref =
+ &Apache::caparesponse::setup_capa_args($safeeval,$parstack,
+ \@args,$response);
+
my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');
- my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
- $$args_ref{'response'}=$response;
- #need to get all possible parms
- foreach my $arg ('type','tol','sig','ans_fmt','unit','calc',
- 'samples') {
- $$args_ref{$arg}=
- &Apache::lonxml::get_param($arg,$parstack,$safeeval);
- }
- foreach my $key (keys(%Apache::inputtags::params)) {
- $$args_ref{$key}=$Apache::inputtags::params{$key};
- }
if (lc($hideunit) eq "yes") { delete($$args_ref{'unit'}); }
+
if ($$tagstack[-1] eq 'formulahint') {
$$args_ref{'type'}='fml';
} elsif ($$tagstack[-1] eq 'numericalhint') {
$$args_ref{'type'}='float';
}
- my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
- &Apache::lonxml::debug('answer is'.join(':',@answer));
- @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
-
- ($result,my @msgs) = &Apache::run::run("&caparesponse_check_list()",
- $safeeval);
- &Apache::lonxml::debug('msgs are'.join(':',@msgs));
- &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");
- my ($awards)=split(/:/,$result);
- my (@awards) = split(/,/,$awards);
- my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
- if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
+ &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);
+ my %answer = &Apache::caparesponse::get_answer();
+ my (@final_awards,@final_msgs,@ans_names);
+ foreach my $ans_name (keys(%answer)) {
+ &Apache::lonxml::debug(" doing $ans_name with ".join(':',@{ $answer{$ans_name}{'answers'} }));
+
+ ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=
+ dclone($answer{$ans_name});
+ &Apache::caparesponse::setup_capa_response($args_ref,$response);
+ my ($result,@msgs) =
+ &Apache::run::run("&caparesponse_check_list()",$safeeval);
+ &Apache::lonxml::debug("checking $ans_name $result with $response");
+ &Apache::lonxml::debug('msgs are '.join(':',@msgs));
+ my ($awards)=split(/:/,$result);
+ my @awards= split(/,/,$awards);
+ my ($ad, $msg) =
+ &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+ push(@final_awards,$ad);
+ push(@final_msgs,$msg);
+ push(@ans_names,$ans_name);
+ }
+ my ($ad, $msg, $ans_name) =
+ &Apache::inputtags::finalizeawards(\@final_awards,
+ \@final_msgs,
+ \@ans_names,1);
+ if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') {
+ push(@Apache::hint::which,$hint_name);
+ }
$result='';
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write($token->[1]);
@@ -379,9 +389,8 @@
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
- my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
- my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ my $hint_name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::response::setup_params('stringhint',$safeeval);
my $partid=$Apache::inputtags::part;
my $id=$Apache::inputtags::hint[-1];
@@ -390,11 +399,11 @@
my $response = $Apache::lonhomework::history{
"resource.$partid.$submitid.submission"};
&Apache::lonxml::debug("hintgroup is using $response<br />\n");
- my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
- $$args_ref{'response'}=$response;
- my $type=$$args_ref{'type'}=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+ my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
my ($ad,$msg);
if ($type eq 're' ) {
+ my $answer=&Apache::lonxml::get_param('answer',$parstack,
+ $safeeval);
${$safeeval->varglob('LONCAPA::response')}=$response;
my $compare='=';
if ($answer=~/^\s*NOT\s*/) {
@@ -408,22 +417,34 @@
&Apache::lonxml::debug("current $answer");
$ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
} else {
- foreach my $key (keys(%Apache::inputtags::params)) {
- $$args_ref{$key}=$Apache::inputtags::params{$key};
+ my @args = ('type');
+ my $args_ref =
+ &Apache::caparesponse::setup_capa_args($safeeval,$parstack,
+ \@args,$response);
+ &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);
+ my (@final_awards,@final_msgs,@ans_names);
+ my %answer = &Apache::caparesponse::get_answer();
+ foreach my $ans_name (keys(%answer)) {
+ &Apache::lonxml::debug(" doing $ans_name with ".join(':',@{ $answer{$ans_name}{'answers'} }));
+ ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$ans_name});
+ my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
+ &Apache::lonxml::debug('msgs are'.join(':',@msgs));
+ my ($awards) = split(/:/,$result);
+ my (@awards) = split(/,/,$awards);
+ ($ad,$msg) =
+ &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+ push(@final_awards,$ad);
+ push(@final_msgs,$msg);
+ push(@ans_names,$ans_name);
+ &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
}
- &Apache::lonxml::debug('answer is'.$answer);
- @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);
-
- ($result,my @msgs)=&Apache::run::run("&caparesponse_check_list()",
- $safeeval);
- &Apache::lonxml::debug('msgs are'.join(':',@msgs));
- &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");
- my ($awards)=split(/:/,$result);
- my (@awards) = split(/,/,$awards);
- ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+ my ($ad, $msg, $ans_name) =
+ &Apache::inputtags::finalizeawards(\@final_awards,
+ \@final_msgs,
+ \@ans_names,1);
}
if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') {
- push (@Apache::hint::which,$name);
+ push(@Apache::hint::which,$hint_name);
}
$result='';
} elsif ($target eq 'meta') {
Index: loncom/homework/caparesponse/caparesponse.pm
diff -u loncom/homework/caparesponse/caparesponse.pm:1.202 loncom/homework/caparesponse/caparesponse.pm:1.203
--- loncom/homework/caparesponse/caparesponse.pm:1.202 Fri Dec 15 17:11:43 2006
+++ loncom/homework/caparesponse/caparesponse.pm Mon Dec 18 19:40:39 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.202 2006/12/15 22:11:43 www Exp $
+# $Id: caparesponse.pm,v 1.203 2006/12/19 00:40:39 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,6 +41,8 @@
}
my %answer;
+sub get_answer { return %answer; };
+
my $cur_name;
my $tag_internal_answer_name = 'INTERNAL';
--albertel1166488844--