Add complex, calccomplex, and algebraic ntuple and matrix qtypes

Squashed commit of the following:

commit 44045bc7c4297cff7120cea732e40547d13e1f5a
Author: drlippman <[email protected]>
Date:   Mon Nov 4 11:33:08 2024 -0800

    Rebuild min JS

commit 8a08abe5134d3235516ef0c8cc68867f796d0148
Merge: 792194714 6d9168f
Author: drlippman <[email protected]>
Date:   Mon Nov 4 11:31:30 2024 -0800

    Merge branch 'master' into feature.new_matrixntuple_qtypes

commit 792194714e6290728afc3241ba659d5461a405cf
Author: drlippman <[email protected]>
Date:   Mon Nov 4 11:29:18 2024 -0800

    Bug fixes, add sameform to algmatrix

commit b6015818811c54470cd65904da458c6410896652
Author: drlippman <[email protected]>
Date:   Sun Nov 3 16:53:07 2024 -0800

    New question type selector

commit e91177559f675c283a611e86b5e77e87129ab572
Author: drlippman <[email protected]>
Date:   Sat Nov 2 12:41:50 2024 -0700

    More help for new types

commit 7c4e9b643a500b410928b26ea2cc04e4833266c5
Author: drlippman <[email protected]>
Date:   Thu Oct 31 20:01:23 2024 -0700

    Add new types to help

commit b505be27209c06146607008f8e445a28f10165b7
Merge: 7f6136002 85e5106
Author: drlippman <[email protected]>
Date:   Thu Oct 31 15:29:04 2024 -0700

    Merge branch 'master' into feature.new_matrixntuple_qtypes

commit 7f6136002bd7ffe8fddc264e85cd47394440161b
Author: drlippman <[email protected]>
Date:   Wed Oct 30 23:11:55 2024 -0700

    Add amhelpers2 for complex,alg ntuple

commit 443d686bc2f287336550cfd2f5ca4074da9a6680
Author: drlippman <[email protected]>
Date:   Wed Oct 30 19:58:24 2024 -0700

    Add algntuple scoring

commit 1e8e4626a41ff31ac166bb6e735da67cc46e4f4f
Author: drlippman <[email protected]>
Date:   Wed Oct 30 13:33:10 2024 -0700

    Add complexntuple scoring to ntuplescorepart, complex parsing to parseNtuple

commit 4e283e69f8a830f64e66bb0e4b3c8ad1b037ba82
Author: drlippman <[email protected]>
Date:   Wed Oct 30 12:10:59 2024 -0700

    Move complex, ntuple parsing out of scoreparts andinto answerboxhelpers/macros

commit cf487b13fd33cbf3973e4dc4b667b307ca29537b
Author: drlippman <[email protected]>
Date:   Wed Oct 30 10:47:06 2024 -0700

    Add algebraic ntuple answerbox

commit 767713c28582a78a9863cebccdc1726edc99d0ce
Author: drlippman <[email protected]>
Date:   Tue Oct 29 21:29:38 2024 -0700

    Add complexntuple answerbox generator

commit f5cb7627fae1776062a24c42e0e07985945e4106
Author: drlippman <[email protected]>
Date:   Tue Oct 29 21:13:30 2024 -0700

    Consolidate ntupleanswerbox and calculatentupleanswerbox

commit 834d6dd8ebafe168ee413ad2ab0323c7b61664de
Author: drlippman <[email protected]>
Date:   Tue Oct 29 20:56:09 2024 -0700

    Tweak entry tips

commit d51ce7027afc7661f3c1343a93c1f41a2f0bd820
Author: drlippman <[email protected]>
Date:   Tue Oct 29 20:49:51 2024 -0700

    Add frontend processing for algmatrix

commit faa4461891159483be44b4b6685b504437be84f5
Author: drlippman <[email protected]>
Date:   Tue Oct 29 20:47:11 2024 -0700

    Add complexmatrix and calccomplexmatrix. Start on algmatrix.

Author: drlippman

assess2/questions/answerboxes/CalculatedNTupleAnswerBox.php renamed to assess2/questions/answerboxes/AlgebraicNTupleAnswerBox.php

@@ -6,7 +6,7 @@
 
 use Sanitize;
 
-class CalculatedNTupleAnswerBox implements AnswerBox
+class AlgebraicNTupleAnswerBox implements AnswerBox
 {
     private $answerBoxParams;
 
@@ -40,8 +40,8 @@ public function generate(): void
         $preview = '';
         $params = [];
 
-        $optionkeys = ['ansprompt', 'answerboxsize', 'hidepreview', 'answerformat',
-            'answer', 'reqdecimals', 'displayformat', 'readerlabel'];
+        $optionkeys = ['answerboxsize', 'answerformat', 'answer', 'displayformat', 
+            'ansprompt', 'readerlabel', 'hidepreview', 'variables', 'domain'];
         foreach ($optionkeys as $optionkey) {
             ${$optionkey} = getOptionVal($options, $optionkey, $multi, $partnum);
         }
@@ -52,34 +52,44 @@ public function generate(): void
         if ($multi) {$qn = ($qn + 1) * 1000 + $partnum;}
 
         if ($displayformat == 'point') {
-            $tip = _('Enter your answer as a point.  Example: (2,5.5172)') . "<br/>";
-            $shorttip = _('Enter a point');
+            $tip = _('Enter your answer as an algebraic point.  Example: (x,x^2)') . "<br/>";
+            $shorttip = _('Enter an algebraic point');
         } else if ($displayformat == 'pointlist') {
-            $tip = _('Enter your answer a list of points separated with commas.  Example: (1,2), (3.5172,5)') . "<br/>";
-            $shorttip = _('Enter a list of points');
+            $tip = _('Enter your answer a list of algebraic points separated with commas.  Example: (x,x^2), (3,4x)') . "<br/>";
+            $shorttip = _('Enter a list of algebraic points');
         } else if ($displayformat == 'vector') {
-            $tip = _('Enter your answer as a vector.  Example: <2,5.5172>') . "<br/>";
-            $shorttip = _('Enter a vector');
+            $tip = _('Enter your answer as an algebraic vector.  Example: &lt;x,x^2&gt;') . "<br/>";
+            $shorttip = _('Enter an algebraic vector');
         } else if ($displayformat == 'vectorlist') {
-            $tip = _('Enter your answer a list of vectors separated with commas.  Example: <1,2>, <3.5172,5>') . "<br/>";
-            $shorttip = _('Enter a list of vectors');
+            $tip = _('Enter your answer a list of algebraic vectors separated with commas.  Example: &lt;x,x^2&gt;, &lt;3,x&gt;') . "<br/>";
+            $shorttip = _('Enter a list of algebraic vectors');
         } else if ($displayformat == 'set') {
-            $tip = _('Enter your answer as a set of numbers.  Example: {1,2,3}') . "<br/>";
-            $shorttip = _('Enter a set');
+            $tip = _('Enter your answer as a set of algebraic expressions.  Example: {x,x^2,3x}') . "<br/>";
+            $shorttip = _('Enter an algebraic set');
         } else if ($displayformat == 'setlist') {
-            $tip = _('Enter your answer as a list of sets separated with commas.  Example: {1,2,3},{4,5}') . "<br/>";
-            $shorttip = _('Enter a list of sets');
+            $tip = _('Enter your answer as a list of sets separated with commas.  Example: {x,3,x^2},{2x,5}') . "<br/>";
+            $shorttip = _('Enter a list of algebraic sets');
         } else if ($displayformat == 'list') {
-            $tip = _('Enter your answer as a list of n-tuples of numbers separated with commas: Example: (1,2),(3.5172,4)') . "<br/>";
-            $shorttip = _('Enter a list of n-tuples');
+            $tip = _('Enter your answer as a list of n-tuples of algebraic expressions separated with commas: Example: (x,x^2),(3,4x)') . "<br/>";
+            $shorttip = _('Enter a list of algebraic n-tuples');
         } else {
-            $tip = _('Enter your answer as an n-tuple of numbers.  Example: (2,5.5172)') . "<br/>";
-            $shorttip = _('Enter an n-tuple');
+            $tip = _('Enter your answer as an n-tuple of algebraic expressions.  Example: (x,x^2)') . "<br/>";
+            $shorttip = _('Enter an algebraic n-tuple');
         }
-        if ($reqdecimals !== '') {
-            list($reqdecimals, $exactreqdec, $reqdecoffset, $reqdecscoretype) = parsereqsigfigs($reqdecimals);
+        if (in_array('generalcomplex', $ansformats)) {
+            $tip .= _('Your answer can contain complex numbers.') . '<br/>';
         }
-        $tip .= formathint('each value', $ansformats, ($reqdecimals !== '') ? $reqdecimals : null, 'calcntuple');
+        if (!in_array('nosoln', $ansformats) && !in_array('nosolninf', $ansformats)) {
+            $tip .= _('Enter DNE for Does Not Exist');
+        }
+
+        if (empty($variables)) {$variables = "x";}
+        $addvars = [];
+        if (in_array('generalcomplex', $ansformats)) {
+            $addvars[] = 'i';
+        }
+        list($variables, $ofunc, $newdomain, $restrictvartoint) = numfuncParseVarsDomain($variables, $domain, $addvars);
+
 
         $classes = ['text'];
         if ($colorbox != '') {
@@ -97,13 +107,17 @@ public function generate(): void
         ];
         $params['tip'] = $shorttip;
         $params['longtip'] = $tip;
+
         $params['calcformat'] = $answerformat . (($answerformat == '') ? '' : ',') . $displayformat;
         if ($useeqnhelper) {
             $params['helper'] = 1;
         }
         if (empty($hidepreview)) {
             $params['preview'] = !empty($_SESSION['userprefs']['livepreview']) ? 1 : 2;
         }
+        $params['vars'] = $variables;
+        $params['fvars'] = $ofunc;
+        $params['domain'] = $newdomain;
 
         $out .= '<input ' .
         Sanitize::generateAttributeString($attributes) .
@@ -115,7 +129,7 @@ public function generate(): void
             $preview .= _('Preview') . ' <span class="sr-only">' . $this->answerBoxParams->getQuestionIdentifierString() . '</span>';
             $preview .= '</button> &nbsp;';
         }
-        $preview .= "<span id=p$qn></span> ";
+        $preview .= "<span id=p$qn></span>";
 
         $nosolntype = 0;
         if (in_array('nosoln', $ansformats) || in_array('nosolninf', $ansformats)) {
@@ -125,10 +139,15 @@ public function generate(): void
             if ($nosolntype > 0) {
                 $sa = $answer;
             } else {
-                $sa = makeprettydisp($answer);
-                if ($displayformat == 'vector') {
+                if ($GLOBALS['myrights'] > 10 && strpos($answer, '|') !== false) {
+                    echo 'Warning: use abs(x) not |x| in $answer';
+                }
+                $sa = $answer;
+                if ($displayformat == 'vectorlist' || $displayformat == 'vector') {
                     $sa = str_replace(array('<', '>'), array('(:', ':)'), $sa);
                 }
+                $sa = numfuncPrepShowanswer($sa, $variables);
+                $sa = '`' . $sa . '`';
             }
         }
 

assess2/questions/answerboxes/AnswerBoxFactory.php

@@ -6,7 +6,6 @@
 require_once __DIR__ . '/CalculatedComplexAnswerBox.php';
 require_once __DIR__ . '/CalculatedIntervalAnswerBox.php';
 require_once __DIR__ . '/CalculatedMatrixAnswerBox.php';
-require_once __DIR__ . '/CalculatedNTupleAnswerBox.php';
 require_once __DIR__ . '/ChoicesAnswerBox.php';
 require_once __DIR__ . '/ComplexAnswerBox.php';
 require_once __DIR__ . '/DrawingAnswerBox.php';
@@ -18,6 +17,8 @@
 require_once __DIR__ . '/MatrixAnswerBox.php';
 require_once __DIR__ . '/MultipleAnswerAnswerBox.php';
 require_once __DIR__ . '/NTupleAnswerBox.php';
+require_once __DIR__ . '/ComplexNTupleAnswerBox.php';
+require_once __DIR__ . '/AlgebraicNTupleAnswerBox.php';
 require_once __DIR__ . '/NumberAnswerBox.php';
 require_once __DIR__ . '/StringAnswerBox.php';
 require_once __DIR__ . '/ChemEquationAnswerBox.php';
@@ -43,6 +44,9 @@
  * - Drawing: "draw"
  * - N-tuple: "ntuple"
  * - Calculated N-tuple: "calcntuple"
+ * - Complex N-tuple: "complexntuple"
+ * - Calculated Complex N-tuple: "calccomplexntuple"
+ * - Algebraic N-tuple: "algntuple"
  * - Matrix: "matrix"
  * - Calculated Matrix: "calcmatrix"
  * - Complex: "complex"
@@ -81,11 +85,10 @@ public static function getAnswerBoxGenerator(AnswerBoxParams $answerBoxParams):
                 return new CalculatedIntervalAnswerBox($answerBoxParams);
                 break;
             case 'calcmatrix':
+            case 'calccomplexmatrix':
+            case 'algmatrix':
                 return new CalculatedMatrixAnswerBox($answerBoxParams);
                 break;
-            case 'calcntuple':
-                return new CalculatedNTupleAnswerBox($answerBoxParams);
-                break;
             case 'choices':
                 return new ChoicesAnswerBox($answerBoxParams);
                 break;
@@ -110,15 +113,24 @@ public static function getAnswerBoxGenerator(AnswerBoxParams $answerBoxParams):
             case 'matching':
                 return new MatchingAnswerBox($answerBoxParams);
                 break;
+            case 'complexmatrix':
             case 'matrix':
                 return new MatrixAnswerBox($answerBoxParams);
                 break;
             case 'multans':
                 return new MultipleAnswerAnswerBox($answerBoxParams);
                 break;
             case 'ntuple':
+            case 'calcntuple':
                 return new NTupleAnswerBox($answerBoxParams);
                 break;
+            case 'complexntuple':
+            case 'calccomplexntuple':
+                return new ComplexNTupleAnswerBox($answerBoxParams);
+                break;
+            case 'algntuple':
+                return new AlgebraicNTupleAnswerBox($answerBoxParams);
+                break;
             case 'number':
                 return new NumberAnswerBox($answerBoxParams);
                 break;

assess2/questions/answerboxes/CalculatedComplexAnswerBox.php

@@ -81,7 +81,7 @@ public function generate(): void
                 $tip = _('Enter your answer as a complex number in a+bi form.  Example: 2+5i') . "<br/>";
                 $shorttip = _('Enter a complex number');
             }
-            $tip .= formathint('each value',$ansformats,($reqdecimals!=='')?$reqdecimals:null,'calccomplex');
+            $tip .= formathint(_('each value'),$ansformats,($reqdecimals!=='')?$reqdecimals:null,'calccomplex');
         }
 
         $classes = ['text'];

assess2/questions/answerboxes/CalculatedMatrixAnswerBox.php

@@ -42,6 +42,9 @@ public function generate(): void
 
         $optionkeys = ['ansprompt', 'answersize', 'answerboxsize', 'hidepreview', 'answerformat',
             'answer', 'reqdecimals', 'displayformat', 'readerlabel'];
+        if ($anstype === 'algmatrix') {
+            array_push($optionkeys, 'domain', 'variables');
+        }
         foreach ($optionkeys as $optionkey) {
             ${$optionkey} = getOptionVal($options, $optionkey, $multi, $partnum);
         }
@@ -55,7 +58,12 @@ public function generate(): void
             $out .= $ansprompt;
         }
         if (!empty($answersize)) {
-            list($tip, $shorttip) = formathint(_('each element of the matrix'), $ansformats, ($reqdecimals !== '') ? $reqdecimals : null, 'calcmatrix', false, true);
+            if ($anstype === 'algmatrix') {
+                $shorttip = _('Enter an algebraic expression');
+                $tip = _('Enter each element of the matrix as an algebraic expression. Example: 3x^2, x/5, (a+b)/c');
+            } else {
+                list($tip, $shorttip) = formathint(_('each element of the matrix'), $ansformats, ($reqdecimals !== '') ? $reqdecimals : null, $anstype, false, true);
+            }
             //$tip = "Enter each element of the matrix as  number (like 5, -3, 2.2) or as a calculation (like 5/3, 2^3, 5+4)";
 
             if (empty($answerboxsize)) {$answerboxsize = 3;}
@@ -125,8 +133,16 @@ public function generate(): void
             } else {
                 $qnref = ($multi - 1) . '-' . ($qn % 1000);
             }
-            $shorttip = _('Enter your answer as a matrix');
-            $tip = $shorttip . _(', like [(2,3,4),(1,4,5)]') . '<br/>' . formathint(_('each element of the matrix'), $ansformats, ($reqdecimals !== '') ? $reqdecimals : null, 'calcmatrix');
+            if ($anstype === 'calccomplexmatrix') {
+                $shorttip = _('Enter a matrix of complex numbers');
+                $tip = $shorttip . _(', like [(2+i,3,i),(2-i,4,5)]') . '<br/>' . formathint(_('each element of the matrix'), $ansformats, ($reqdecimals !== '') ? $reqdecimals : null, $anstype);
+            } else if ($anstype === 'algmatrix') {
+                $shorttip = _('Enter a matrix of algebraic expressions');
+                $tip = $shorttip . _(', like [(x,2,x^2),(1,3x,5)]');
+            } else {
+                $shorttip = _('Enter your answer as a matrix');
+                $tip = $shorttip . _(', like [(2,3,4),(1,4,5)]') . '<br/>' . formathint(_('each element of the matrix'), $ansformats, ($reqdecimals !== '') ? $reqdecimals : null, $anstype);
+            }
             if (empty($answerboxsize)) {$answerboxsize = 20;}
 
             $classes = ['text'];
@@ -156,13 +172,29 @@ public function generate(): void
             $preview .= '</button> &nbsp;';
         }
         $preview .= "<span id=p$qn></span> ";
+        if ($anstype === 'algmatrix' && in_array('generalcomplex', $ansformats)) {
+            $tip .= '<br>'._('Your answer can contain complex numbers.');
+        }
         $params['tip'] = $shorttip;
         $params['longtip'] = $tip;
         $params['calcformat'] = $answerformat;
         if ($useeqnhelper) {
             $params['helper'] = 1;
         }
 
+        if ($anstype === 'algmatrix') {
+            if (empty($variables)) {$variables = "x";}
+            $addvars = [];
+            if (in_array('generalcomplex', $ansformats)) {
+                $addvars[] = 'i';
+            }
+            list($variables, $ofunc, $newdomain, $restrictvartoint) = numfuncParseVarsDomain($variables, $domain, $addvars);
+    
+            $params['vars'] = $variables;
+            $params['fvars'] = $ofunc;
+            $params['domain'] = $newdomain;
+        }
+
         $nosolntype = 0;
         if (in_array('nosoln', $ansformats) || in_array('nosolninf', $ansformats)) {
             list($out, $answer,$nosolntype) = setupnosolninf($qn, $out, $answer, $ansformats, $la, $ansprompt, $colorbox);