Remove roots from derivative exercises

HildoBijl · Mar 18, 2024 · 34f3f50 · 34f3f50
1 parent 1d1cb6b
commit 34f3f50
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/.../mathematics/derivatives/combinedRules/applyChainRule/applyChainRuleElementaryAndBasic.js b/.../mathematics/derivatives/combinedRules/applyChainRule/applyChainRuleElementaryAndBasic.js
@@ -15,7 +15,7 @@ addSetupFromSteps(metaData)
 
 function generateState() {
 	const x = selectRandomly(variableSet)
-	const [f, g1, g2] = getRandomElementaryFunctions(3, false, false, false).map(func => func.substitute('x', x))
+	const [f, g1, g2] = getRandomElementaryFunctions(3, false, false, false, false).map(func => func.substitute('x', x))
 	const c = getRandomInteger(-12, 12, [0])
 	return { f, c, g1, g2 }
 }

diff --git a/...ntent/mathematics/derivatives/combinedRules/applyChainRule/applyChainRuleTwoElementary.js b/...ntent/mathematics/derivatives/combinedRules/applyChainRule/applyChainRuleTwoElementary.js
@@ -16,7 +16,7 @@ addSetupFromSteps(metaData)
 
 function generateState() {
 	const x = selectRandomly(variableSet)
-	const [fRaw, g] = getRandomElementaryFunctions(2, false, false, false).map(func => func.substitute('x', x))
+	const [fRaw, g] = getRandomElementaryFunctions(2, false, false, false, false).map(func => func.substitute('x', x))
 	const c = getRandomInteger(-12, 12, [0])
 	const f = fRaw.multiply(c, true).basicClean()
 	return { f, g }

diff --git a/...hematics/derivatives/combinedRules/applyProductRule/applyProductRuleElementaryAndBasic.js b/...hematics/derivatives/combinedRules/applyProductRule/applyProductRuleElementaryAndBasic.js
@@ -15,7 +15,7 @@ addSetupFromSteps(metaData)
 
 function generateState() {
 	const x = selectRandomly(variableSet)
-	const [f, g1, g2] = getRandomElementaryFunctions(3, false).map(func => func.substitute('x', x))
+	const [f, g1, g2] = getRandomElementaryFunctions(3, false, false, true, false).map(func => func.substitute('x', x))
 	const c = getRandomInteger(-12, 12, [0])
 	return { f, c, g1, g2 }
 }

diff --git a/...t/mathematics/derivatives/combinedRules/applyProductRule/applyProductRuleTwoElementary.js b/...t/mathematics/derivatives/combinedRules/applyProductRule/applyProductRuleTwoElementary.js
@@ -16,7 +16,7 @@ addSetupFromSteps(metaData)
 
 function generateState() {
 	const x = selectRandomly(variableSet)
-	const [fRaw, g] = getRandomElementaryFunctions(2, false).map(func => func.substitute('x', x))
+	const [fRaw, g] = getRandomElementaryFunctions(2, false, false, true, false).map(func => func.substitute('x', x))
 	const c = getRandomInteger(-12, 12, [0])
 	const f = fRaw.multiply(c, true).basicClean()
 	return { f, g }

diff --git a/...matics/derivatives/combinedRules/applyQuotientRule/applyQuotientRuleElementaryAndBasic.js b/...matics/derivatives/combinedRules/applyQuotientRule/applyQuotientRuleElementaryAndBasic.js
@@ -15,8 +15,7 @@ addSetupFromSteps(metaData)
 
 function generateState() {
 	const x = selectRandomly(variableSet)
-	const [f1, f2] = getRandomElementaryFunctions(2, false, false).map(func => func.substitute('x', x))
-	const [g] = getRandomElementaryFunctions(1, false, false).map(func => func.substitute('x', x))
+	const [f1, f2, g] = getRandomElementaryFunctions(3, false, false, true, false).map(func => func.substitute('x', x))
 	const c = getRandomInteger(-12, 12, [0])
 	return { c, f1, f2, g }
 }

diff --git a/...mathematics/derivatives/combinedRules/applyQuotientRule/applyQuotientRuleTwoElementary.js b/...mathematics/derivatives/combinedRules/applyQuotientRule/applyQuotientRuleTwoElementary.js
@@ -16,7 +16,7 @@ addSetupFromSteps(metaData)
 
 function generateState() {
 	const x = selectRandomly(variableSet)
-	const [fRaw, g] = getRandomElementaryFunctions(2, false, false).map(func => func.substitute('x', x))
+	const [fRaw, g] = getRandomElementaryFunctions(2, false, false, true, false).map(func => func.substitute('x', x))
 	const c = getRandomInteger(-12, 12, [0])
 	const f = fRaw.multiply(c, true).basicClean()
 	return { f, g }

diff --git a/shared/eduContent/mathematics/derivatives/tools/getRandomFunction.js b/shared/eduContent/mathematics/derivatives/tools/getRandomFunction.js
@@ -1,13 +1,17 @@
 const { getRandomInteger, selectRandomly, getRandomIndices } = require('../../../../util')
 const { asExpression, Integer, Fraction } = require('../../../../CAS')
 
-function getRandomElementaryFunctions(num = 1, includeConstant = false, includeDivision = true, includeX = true) {
+function getRandomElementaryFunctions(num = 1, includeConstant = false, includeDivision = true, includeX = true, includeRoots = true) {
 	// Determine the indices of the elementary functions that we use.
 	const weights = [3, 9, 5, 3, 1, 2, 2, 2, 1, 2, 1]
 	if (!includeConstant)
 		weights[0] = 0
 	if (!includeDivision)
 		weights[2] = 0
+	if (!includeRoots) {
+		weights[3] = 0
+		weights[4] = 0
+	}
 	const indices = getRandomIndices(weights.length, num, true, weights)
 
 	// Set up the respective elementary functions.