Skip to content

Patch AnswerHints #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pstaabp merged 4 commits into from
Jun 5, 2022
Merged

Patch AnswerHints #680

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cf8cd4
Patch AnswerHints so that if a subroutine in the list "dies" there will
taniwallach May 24, 2022
ddcc42c
Provide an error message as the result message when a subroutine
taniwallach May 26, 2022
daec8d9
perltidy macros/answerHints.pl
taniwallach May 26, 2022
feb490c
Fix a serious bug discovered by Glenn Rice - incorrect handling if the
taniwallach Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 94 additions & 68 deletions macros/answerHints.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,59 +113,81 @@ =head1 AnswerHints()

=cut

sub _answerHints_init {}
sub _answerHints_init { }

sub AnswerHints {
return (sub {
my $ans = shift; $ans->{_filter_name} = "Answer Hints Post Filter";
my $correct = $ans->{correct_value};
my $student = $ans->{student_value};
Value::Error("AnswerHints can only be used with MathObjects answer checkers") unless ref($correct);
return $ans unless ref($student);
my $context = $correct->context;
my $hash = $context->{answerHash};
$context->{answerHash} = $ans;
my $processPreview = $correct->getFlag('answerHintsProcessPreview', 0);
$context->{answerHash} = $hash;

while (@_) {
my $wrongList = shift; my $message = shift; my @options;
($message,@options) = @{$message} if ref($message) eq 'ARRAY';
my %options = (
checkCorrect => 0,
replaceMessage => 0,
checkTypes => 1,
processPreview => $processPreview,
score => undef,
cmp_options => [],
@options,
);
next if $options{checkTypes} && $correct->type ne $student->type;
next if !$options{processPreview} && $ans->{isPreview};
$wrongList = [$wrongList] unless ref($wrongList) eq 'ARRAY';
foreach my $wrong (@{$wrongList}) {
if (ref($wrong) eq 'CODE') {
if (($ans->{score} < 1 || $options{checkCorrect}) &&
($ans->{ans_message} eq "" || $options{replaceMessage}) &&
&$wrong($correct,$student,$ans)) {
$ans->{ans_message} = $ans->{error_message} = $message;
$ans->{score} = $options{score} if defined $options{score};
last;
}
} else {
$wrong = Value::makeValue($wrong);
if (($ans->{score} < 1 || $options{checkCorrect} || AnswerHints::Compare($correct,$wrong,$ans)) &&
($ans->{ans_message} eq "" || $options{replaceMessage}) &&
AnswerHints::Compare($wrong,$student,$ans,@{$options{cmp_options}})) {
$ans->{ans_message} = $ans->{error_message} = $message;
$ans->{score} = $options{score} if defined $options{score};
last;
}
}
}
}
return $ans;
},@_);
return (
sub {
my $ans = shift;
$ans->{_filter_name} = "Answer Hints Post Filter";
my $correct = $ans->{correct_value};
my $student = $ans->{student_value};
Value::Error("AnswerHints can only be used with MathObjects answer checkers") unless ref($correct);
return $ans unless ref($student);
my $context = $correct->context;
my $hash = $context->{answerHash};
$context->{answerHash} = $ans;
my $processPreview = $correct->getFlag('answerHintsProcessPreview', 0);
$context->{answerHash} = $hash;

while (@_) {
my $wrongList = shift;
my $message = shift;
my @options;
($message, @options) = @{$message} if ref($message) eq 'ARRAY';
my %options = (
checkCorrect => 0,
replaceMessage => 0,
checkTypes => 1,
processPreview => $processPreview,
score => undef,
cmp_options => [],
@options,
);
next if $options{checkTypes} && $correct->type ne $student->type;
next if !$options{processPreview} && $ans->{isPreview};
$wrongList = [$wrongList] unless ref($wrongList) eq 'ARRAY';

foreach my $wrong (@{$wrongList}) {
if (ref($wrong) eq 'CODE') {
if ( ($ans->{score} < 1 || $options{checkCorrect})
&& ($ans->{ans_message} eq "" || $options{replaceMessage}))
{
# Make the call to run the function inside an eval to trap errors
my $myResult = 0;
eval { $myResult = &$wrong($correct, $student, $ans); 1; } or do {
warn "An error occurred in this problem.";
last;
};
if ($myResult) {
$ans->{ans_message} = $ans->{error_message} = $message;
$ans->{score} = $options{score} if defined $options{score};
last;
}
}
} else {
$wrong = Value::makeValue($wrong);
if (
(
$ans->{score} < 1
|| $options{checkCorrect}
|| AnswerHints::Compare($correct, $wrong, $ans)
)
&& ($ans->{ans_message} eq "" || $options{replaceMessage})
&& AnswerHints::Compare($wrong, $student, $ans, @{ $options{cmp_options} })
)
{
$ans->{ans_message} = $ans->{error_message} = $message;
$ans->{score} = $options{score} if defined $options{score};
last;
}
}
}
}
return $ans;
},
@_
);
}

package AnswerHints;
Expand All @@ -175,23 +197,27 @@ package AnswerHints;
# and returns true if the two values match and false otherwise.
#
sub Compare {
my $self = shift; my $other = shift; my $ans = shift;
$ans = bless {%{$ans},@_}, ref($ans); # make a copy
$ans->{typeError} = 0; $ans->{ans_message} = $ans->{error_message} = ""; $ans->{score} = 0;
if (sprintf("%p",$self) ne sprintf("%p",$ans->{correct_value})) {
$ans->{correct_ans} = $self->string;
$ans->{correct_value} = $self;
$ans->{correct_formula} = Value->Package("Formula")->new($self);
}
if (sprintf("%p",$other) ne sprintf("%p",$ans->{student_value})) {
$ans->{student_ans} = $other->string;
$ans->{student_value} = $other;
$ans->{student_formula} = Value->Package("Formula")->new($other);
}
$self->cmp_preprocess($ans);
$self->cmp_equal($ans);
$self->cmp_postprocess($ans) if !$ans->{error_message} && !$ans->{typeError};
return $ans->{score} >= 1;
my $self = shift;
my $other = shift;
my $ans = shift;
$ans = bless { %{$ans}, @_ }, ref($ans); # make a copy
$ans->{typeError} = 0;
$ans->{ans_message} = $ans->{error_message} = "";
$ans->{score} = 0;
if (sprintf("%p", $self) ne sprintf("%p", $ans->{correct_value})) {
$ans->{correct_ans} = $self->string;
$ans->{correct_value} = $self;
$ans->{correct_formula} = Value->Package("Formula")->new($self);
}
if (sprintf("%p", $other) ne sprintf("%p", $ans->{student_value})) {
$ans->{student_ans} = $other->string;
$ans->{student_value} = $other;
$ans->{student_formula} = Value->Package("Formula")->new($other);
}
$self->cmp_preprocess($ans);
$self->cmp_equal($ans);
$self->cmp_postprocess($ans) if !$ans->{error_message} && !$ans->{typeError};
return $ans->{score} >= 1;
}

1;