--- loncom/homework/lonmaxima.pm	2006/12/15 21:10:13	1.8
+++ loncom/homework/lonmaxima.pm	2007/08/14 21:54:54	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Interface routines to MAXIMA CAS
 #
-# $Id: lonmaxima.pm,v 1.8 2006/12/15 21:10:13 www Exp $
+# $Id: lonmaxima.pm,v 1.21 2007/08/14 21:54:54 riegler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ package Apache::lonmaxima;
 use strict;
 use IO::Socket;
 use Apache::lonnet;
+use Apache::response();
 use LONCAPA;
 
 sub connect {
@@ -59,7 +60,11 @@ sub maximareply {
 
 sub blacklisted {
     my ($cmd)=@_;
-    foreach my $forbidden ('save','load','plot','lisp','includ','compil','file','batch','stringout','translat','stout','stin','block','system') {
+    foreach my $forbidden ('save','load','plot','lisp','includ','compil',
+			   'file','batch','stringout','translat','stout',
+			   'stin','block','system','concat','read','inchar',
+			   'outchar','ttyoff','with_stdout','writefile',
+			   'reset') {
 	if ($cmd=~/$forbidden/s) { return 1; }
     } 
     return 0;
@@ -74,35 +79,51 @@ sub runscript {
 	if ($line=~/\w/) { $reply=&maximareply($socket,$line.";\n"); }
 	if ($reply=~/^Error\:/) { return $reply; }
     }
-    $reply=~s/\W//gs;
+    $reply=~s/^\s*//gs;
+    $reply=~s/\s*$//gs;
+    &Apache::lonxml::debug("maxima $fullscript \n reply $reply");
     return $reply;
 }
 
+sub maxima_cas_formula_fix {
+   my ($expression)=@_;
+   return &Apache::response::implicit_multiplication($expression);
+}
+
 sub maxima_run {
     my ($script,$submission,$argument) = @_;
     my $socket=&connect();
-    my $fullscript='';
-    my $submission_index=1;
-    foreach my $submission_component (split(/\s*\,\s*/,$submission)) {
-	$fullscript.="RESPONSE[$submission_index]:$submission_component;\n";
-	$submission_index++;
+    my @submissionarray=split(/\s*\,\s*/,$submission);
+    for (my $i=0;$i<=$#submissionarray;$i++) {
+        my $n=$i+1;
+        my $fixedsubmission=&maxima_cas_formula_fix($submissionarray[$i]);
+        $script=~s/RESPONSE\[$n\]/$fixedsubmission/gs;
     }
-    my $argument_index=1;
-    foreach my $argument_component (@{$argument}) {
-	$fullscript.="LONCAPALIST[$argument_index]:$argument_component;\n";
-	$argument_index++;
+    my @argumentarray=@{$argument};
+    for (my $i=0;$i<=$#argumentarray;$i++) {
+        my $n=$i+1;
+        my $fixedargument=&maxima_cas_formula_fix($argumentarray[$i]);
+        $script=~s/LONCAPALIST\[$n\]/$fixedargument/gs;
     }
-    $fullscript.=$script;
-    my $reply=&runscript($socket,$fullscript);
+    my $reply=&runscript($socket,$script);
     &disconnect($socket);
-    if ($reply=~/^\s*true\s*$/) { return 'EXACT_ANS'; }
-    if ($reply=~/^\s*false\s*/) { return 'INCORRECT'; } 
+    if ($reply=~/^\s*true\s*$/i) { return 'EXACT_ANS'; }
+    if ($reply=~/^\s*false\s*$/i) { return 'INCORRECT'; } 
     return 'BAD_FORMULA';
 }
 
+sub maxima_eval {
+    my ($script) = @_;
+    my $socket=&connect();
+    my $reply=&runscript($socket,$script);
+    &disconnect($socket);
+    return $reply;
+}
+
+
 sub compareterms {
     my ($socket,$terma,$termb)=@_;
-    my $difference=$terma.'-'.$termb;
+    my $difference=$terma.'-('.$termb.')';
     if (&blacklisted($difference)) { return 'Error: blacklisted'; }
     my $reply=&maximareply($socket,'trigsimp(trigreduce('.$difference.'));');
     if ($reply=~/^\s*0\s*$/) { return 'true'; }
@@ -115,7 +136,10 @@ sub maxima_check {
     my $socket=&connect();
     my $reply=&compareterms($socket,$response,$answer);
     &disconnect($socket);
+    # integer to string mappings come from capaParser.h
+    # 1 maps to 'EXACT_ANS'
     if ($reply eq 'true') { return 1; }
+    # 7 maps to 'INCORRECT'
     return 7;
 }