Merge pull request #1734 from maths/iss1723

Support for Maxima 5.48.0 onwards: fixes #1723

Author: sangwinc

doc/en/Developer/Development_track.md

@@ -10,6 +10,7 @@ We use the [github issue tracker](https://github.com/maths/moodle-qtype_stack/is
 Issues with [github milestone 4.13.0](https://github.com/maths/moodle-qtype_stack/issues?q=is%3Aissue+milestone%3A4.13.0) include
 
 1. Remove all "cte" code from Maxima - mostly install.
+2. Support for Maxima 5.47.0, 5.48.0, and 5.49.0.  This includes a fix for issue #1281 from 5.48.0.
 
 --------------------------------------
 ## Testing a node, not a whole tree

doc/en/Installation/index.md

@@ -53,12 +53,17 @@ To check your version of maxima, run `maxima --version`.  If Moodle is set up us
 
 Alternatively, Maxima can also be run on a separate server via [GoeMaxima](https://github.com/mathinstitut/goemaxima) or [MaximaPool](https://github.com/maths/stack_util_maximapool).
 
-Please note
+Please note:
+
+* STACK has been tested on Maxima 5.49.0 and 5.48.0, and earlier versions.
+* As of April 2026, the distributed version of Maxima 5.47.0, e.g. bundled with Debian, is missing the Grobner package which is essential.  You will need to compile Maxima from source. 
+* Maxima 5.40.0 changed the way subscripts were displayed.  We are no longer testing against versions before 5.40.0, so there may be inconsitencies with display of subscripts with other versions.
+
+Old notes:
 
 * Please avoid versions 5.37.x which are known to have a minor bug which affects STACK. In particular with `simp:false`, \(s^{-1}\) is transformed into \(1/s\).  This apparently minor change makes it impossible to distinguish between the two forms.  This causes all sorts of problems.  Do not use Maxima 5.37.1 to 5.37.3.
 * Older versions of Maxima:  in particular, Maxima 5.23.2 has some differences which result in \(1/\sqrt{x} \neq \sqrt{1/x}\), and similar problems.  This means that we have an inconsistency between questions between versions of maxima.   Of course, we can argue about which values of \(x\) make \(1/\sqrt{x} = \sqrt{1/x}\), but currently the unit tests and assumption is that these expressions should be considered to be algebraically equivalent!   So, older versions of Maxima are not supported for a reason.  Please test thoroughly if you try to use an older version, and expect some errors in the mathematical parts of the code.
 * If you install more than one version of Maxima then you will need to tell STACK which version to use.  Otherwise just use the "default" option.
-* Maxima 5.40.0 changed the way subscripts were displayed.  We are no longer testing against versions before 5.40.0, so there may be inconsitencies with display of subscripts with other versions.
 
 Instructions for installing a more recent version of Maxima on CentOS 6 are available on the [Moodle forum](https://moodle.org/mod/forum/discuss.php?d=270956)  (Oct 2014).
 

settings.php

@@ -131,11 +131,12 @@
     get_string('settingcasmaximaversion_desc', 'qtype_stack'),
     null,
     [
-                    '5.40.0' => '5.40.0', '5.41.0' => '5.41.0', '5.42.0' => '5.42.0',
-                    '5.42.1' => '5.42.1', '5.42.2' => '5.42.2',
-                    '5.43.0' => '5.43.0', '5.43.1' => '5.43.1', '5.43.2' => '5.43.2',
-                    '5.44.0' => '5.44.0', '5.46.0' => '5.46.0', '5.47.0' => '5.47.0',
-                    'default' => 'default',
+        '5.40.0' => '5.40.0', '5.41.0' => '5.41.0', '5.42.0' => '5.42.0',
+        '5.42.1' => '5.42.1', '5.42.2' => '5.42.2', '5.43.0' => '5.43.0', 
+        '5.43.1' => '5.43.1', '5.43.2' => '5.43.2', '5.44.0' => '5.44.0', 
+        '5.45.0' => '5.45.0', '5.46.0' => '5.46.0', '5.47.0' => '5.47.0',
+        '5.48.0' => '5.48.0', '5.49.0' => '5.49.0',
+        'default' => 'default',
     ]
 ));
 

stack/cas/connectorhelper.class.php

@@ -251,11 +251,14 @@ public static function stackmaxima_version_healthcheck() {
 
         $usedversion = stack_string('healthchecksstackmaximatooold');
         foreach ($results as $result) {
-            if ($result['key'] != '__stackmaximaversion') {
+            if (array_key_exists('key', $result) && $result['key'] != '__stackmaximaversion') {
                 continue;
             }
 
-            $usedversion = $result['value'];
+            $usedversion = null;
+            if (array_key_exists('value', $result)) {
+                $usedversion = $result['value'];
+            }
             if (self::$config->stackmaximaversion == $usedversion) {
                 return [
                     'healthchecksstackmaximaversionok',
@@ -338,7 +341,6 @@ public static function stackmaxima_genuine_connect() {
 
         // Really make sure there is no cache.
         [$results, $debug] = self::stackmaxima_nocache_call($command);
-
         $success = true;
         $message = [];
         if (empty($results)) {
@@ -376,7 +378,8 @@ public static function stackmaxima_genuine_connect() {
                             'healthuncachedstack_CAS_versionnotchecked',
                             ['actual' => $maximaversionstr]
                         );
-                    } else if ($result['value'] != '"' . $maximaversion . '"') {
+                    } else if (substr($result['value'], 1, strlen($maximaversion)) != $maximaversion) {
+                        // Compiling from source can give things like 5.47.0_dirty.
                         $message[] = stack_string(
                             'healthuncachedstack_CAS_version',
                             ['expected' => $maximaversion, 'actual' => $maximaversionstr]

stack/maxima/intervals.mac

@@ -143,6 +143,7 @@ realset_tex(ex) := block([_a, _b, _c],
         concat("{", tex1(_a), " \\in {",tex1(_b), "}}")
 )$
 texput(realset, realset_tex)$
+texput(%union, "\\bigcup ")$
 
 /* Returns True if p is an element of A. False, otherwise: */
 
@@ -827,7 +828,7 @@ stack_single_variable_solver(ex) := block([v, rs1, rs2],
     if is(ex={}) then return(none),
     if is(ex={v}) then return(all),
     if logic_edgep(ex) then return(ex),
-    if is(equal(ex,oo(-inf,inf))) then return(all),
+    if ev(is(ex=oo(-inf,inf)),simp) then return(all),
 
     rs1:ex,
     rs2:false,
@@ -862,13 +863,13 @@ stack_single_variable_solver_rec(ex, v) := block([r0, r1, r2],
     if inequalityp(ex) then ex:ev(inequality_factor_solve(ex), simp),
 
     if safe_op(ex)="%or" or safe_op(ex)="%and" then block(
-        r0:maplist(lambda([ex2], stack_single_variable_solver_rec(ex2, v)), args(ex)),
+        r0:ev(maplist(lambda([ex2], stack_single_variable_solver_rec(ex2, v)), args(ex)), simp),
         r1:ev(sublist(r0, realset_soft_p), simp),
         r2:ev(sublist(r0, lambda([ex2], not(realset_soft_p(ex2)))), simp)
         ),
+
     if safe_op(ex)="%or" then return(ev(apply("%or", append([interval_tidy(r1)], r2)), simp)),
     if safe_op(ex)="%and" then return(ev(apply("%and", append([interval_intersect_list(r1)], r2)), simp)),
-
     return(ex)
 )$
 

stack/maxima/stackmaxima.mac

@@ -138,7 +138,7 @@ load("stack_logic.lisp");
 load("Ksimplifier.lisp");
 
 /* We don't want to allow people to put boxes round things. */
-box(ex) := ex;
+kill(box);
 
 /* Although this works well in MAXIMA, |'s are not allowed in STACK */
 /* The heuristics to catch the various errors do not work, since | is symmetrical */
@@ -1033,13 +1033,24 @@ set_plot_option([gnuplot_default_term_command, ""]);
 plot(ex, [ra]) :=  /*stack_web_plot*/
     block([simp:true, tfn, tfnp1, tfnp2, tfnp3, afn, ufn, lvs, preamble, sysp, sysr,
         filename, tn, alt, altc, alttext, ral, ralforbid, pltargs, plotfunmake, plotdebug,
-        plotgrid2d, size, psize, plot_size, plot_tags, stack_mtell_quiet, plotpid, margin],
+        plotgrid2d, plotbox, size, psize, plot_size, plot_tags, stack_mtell_quiet, plotpid, margin],
     stack_mtell_quiet:true,
     plotdebug: false,
     /* Check for grid2d  in the plotoptions. */
     plotgrid2d: false,
     if member(grid2d, ra) or member(STACKGRID, ra) then
          plotgrid2d: true,
+    /*******************/
+    /* Check for box.  */
+    plotbox:sublist(ra, lambda([ex], if listp(ex) then is(first(ex) = box) else false)),
+    if emptyp(plotbox) then plotbox:true else block(
+            ra:delete(first(plotbox), ra), 
+            if not(second(first(plotbox))) then plotbox:false
+        ),
+    /* For new versions. */
+    if member(nobox, ra) then plotbox:false,
+    if plotdebug then print("Should plot2d print a box? ", plotbox),
+    /************************************/
     /* Arguments to plot must be lists. */
     ral: sublist(ra, listp), /* The actual arguments used by plot. */
     /* Check expressions to be plotted has/have only one variable. */
@@ -1127,6 +1138,9 @@ set output ", afn),
     /* Add in the command for the grid. */
     if plotgrid2d and MAXIMA_VERSION_NUM>34 then
         ral: append(ral, [grid2d]),
+    /* Add in the command for the nobox. */
+    if not(plotbox) then if MAXIMA_VERSION_NUM>47 then 
+        ral:append(ral, [nobox]) else ral:append(ral, [[box,false]]),
     if plotdebug then print(preamble),
     if PLOT_TERMINAL="svg" then set_plot_option([svg_file, afn]),
     if PLOT_TERMINAL="svg" then
@@ -3446,15 +3460,15 @@ assess(ex1,ex2):=block([ret],
 /* ****************************************************** */
 
 /* A function to create a truth table of an expression ex. */
-truth_table(ex) := block([exs, vars, tab, tt],
+truth_table(ex) := block([exs, vars, tbl, tt],
     vars: ev(sort(listofvars(ex)),simp),
     if length(vars) > 5 then error("truth_table will only print with fewer than 6 variables."),
     /* Store this variable to prevent 2^n re-evaluations of this function. */
     exs: noun_logic_remove(ex),
-    tab: maplist(lambda([ex2], zip_with("=", vars, ex2)), truth_table_allvars(vars)),
-    tab: maplist(lambda([ex2], append(maplist('rhs, ex2), [ev(logic_simp(exs), ex2)])), tab),
-    tab: append([append(vars, [ex])], tab),
-    apply('table, tab)
+    tbl: maplist(lambda([ex2], zip_with("=", vars, ex2)), truth_table_allvars(vars)),
+    tbl: maplist(lambda([ex2], append(maplist('rhs, ex2), [ev(logic_simp(exs), ex2)])), tbl),
+    tbl: append([append(vars, [ex])], tbl),
+    apply('table, tbl)
 )$
 
 truth_table_allvars(l) := block(

tests/answertest_general_cas_test.php

@@ -525,12 +525,22 @@ public function test_stack_maxima_translate_algequiv_matrix(): void {
         $this->assertFalse($at->do_test());
         $this->assertEquals(0, $at->get_at_mark());
 
-        $fb = 'stack_trans(\'ATMatrix_wrongentries\' , ' .
+        if ($this->adapt_to_new_maxima('5.48.0')) {
+            $fb = 'stack_trans(\'ATMatrix_wrongentries\' , ' .
+                '!quot!\[\left[\begin{array}{cc} 1 & 2 \\\\ {\color{red}{\underline{2}}} & 4 \end{array}\right]\]!quot! );';
+        } else {
+            $fb = 'stack_trans(\'ATMatrix_wrongentries\' , ' .
                 '!quot!\[ \left[\begin{array}{cc} 1 & 2 \\\\ {\color{red}{\underline{2}}} & 4 \end{array}\right]\]!quot! );';
+        }
         $this->assertEquals(stack_maxima_translate($fb), $at->get_at_feedback());
 
-        $fbt = 'The entries underlined in red below are those that are incorrect. ' .
+        if ($this->adapt_to_new_maxima('5.48.0')) {
+            $fbt = 'The entries underlined in red below are those that are incorrect. ' .
+                '\[\left[\begin{array}{cc} 1 & 2 \\\\ {\color{red}{\underline{2}}} & 4 \end{array}\right]\]';
+        } else {
+            $fbt = 'The entries underlined in red below are those that are incorrect. ' .
                 '\[ \left[\begin{array}{cc} 1 & 2 \\\\ {\color{red}{\underline{2}}} & 4 \end{array}\right]\]';
+        }
         $this->assert_content_with_maths_equals($fbt, $at->get_at_feedback());
     }
 
@@ -541,11 +551,21 @@ public function test_stack_maxima_int_feedback_1(): void {
         $this->assertFalse($at->do_test());
         $this->assertEquals(0, $at->get_at_mark());
 
-        $fbt = 'The derivative of your answer should be equal to the expression that you were asked to integrate, that was: '.
-               '\[\frac{e^{5\cdot x+7}}{5}+\frac{\left(5\cdot e^7\cdot x-e^7\right) \cdot e^{5\cdot x}}{5}\] '.
-               'In fact, the derivative of your answer, with respect to \(x\) is: '.
-               '\[5\cdot e^{5\cdot x+7}+5\cdot \left(5\cdot e^7\cdot x-e^7\right) \cdot e^{5\cdot x}\] '.
-               'so you must have done something wrong!';
+        if ($this->adapt_to_new_maxima('5.48.0')) {
+            $fbt = 'The derivative of your answer should be equal to the expression that you were ' .
+                'asked to integrate, that was: ' .
+                '\[\frac{e^{5\cdot x}\cdot \left(5\cdot e^7\cdot x-e^7\right)}{5}+\frac{e^{5\cdot x+7}}{5}\] '.
+                'In fact, the derivative of your answer, with respect to \(x\) is: '.
+                '\[5\cdot e^{5\cdot x}\cdot \left(5\cdot e^7\cdot x-e^7\right)+5\cdot e^{5\cdot x+7}\] '.
+                'so you must have done something wrong!';
+        } else {
+            $fbt = 'The derivative of your answer should be equal to the expression that you were ' .
+                'asked to integrate, that was: ' .
+                '\[\frac{e^{5\cdot x+7}}{5}+\frac{\left(5\cdot e^7\cdot x-e^7\right) \cdot e^{5\cdot x}}{5}\] '.
+                'In fact, the derivative of your answer, with respect to \(x\) is: '.
+                '\[5\cdot e^{5\cdot x+7}+5\cdot \left(5\cdot e^7\cdot x-e^7\right) \cdot e^{5\cdot x}\] '.
+                'so you must have done something wrong!';
+        }
         $this->assert_content_with_maths_equals($fbt, $at->get_at_feedback());
     }
 
@@ -556,10 +576,19 @@ public function test_stack_maxima_int_feedback_2(): void {
         $this->assertFalse($at->do_test());
         $this->assertEquals(0, $at->get_at_mark());
 
-        $fbt = 'The derivative of your answer should be equal to the expression that you were asked to integrate, that was: '.
-               '\[x\cdot e^{5\cdot x+7}\] In fact, the derivative of your answer, with respect to \(x\) is: '.
-               '\[5\cdot e^{5\cdot x+7}+5\cdot \left(5\cdot e^7\cdot x-e^7\right) \cdot e^{5\cdot x}\] '.
-               'so you must have done something wrong!';
+        if ($this->adapt_to_new_maxima('5.48.0')) {
+            $fbt = 'The derivative of your answer should be equal to the expression that you ' .
+                'were asked to integrate, that was: \[x\cdot e^{5\cdot x+7}\] ' .
+                'In fact, the derivative of your answer, with respect to \(x\) is: ' .
+                '\[5\cdot e^{5\cdot x}\cdot \left(5\cdot e^7\cdot x-e^7\right)+5\cdot e^{5\cdot x+7}\] '.
+                'so you must have done something wrong!';
+        } else {
+            $fbt = 'The derivative of your answer should be equal to the expression that you ' .
+                'were asked to integrate, that was: \[x\cdot e^{5\cdot x+7}\] ' .
+                'In fact, the derivative of your answer, with respect to \(x\) is: ' .
+                '\[5\cdot e^{5\cdot x+7}+5\cdot \left(5\cdot e^7\cdot x-e^7\right) \cdot e^{5\cdot x}\] ' .
+                'so you must have done something wrong!';
+        }
         $this->assert_content_with_maths_equals($fbt, $at->get_at_feedback());
     }
 

tests/cassession2_test.php

@@ -2197,7 +2197,11 @@ public function test_union_tex(): void {
             '\left( 1,\, 2\right) \cup \left( 3,\, 4\right) \cup \left( 4,\, 5\right)',
         ];
         $cases[] = ['%union(a,b+1,d)', 'a \cup \left(b+1\right) \cup d'];
-        $cases[] = ['%union({5,6})', '\left \{5 , 6 \right \}'];
+        if ($this->adapt_to_new_maxima('5.47.0')) {
+            $cases[] = ['%union({5,6})', '\bigcup \left(\left \{5 , 6 \right \}\right)'];
+        } else {
+            $cases[] = ['%union({5,6})', '\left \{5 , 6 \right \}'];
+        }
 
         $cases[] = ['%intersection(a,b,c)', 'a \cap b \cap c'];
         $cases[] = [
@@ -3305,7 +3309,13 @@ public function test_let_matrix(): void {
         $session->instantiate();
         $this->assertTrue($session->is_instantiated());
         $p = $session->get_by_key('p');
-        $this->assertEquals('X^3-3*X^2+3*X-1', $p->get_value());
+        if ($this->adapt_to_new_maxima('5.47.0')) {
+            // Change in Maxima 5.48.0.
+            $this->assertEquals('X^3-3*X^2+3*X-I^3', $p->get_value());
+        } else {
+            // Known edge case.
+            $this->assertEquals('X^3-3*X^2+3*X-1', $p->get_value());
+        }
     }
 
     public function test_unary_minus_sort(): void {

tests/castext_test.php

@@ -1453,9 +1453,6 @@ public function test_numerical_display_float_scientific(): void {
      */
     public function test_numerical_display_float_scientific_small(): void {
 
-        // On old Maxima, you get back \(9.999999999999999e-7\).
-        $this->skip_if_old_maxima('5.32.1');
-
         // For some reason 5.41.0 returns \(9.999999999999999e-7\) too.
         $this->skip_if_new_maxima('5.40.0');
 
@@ -3139,7 +3136,7 @@ public function test_include_chemistry(): void {
 
         $options = new stack_options();
 
-        $vars = 'stack_include("contribl://chemistry.mac");';
+        $vars = "stack_include_contrib(\"chemistry.mac\");";
         $at1 = new stack_cas_keyval($vars, $options, 123);
         $this->assertTrue($at1->get_valid());