add lcm math operator (#251)

Doenet · Oct 30, 2024 · 50dc57b · 50dc57b
1 parent 0909ca2
commit 50dc57b
Show file tree

Hide file tree

Showing 10 changed files with 3,153 additions and 476 deletions.
diff --git a/packages/doenetml-worker/src/components/BooleanList.js b/packages/doenetml-worker/src/components/BooleanList.js
@@ -155,9 +155,6 @@ export default class BooleanList extends CompositeComponent {
         };
 
         stateVariableDefinitions.booleans = {
-            shadowingInstructions: {
-                createComponentOfType: "boolean",
-            },
             isArray: true,
             entryPrefixes: ["boolean"],
             stateVariablesDeterminingDependencies: ["childNameByComponent"],

diff --git a/packages/doenetml-worker/src/components/MathList.js b/packages/doenetml-worker/src/components/MathList.js
@@ -277,9 +277,6 @@ export default class MathList extends CompositeComponent {
         };
 
         stateVariableDefinitions.maths = {
-            shadowingInstructions: {
-                createComponentOfType: "math",
-            },
             isArray: true,
             entryPrefixes: ["math"],
             stateVariablesDeterminingDependencies: [

diff --git a/packages/doenetml-worker/src/components/MathOperators.js b/packages/doenetml-worker/src/components/MathOperators.js
@@ -1118,6 +1118,45 @@ export class Gcd extends MathBaseOperator {
     }
 }
 
+export class Lcm extends MathBaseOperator {
+    static componentType = "lcm";
+
+    static returnStateVariableDefinitions() {
+        let stateVariableDefinitions = super.returnStateVariableDefinitions();
+
+        stateVariableDefinitions.numericOperator = {
+            returnDependencies: () => ({}),
+            definition: () => ({
+                setValue: {
+                    numericOperator: function (inputs) {
+                        if (inputs.every(Number.isInteger)) {
+                            return lcm(...inputs);
+                        }
+                        return NaN;
+                    },
+                },
+            }),
+        };
+
+        stateVariableDefinitions.mathOperator = {
+            returnDependencies: () => ({}),
+            definition: () => ({
+                setValue: {
+                    mathOperator: function (inputs) {
+                        return me.fromAst([
+                            "apply",
+                            "lcm",
+                            ["tuple", ...inputs.map((x) => x.tree)],
+                        ]);
+                    },
+                },
+            }),
+        };
+
+        return stateVariableDefinitions;
+    }
+}
+
 export class ExtractMath extends MathBaseOperatorOneInput {
     static componentType = "extractMath";
 
@@ -1335,3 +1374,13 @@ function gcd(x, y, ...z) {
     }
     return gcd(y, x % y, ...z);
 }
+
+function lcm(...z) {
+    let prod = z.reduce((a, c) => a * c, 1);
+
+    let gcdArgs = z.map((v) => prod / v);
+
+    let g = gcd(...gcdArgs);
+
+    return prod / g;
+}
diff --git a/packages/doenetml-worker/src/components/NumberList.js b/packages/doenetml-worker/src/components/NumberList.js
@@ -120,10 +120,6 @@ export default class NumberList extends CompositeComponent {
         };
 
         stateVariableDefinitions.mergeMathLists = {
-            public: true,
-            shadowingInstructions: {
-                createComponentOfType: "boolean",
-            },
             returnDependencies: () => ({
                 mergeMathListsAttr: {
                     dependencyType: "attributeComponent",
@@ -253,9 +249,6 @@ export default class NumberList extends CompositeComponent {
         };
 
         stateVariableDefinitions.numbers = {
-            shadowingInstructions: {
-                createComponentOfType: "number",
-            },
             isArray: true,
             entryPrefixes: ["number"],
             stateVariablesDeterminingDependencies: [

diff --git a/packages/doenetml-worker/src/components/TextList.js b/packages/doenetml-worker/src/components/TextList.js
@@ -158,9 +158,6 @@ export default class TextList extends CompositeComponent {
         };
 
         stateVariableDefinitions.texts = {
-            shadowingInstructions: {
-                createComponentOfType: "text",
-            },
             isArray: true,
             entryPrefixes: ["text"],
             stateVariablesDeterminingDependencies: ["childNameByComponent"],

diff --git a/packages/doenetml-worker/src/test/tagSpecific/mathoperators.test.ts b/packages/doenetml-worker/src/test/tagSpecific/mathoperators.test.ts
@@ -7569,23 +7569,43 @@ describe("Math operator tests", async () => {
     it("gcd", async () => {
         let core = await createTestCore({
             doenetML: `
-      <gcd><number>135</number><number>81</number></gcd>
-      <gcd>135 81 63</gcd>
-      <gcd>x y z</gcd>
+      <gcd name="gcd1"><number>135</number><number>81</number></gcd>
+      <gcd name="gcd2">135 81 63</gcd>
+      <gcd name="gcd3">x y z</gcd>
       `,
         });
 
         let stateVariables = await returnAllStateVariables(core);
 
-        expect(stateVariables["/_gcd1"].stateValues.value.tree).eq(27);
-        expect(stateVariables["/_gcd2"].stateValues.value.tree).eq(9);
-        expect(stateVariables["/_gcd3"].stateValues.value.tree).eqls([
+        expect(stateVariables["/gcd1"].stateValues.value.tree).eq(27);
+        expect(stateVariables["/gcd2"].stateValues.value.tree).eq(9);
+        expect(stateVariables["/gcd3"].stateValues.value.tree).eqls([
             "apply",
             "gcd",
             ["tuple", "x", "y", "z"],
         ]);
     });
 
+    it("lcm", async () => {
+        let core = await createTestCore({
+            doenetML: `
+      <lcm name="lcm1"><number>135</number><number>81</number></lcm>
+      <lcm name="lcm2">135 81 63</lcm>
+      <lcm name="lcm3">x y z</lcm>
+      `,
+        });
+
+        let stateVariables = await returnAllStateVariables(core);
+
+        expect(stateVariables["/lcm1"].stateValues.value.tree).eq(405);
+        expect(stateVariables["/lcm2"].stateValues.value.tree).eq(2835);
+        expect(stateVariables["/lcm3"].stateValues.value.tree).eqls([
+            "apply",
+            "lcm",
+            ["tuple", "x", "y", "z"],
+        ]);
+    });
+
     it("extract parts of math expression", async () => {
         let core = await createTestCore({
             doenetML: `

diff --git a/packages/doenetml-worker/src/test/tagSpecific/selectsamplerandomnumbers.test.ts b/packages/doenetml-worker/src/test/tagSpecific/selectsamplerandomnumbers.test.ts
@@ -548,7 +548,7 @@ describe("SelectRandomNumbers and SampleRandomNumbers tag tests", async () => {
                 numRepetitions: 80,
                 validValues: vals,
                 allowedMeanMid: mean,
-                allowedMeanSpread: 0.5,
+                allowedMeanSpread: 0.6,
                 allowedVarianceMid: variance,
                 allowedVarianceSpread: 1,
                 expectedMean: mean,

diff --git a/packages/static-assets/scripts/get-schema.ts b/packages/static-assets/scripts/get-schema.ts
@@ -303,8 +303,6 @@ export function getSchema() {
                     }),
                 );
             } else {
-                let foundMatch = false;
-
                 for (let prefix of arrayEntryPrefixesLongestToShortest) {
                     if (
                         aliasTargetName.substring(0, prefix.length) === prefix
@@ -338,18 +336,9 @@ export function getSchema() {
                             }),
                         );
 
-                        foundMatch = true;
                         break;
                     }
                 }
-
-                if (!foundMatch) {
-                    properties.push({
-                        name: aliasName,
-                        type: "unknown",
-                        isArray: false,
-                    });
-                }
             }
         }