loncom/homework/lonmaxima.pm - diff

Return to lonmaxima.pm CVS log

Up to [LON-CAPA] / loncom / homework

version 1.36, 2017/03/07 16:04:35	version 1.37, 2017/03/07 18:28:02
Line 155 sub maxima_eval {	Line 155 sub maxima_eval {

sub compareterms {	sub compareterms {
my ($socket,$terma,$termb)=@_;	my ($socket,$terma,$termb)=@_;
if ($terma =~ m{\(\s\([^)]$}) {
return 'Error: blacklisted';
}
my $difference='('.$terma.')-('.$termb.')';	my $difference='('.$terma.')-('.$termb.')';
if (&blacklisted($difference)) { return 'Error: blacklisted'; }	if (&blacklisted($difference)) { return 'Error: blacklisted'; }
my $reply=&maximareply($socket,'trigsimp(trigreduce('.$difference.'));');	my $reply=&maximareply($socket,'trigsimp(trigreduce('.$difference.'));');
Line 169 sub compareterms {	Line 166 sub compareterms {
sub maxima_check {	sub maxima_check {
my ($response,$answer,$reterror) = @_;	my ($response,$answer,$reterror) = @_;
my $socket=&connect();	my $socket=&connect();
my $reply=&compareterms($socket,$response,$answer);	my $reply=&maximareply($socket,$response.';');
	unless ($reply=~/^Error\:/) {
	$reply=&compareterms($socket,$response,$answer);
	}
&disconnect($socket);	&disconnect($socket);
# integer to string mappings come from capaParser.h	# integer to string mappings come from capaParser.h
# 1 maps to 'EXACT_ANS'	# 1 maps to 'EXACT_ANS'