math-exercises 2.2.31 → 2.2.32

package/lib/exercises/math/calculLitteral/equation/binomialsTrinomialsProposedSolutions.js

@@ -42,7 +42,7 @@ const getBinomialsTrinomialsProposedSolutionsQuestion = () => {
     const answer = answertype ? "Oui" : "Non";
     const question = {
         answer: answer,
-        instruction: `Le nombre $${solution}$ est-il une solution de l'équation $${equation.toTex()}$ ?`,
+        instruction: `Le nombre $${solution.toTex()}$ est-il une solution de l'équation $${equation.toTex()}$ ?`,
         keys: [],
         answerFormat: "raw",
         identifiers: {

package/lib/exercises/math/geometry/cartesian/placeAPoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placeAPoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA2B5C,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}
+{"version":3,"file":"placeAPoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA+B5C,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}

package/lib/exercises/math/geometry/cartesian/placeAPoint.js

@@ -4,9 +4,8 @@ exports.testGGBAnswer = void 0;
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const toolBarConstructor_1 = require("../../../../exercises/utils/geogebra/toolBarConstructor");
 const point_1 = require("../../../../math/geometry/point");
-const arrayHasSameElement_1 = require("../../../../utils/arrays/arrayHasSameElement");
-const deleteObjectNamesFromAnswer_1 = require("../../../../geogebra/deleteObjectNamesFromAnswer");
 const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
+const parseGGBPoints_1 = require("../../../../geogebra/parsers/parseGGBPoints");
 const getPlaceAPointQuestion = () => {
     const point = point_1.PointConstructor.random("A");
     const studentGGB = new geogebraConstructor_1.GeogebraConstructor({
@@ -26,8 +25,12 @@ const getPlaceAPointQuestion = () => {
     };
     return question;
 };
-const isGGBAnswerValid = (ans, { ggbAnswer }) => {
-    return (0, arrayHasSameElement_1.arrayHasSameElements)((0, deleteObjectNamesFromAnswer_1.deleteObjectNamesFromAnswer)(ans), ggbAnswer);
+const isGGBAnswerValid = (ans, { ggbAnswer, x, y }) => {
+    const points = (0, parseGGBPoints_1.parseGGBPoints)(ans);
+    if (points.length !== 1)
+        return false;
+    const [xAns, yAns] = points[0].replace("(", "").replace(")", "").split(",");
+    return Math.abs(Number(xAns) - x) < 0.5 && Math.abs(Number(yAns) - y) < 0.5;
 };
 exports.testGGBAnswer = {
     id: "placeAPoint",

package/lib/exercises/math/percent/findStartValueAfterEvolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findStartValueAfterEvolution.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findStartValueAfterEvolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA6FF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAkB9D,CAAC"}
+{"version":3,"file":"findStartValueAfterEvolution.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findStartValueAfterEvolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA0FF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAkB9D,CAAC"}

package/lib/exercises/math/percent/findStartValueAfterEvolution.js

@@ -11,16 +11,16 @@ const getPropositions = (n, { answer, percentRate, vf }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const invCm = 1 - percentRate / 100;
-    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(vf * invCm, 2).frenchify() + "€");
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(vf * invCm, 2).frenchify());
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)((0, randfloat_1.randfloat)(1, 100, 2), 2).frenchify() + "€");
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)((0, randfloat_1.randfloat)(1, 100, 2), 2).frenchify());
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const getAnswer = (identifiers) => {
     const cm = 1 + identifiers.percentRate / 100;
     const vd = (0, round_1.round)(identifiers.vf / cm, 2);
-    return vd.frenchify() + "€";
+    return vd.frenchify();
 };
 const getInstruction = (identifiers) => {
     const evolution = identifiers.percentRate < 0 ? "baisse" : "hausse";
@@ -58,10 +58,10 @@ ${(0, alignTex_1.alignTex)([
   `;
 };
 const getKeys = (identifiers) => {
-    return ["euro"];
+    return [];
 };
 const isAnswerValid = (ans, { answer }) => {
-    return (0, euroParser_1.euroParser)(ans) === answer;
+    return (0, euroParser_1.euroParser)(ans) === answer + "€";
 };
 const getFindStartValueAfterEvolutionQuestion = () => {
     const vf = (0, randfloat_1.randfloat)(1, 100, 2);

package/lib/exercises/math/percent/populationEffectifFromSubPopulation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populationEffectifFromSubPopulation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/populationEffectifFromSubPopulation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA6IF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAgBrE,CAAC"}
+{"version":3,"file":"populationEffectifFromSubPopulation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/populationEffectifFromSubPopulation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA6IF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAiBrE,CAAC"}

package/lib/exercises/math/percent/populationEffectifFromSubPopulation.js

@@ -119,4 +119,5 @@ exports.populationEffectifFromSubPopulation = {
     subject: "Mathématiques",
     getHint,
     getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/python/pyForLoop1Exercise.js

@@ -82,7 +82,7 @@ const generateType6Exercise = () => {
   a=int(input("Entrez un nombre"))
   for i in range(1,${nbIteration + 1}):
       b=b*a  
-  print(a)
+  print(b)
   \`\`\`
   `;
     return { instruction, exoVariable };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "2.2.31",
+  "version": "2.2.32",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [