math-exercises 3.0.21 → 3.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/exercises/exercise.d.ts +2 -0
- package/lib/exercises/exercise.d.ts.map +1 -1
- package/lib/exercises/math/calculLitteral/equation/multiplicationEquation.d.ts.map +1 -1
- package/lib/exercises/math/calculLitteral/equation/multiplicationEquation.js +60 -28
- package/lib/exercises/math/derivation/derivative/secondDegreeDerivative.d.ts.map +1 -1
- package/lib/exercises/math/derivation/derivative/secondDegreeDerivative.js +5 -3
- package/lib/exercises/math/derivation/derivative/thirdDegreeDerivative.d.ts.map +1 -1
- package/lib/exercises/math/derivation/derivative/thirdDegreeDerivative.js +5 -3
- package/lib/exercises/math/functions/affines/algebricExpressionOfAffine.d.ts.map +1 -1
- package/lib/exercises/math/functions/affines/algebricExpressionOfAffine.js +14 -3
- package/lib/exercises/math/functions/exponential/expFactorization.d.ts.map +1 -1
- package/lib/exercises/math/functions/exponential/expFactorization.js +5 -2
- package/lib/exercises/math/geometry/cartesian/pointCoordinates.d.ts.map +1 -1
- package/lib/exercises/math/geometry/cartesian/pointCoordinates.js +30 -29
- package/lib/exercises/math/geometry/euclidian/index.d.ts +1 -1
- package/lib/exercises/math/geometry/euclidian/index.d.ts.map +1 -1
- package/lib/exercises/math/geometry/euclidian/index.js +1 -2
- package/lib/exercises/math/geometry/euclidian/pythagoreOrThales.d.ts +9 -0
- package/lib/exercises/math/geometry/euclidian/pythagoreOrThales.d.ts.map +1 -1
- package/lib/exercises/math/geometry/euclidian/pythagoreOrThales.js +205 -187
- package/lib/exercises/math/geometry/index.d.ts +1 -0
- package/lib/exercises/math/geometry/index.d.ts.map +1 -1
- package/lib/exercises/math/geometry/index.js +1 -1
- package/lib/exercises/math/geometry/thales/thalesCalcul.d.ts.map +1 -1
- package/lib/exercises/math/geometry/thales/thalesCalcul.js +1 -1
- package/lib/exercises/math/primitive/polynomialPrimitive.d.ts.map +1 -1
- package/lib/exercises/math/primitive/polynomialPrimitive.js +47 -16
- package/lib/exercises/math/probaStat/probaFromTableWithContext.js +3 -3
- package/lib/exercises/math/spaceGeometry/basis/index.d.ts +2 -0
- package/lib/exercises/math/spaceGeometry/basis/index.d.ts.map +1 -0
- package/lib/exercises/math/spaceGeometry/basis/index.js +1 -0
- package/lib/exercises/math/spaceGeometry/basis/spaceCoordinatesInPrism.d.ts +11 -0
- package/lib/exercises/math/spaceGeometry/basis/spaceCoordinatesInPrism.d.ts.map +1 -0
- package/lib/exercises/math/spaceGeometry/basis/spaceCoordinatesInPrism.js +141 -0
- package/lib/exercises/math/spaceGeometry/index.d.ts +1 -0
- package/lib/exercises/math/spaceGeometry/index.d.ts.map +1 -1
- package/lib/exercises/math/spaceGeometry/index.js +1 -0
- package/lib/exercises/math/trigonometry/calculateCosSinAndTan.d.ts.map +1 -1
- package/lib/exercises/math/trigonometry/calculateCosSinAndTan.js +38 -26
- package/lib/exercises/utils/geogebra/toGGBCommandsProps.d.ts +1 -0
- package/lib/exercises/utils/geogebra/toGGBCommandsProps.d.ts.map +1 -1
- package/lib/geogebra/geogebraConstructor.d.ts +2 -0
- package/lib/geogebra/geogebraConstructor.d.ts.map +1 -1
- package/lib/geogebra/geogebraConstructor.js +6 -0
- package/lib/index.d.ts +11 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/math/geometry/segment.d.ts +6 -2
- package/lib/math/geometry/segment.d.ts.map +1 -1
- package/lib/math/geometry/segment.js +11 -6
- package/lib/math/geometry/spacePoint.d.ts +2 -1
- package/lib/math/geometry/spacePoint.d.ts.map +1 -1
- package/lib/math/geometry/spacePoint.js +16 -2
- package/lib/math/geometry/triangle.d.ts +2 -1
- package/lib/math/geometry/triangle.d.ts.map +1 -1
- package/lib/math/geometry/triangle.js +31 -13
- package/lib/math/spaceGeometry/prism.d.ts +4 -0
- package/lib/math/spaceGeometry/prism.d.ts.map +1 -0
- package/lib/math/spaceGeometry/prism.js +3 -0
- package/lib/tree/nodes/algebraicNode.d.ts +4 -1
- package/lib/tree/nodes/algebraicNode.d.ts.map +1 -1
- package/lib/tree/nodes/functions/cosNode.d.ts +2 -2
- package/lib/tree/nodes/functions/cosNode.d.ts.map +1 -1
- package/lib/tree/nodes/functions/cosNode.js +4 -1
- package/lib/tree/nodes/functions/sinNode.d.ts +2 -2
- package/lib/tree/nodes/functions/sinNode.d.ts.map +1 -1
- package/lib/tree/nodes/functions/sinNode.js +4 -1
- package/lib/tree/nodes/functions/tanNode.d.ts +2 -2
- package/lib/tree/nodes/functions/tanNode.d.ts.map +1 -1
- package/lib/tree/nodes/functions/tanNode.js +4 -1
- package/package.json +1 -1
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
|
|
2
|
+
import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
|
|
3
|
+
import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
|
|
4
|
+
import { SpacePoint } from "../../../../math/geometry/spacePoint.js";
|
|
5
|
+
import { randint } from "../../../../math/utils/random/randint.js";
|
|
6
|
+
import { random } from "../../../../utils/alea/random.js";
|
|
7
|
+
const getPoints = (identifiers) => {
|
|
8
|
+
const { l, L, h } = identifiers;
|
|
9
|
+
const zeroTree = (0).toTree();
|
|
10
|
+
const lTree = l.toTree();
|
|
11
|
+
const LTree = L.toTree();
|
|
12
|
+
const hTree = h.toTree();
|
|
13
|
+
return [
|
|
14
|
+
new SpacePoint("A", zeroTree, zeroTree, zeroTree),
|
|
15
|
+
new SpacePoint("B", zeroTree, lTree, zeroTree),
|
|
16
|
+
new SpacePoint("C", LTree, lTree, zeroTree),
|
|
17
|
+
new SpacePoint("D", LTree, zeroTree, zeroTree),
|
|
18
|
+
new SpacePoint("E", zeroTree, zeroTree, hTree),
|
|
19
|
+
new SpacePoint("F", zeroTree, lTree, hTree),
|
|
20
|
+
new SpacePoint("G", LTree, lTree, hTree),
|
|
21
|
+
new SpacePoint("H", LTree, zeroTree, hTree),
|
|
22
|
+
];
|
|
23
|
+
};
|
|
24
|
+
const getPropositions = (n, { answer, ...identifiers }) => {
|
|
25
|
+
const propositions = [];
|
|
26
|
+
const points = getPoints(identifiers);
|
|
27
|
+
addValidProp(propositions, answer);
|
|
28
|
+
while (propositions.length < n) {
|
|
29
|
+
tryToAddWrongProp(propositions, random(points).toCoords());
|
|
30
|
+
}
|
|
31
|
+
return shuffleProps(propositions, n);
|
|
32
|
+
};
|
|
33
|
+
const getAnswer = (identifiers) => {
|
|
34
|
+
const points = getPoints(identifiers);
|
|
35
|
+
return points.find((p) => p.name === identifiers.askedPoint).toCoords();
|
|
36
|
+
};
|
|
37
|
+
const getInstruction = (identifiers) => {
|
|
38
|
+
const { askedPoint, givenPoints } = identifiers;
|
|
39
|
+
const points = getPoints(identifiers);
|
|
40
|
+
return `On donne ci-dessous un parallélépipède rectangle dans l'espace rapporté à un repère.
|
|
41
|
+
|
|
42
|
+
Les coordonnées du point $${givenPoints[0]}$ sont $${points
|
|
43
|
+
.find((p) => p.name === givenPoints[0])
|
|
44
|
+
.toCoords()}$.
|
|
45
|
+
|
|
46
|
+
Les coordonnées du point $${givenPoints[1]}$ sont $${points
|
|
47
|
+
.find((p) => p.name === givenPoints[1])
|
|
48
|
+
.toCoords()}$.
|
|
49
|
+
|
|
50
|
+
Quelles sont les coordonnées du point $${askedPoint}$ ?`;
|
|
51
|
+
};
|
|
52
|
+
// const getHint : GetHint<Identifiers> = (identifiers)=>{
|
|
53
|
+
// }
|
|
54
|
+
// const getCorrection : GetCorrection<Identifiers> = (identifiers)=>{
|
|
55
|
+
// }
|
|
56
|
+
const getGGBOptions = (identifiers) => {
|
|
57
|
+
const { askedPoint, givenPoints, L, l, h } = identifiers;
|
|
58
|
+
const points = getPoints(identifiers);
|
|
59
|
+
const commands = [
|
|
60
|
+
...points.flatMap((p) => p.toGGBCommand({ color: "black", size: 2 })),
|
|
61
|
+
`P = Prism(${points
|
|
62
|
+
.slice(0, 5)
|
|
63
|
+
.map((p) => p.name)
|
|
64
|
+
.join(",")})`,
|
|
65
|
+
`SetVisibleInView(J, -1, false)`,
|
|
66
|
+
`SetVisibleInView(K, -1, false)`,
|
|
67
|
+
`SetVisibleInView(I, -1, false)`,
|
|
68
|
+
`SetColor(P, "#20000000")`,
|
|
69
|
+
`SetLineThickness(P, 1)`,
|
|
70
|
+
];
|
|
71
|
+
const ggb = new GeogebraConstructor({
|
|
72
|
+
commands,
|
|
73
|
+
is3D: true,
|
|
74
|
+
xAxis: {
|
|
75
|
+
hideNumbers: true,
|
|
76
|
+
showPositive: true,
|
|
77
|
+
},
|
|
78
|
+
yAxis: {
|
|
79
|
+
hideNumbers: true,
|
|
80
|
+
showPositive: true,
|
|
81
|
+
},
|
|
82
|
+
zAxis: {
|
|
83
|
+
hideNumbers: true,
|
|
84
|
+
showPositive: true,
|
|
85
|
+
},
|
|
86
|
+
viewDirectionVector: [-1, -1, -1],
|
|
87
|
+
});
|
|
88
|
+
return ggb.getOptions({
|
|
89
|
+
coords: [0, L + 3, 0, l + 3, 0, h + 3],
|
|
90
|
+
});
|
|
91
|
+
};
|
|
92
|
+
const getKeys = (identifiers) => {
|
|
93
|
+
return ["semicolon"];
|
|
94
|
+
};
|
|
95
|
+
const isAnswerValid = (ans, { answer }) => {
|
|
96
|
+
return ans === answer;
|
|
97
|
+
};
|
|
98
|
+
const getSpaceCoordinatesInPrismQuestion = (opts) => {
|
|
99
|
+
const l = randint(2, 10);
|
|
100
|
+
const L = randint(2, 10);
|
|
101
|
+
const h = randint(2, 10);
|
|
102
|
+
const letters = ["A", "B", "C", "D", "E", "F", "G", "H"];
|
|
103
|
+
const askedPoint = random(letters, ["A"]);
|
|
104
|
+
const givenPointOne = random(letters, ["A", askedPoint]);
|
|
105
|
+
const givenPointTwo = random(letters, ["A", askedPoint, givenPointOne]);
|
|
106
|
+
const identifiers = {
|
|
107
|
+
askedPoint,
|
|
108
|
+
givenPoints: [givenPointOne, givenPointTwo],
|
|
109
|
+
l,
|
|
110
|
+
L,
|
|
111
|
+
h,
|
|
112
|
+
};
|
|
113
|
+
const question = {
|
|
114
|
+
answer: getAnswer(identifiers),
|
|
115
|
+
instruction: getInstruction(identifiers),
|
|
116
|
+
keys: getKeys(identifiers),
|
|
117
|
+
answerFormat: "tex",
|
|
118
|
+
identifiers,
|
|
119
|
+
// hint: getHint(identifiers),
|
|
120
|
+
// correction: getCorrection(identifiers),
|
|
121
|
+
ggbOptions: getGGBOptions(identifiers),
|
|
122
|
+
};
|
|
123
|
+
return question;
|
|
124
|
+
};
|
|
125
|
+
export const spaceCoordinatesInPrism = {
|
|
126
|
+
id: "spaceCoordinatesInPrism",
|
|
127
|
+
label: "Lire les coordonnées d'un point dans un parallélépipède",
|
|
128
|
+
isSingleStep: true,
|
|
129
|
+
generator: (nb, opts) => getDistinctQuestions(() => getSpaceCoordinatesInPrismQuestion(opts), nb),
|
|
130
|
+
qcmTimer: 60,
|
|
131
|
+
freeTimer: 60,
|
|
132
|
+
getPropositions,
|
|
133
|
+
isAnswerValid,
|
|
134
|
+
subject: "Mathématiques",
|
|
135
|
+
// getHint,
|
|
136
|
+
// getCorrection,
|
|
137
|
+
getInstruction,
|
|
138
|
+
getAnswer,
|
|
139
|
+
getGGBOptions,
|
|
140
|
+
hasGeogebra: true,
|
|
141
|
+
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/spaceGeometry/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/spaceGeometry/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateCosSinAndTan.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/calculateCosSinAndTan.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,
|
|
1
|
+
{"version":3,"file":"calculateCosSinAndTan.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/calculateCosSinAndTan.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAsEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAWvD,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
|
|
2
2
|
import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
|
|
3
|
+
import { numberVEA } from "../../../exercises/vea/numberVEA.js";
|
|
3
4
|
import { randfloat } from "../../../math/utils/random/randfloat.js";
|
|
4
5
|
import { randint } from "../../../math/utils/random/randint.js";
|
|
5
6
|
import { CosNode } from "../../../tree/nodes/functions/cosNode.js";
|
|
@@ -7,16 +8,48 @@ import { SinNode } from "../../../tree/nodes/functions/sinNode.js";
|
|
|
7
8
|
import { TanNode } from "../../../tree/nodes/functions/tanNode.js";
|
|
8
9
|
import { DegreeNode } from "../../../tree/nodes/geometry/degree.js";
|
|
9
10
|
import { random } from "../../../utils/alea/random.js";
|
|
10
|
-
const
|
|
11
|
+
const getInstruction = (identifiers) => {
|
|
12
|
+
const { degree, trigoFunct } = identifiers;
|
|
13
|
+
const node = trigoFunct === "tan" ? TanNode : trigoFunct === "sin" ? SinNode : CosNode;
|
|
14
|
+
return `Calculer :
|
|
15
|
+
|
|
16
|
+
$$
|
|
17
|
+
${new node(new DegreeNode(degree)).toTex()}
|
|
18
|
+
$$
|
|
19
|
+
|
|
20
|
+
Arrondir le résultat au centième.`;
|
|
21
|
+
};
|
|
22
|
+
const getAnswer = (identifiers) => {
|
|
23
|
+
let ans;
|
|
24
|
+
const { degree, trigoFunct } = identifiers;
|
|
25
|
+
switch (trigoFunct) {
|
|
26
|
+
case "cos":
|
|
27
|
+
const cos = new CosNode(degree.toTree());
|
|
28
|
+
ans = +cos.evaluate({}, { degreeMode: true }).toFixed(2);
|
|
29
|
+
return ans.toTree().toTex();
|
|
30
|
+
case "sin":
|
|
31
|
+
const sin = new SinNode(degree.toTree());
|
|
32
|
+
ans = +sin.evaluate({}, { degreeMode: true }).toFixed(2);
|
|
33
|
+
return ans.toTree().toTex();
|
|
34
|
+
case "tan":
|
|
35
|
+
const tan = new TanNode(degree.toTree());
|
|
36
|
+
ans = +tan.evaluate({}, { degreeMode: true }).toFixed(2);
|
|
37
|
+
return ans.toTree().toTex();
|
|
38
|
+
default:
|
|
39
|
+
return "";
|
|
40
|
+
}
|
|
41
|
+
};
|
|
11
42
|
const getCalculateCosSinAndTanQuestion = () => {
|
|
43
|
+
const trigo = ["sin", "tan", "cos"];
|
|
12
44
|
const trigoFunct = random(trigo);
|
|
13
45
|
const degree = randint(1, 180);
|
|
46
|
+
const identifiers = { degree, trigoFunct };
|
|
14
47
|
const question = {
|
|
15
|
-
answer:
|
|
16
|
-
instruction:
|
|
48
|
+
answer: getAnswer(identifiers),
|
|
49
|
+
instruction: getInstruction(identifiers),
|
|
17
50
|
keys: [],
|
|
18
51
|
answerFormat: "tex",
|
|
19
|
-
identifiers
|
|
52
|
+
identifiers,
|
|
20
53
|
};
|
|
21
54
|
return question;
|
|
22
55
|
};
|
|
@@ -32,33 +65,12 @@ const getPropositions = (n, { answer, degree }) => {
|
|
|
32
65
|
return shuffleProps(propositions, n);
|
|
33
66
|
};
|
|
34
67
|
const isAnswerValid = (ans, { answer }) => {
|
|
35
|
-
return ans
|
|
36
|
-
};
|
|
37
|
-
const getCorrectAnswer = (degree, trigoFunct) => {
|
|
38
|
-
let ans;
|
|
39
|
-
switch (trigoFunct) {
|
|
40
|
-
case "cos":
|
|
41
|
-
const cos = new CosNode(degree.toTree());
|
|
42
|
-
ans = +cos.evaluate({}).toFixed(2);
|
|
43
|
-
return ans.toTree().toTex();
|
|
44
|
-
case "sin":
|
|
45
|
-
const sin = new SinNode(degree.toTree());
|
|
46
|
-
ans = +sin.evaluate({}).toFixed(2);
|
|
47
|
-
return ans.toTree().toTex();
|
|
48
|
-
case "tan":
|
|
49
|
-
const tan = new TanNode(degree.toTree());
|
|
50
|
-
ans = +tan.evaluate({}).toFixed(2);
|
|
51
|
-
return ans.toTree().toTex();
|
|
52
|
-
default:
|
|
53
|
-
return "";
|
|
54
|
-
}
|
|
68
|
+
return numberVEA(ans, answer);
|
|
55
69
|
};
|
|
56
70
|
export const calculateCosSinAndTan = {
|
|
57
71
|
id: "calculateCosSinAndTan",
|
|
58
72
|
label: "Calculer le cosinus/sinus/tangente d'un angle en degrés",
|
|
59
|
-
levels: ["3ème"],
|
|
60
73
|
isSingleStep: true,
|
|
61
|
-
sections: ["Trigonométrie"],
|
|
62
74
|
generator: (nb) => getDistinctQuestions(getCalculateCosSinAndTanQuestion, nb),
|
|
63
75
|
qcmTimer: 60,
|
|
64
76
|
freeTimer: 60,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toGGBCommandsProps.d.ts","sourceRoot":"","sources":["../../../../src/exercises/utils/geogebra/toGGBCommandsProps.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"toGGBCommandsProps.d.ts","sourceRoot":"","sources":["../../../../src/exercises/utils/geogebra/toGGBCommandsProps.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}
|
|
@@ -25,6 +25,8 @@ export declare class GeogebraConstructor {
|
|
|
25
25
|
lockedAxesRatio?: number | false;
|
|
26
26
|
xAxis?: GeogebraAxisOptions;
|
|
27
27
|
yAxis?: GeogebraAxisOptions;
|
|
28
|
+
zAxis?: GeogebraAxisOptions;
|
|
29
|
+
viewDirectionVector?: number[];
|
|
28
30
|
constructor(options: Omit<GeogebraOptions, "coords">);
|
|
29
31
|
getCoordsForPoints(points: Point[]): number[];
|
|
30
32
|
getAdaptedCoords({ xMin, xMax, yMin, yMax, zMin, zMax, forceShowAxes, }: GetAdaptedCoords): number[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geogebraConstructor.d.ts","sourceRoot":"","sources":["../../src/geogebra/geogebraConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,eAAe,EAChB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AACF,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AACF,qBAAa,mBAAmB;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACjC,KAAK,CAAC,EAAE,mBAAmB,CAAC;IAC5B,KAAK,CAAC,EAAE,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"geogebraConstructor.d.ts","sourceRoot":"","sources":["../../src/geogebra/geogebraConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,eAAe,EAChB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AACF,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AACF,qBAAa,mBAAmB;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACjC,KAAK,CAAC,EAAE,mBAAmB,CAAC;IAC5B,KAAK,CAAC,EAAE,mBAAmB,CAAC;IAC5B,KAAK,CAAC,EAAE,mBAAmB,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;gBAEnB,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC;IAgBpD,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE;IAOlC,gBAAgB,CAAC,EACf,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,aAAa,GACd,EAAE,gBAAgB;IAiDnB,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,eAAe,GAAG,eAAe;CAmBzD"}
|
|
@@ -12,6 +12,8 @@ export class GeogebraConstructor {
|
|
|
12
12
|
lockedAxesRatio;
|
|
13
13
|
xAxis;
|
|
14
14
|
yAxis;
|
|
15
|
+
zAxis;
|
|
16
|
+
viewDirectionVector;
|
|
15
17
|
constructor(options) {
|
|
16
18
|
this.customToolBar = options?.customToolBar ?? toolBarConstructor({});
|
|
17
19
|
this.forbidShiftDragZoom = options?.forbidShiftDragZoom ?? false;
|
|
@@ -25,6 +27,8 @@ export class GeogebraConstructor {
|
|
|
25
27
|
this.lockedAxesRatio = options?.lockedAxesRatio ?? 1;
|
|
26
28
|
this.xAxis = options?.xAxis;
|
|
27
29
|
this.yAxis = options?.yAxis;
|
|
30
|
+
this.zAxis = options?.zAxis;
|
|
31
|
+
this.viewDirectionVector = options?.viewDirectionVector;
|
|
28
32
|
}
|
|
29
33
|
getCoordsForPoints(points) {
|
|
30
34
|
const xMin = Math.min(...points.map((p) => p.x.evaluate()));
|
|
@@ -97,6 +101,8 @@ export class GeogebraConstructor {
|
|
|
97
101
|
lockedAxesRatio: this.lockedAxesRatio,
|
|
98
102
|
xAxis: this.xAxis,
|
|
99
103
|
yAxis: this.yAxis,
|
|
104
|
+
zAxis: this.zAxis,
|
|
105
|
+
viewDirectionVector: this.viewDirectionVector,
|
|
100
106
|
};
|
|
101
107
|
}
|
|
102
108
|
}
|
package/lib/index.d.ts
CHANGED
|
@@ -1260,6 +1260,11 @@ declare const mathExercises: (Exercise<{
|
|
|
1260
1260
|
}, {}> | Exercise<{
|
|
1261
1261
|
type: number;
|
|
1262
1262
|
commands: string[];
|
|
1263
|
+
}, {}> | Exercise<{
|
|
1264
|
+
isAskingLength: boolean;
|
|
1265
|
+
isSegmentHeight: boolean;
|
|
1266
|
+
pointsIdentifiers: import("./math/geometry/point.js").PointIdentifiers[];
|
|
1267
|
+
lengths: number[];
|
|
1263
1268
|
}, {}> | Exercise<{
|
|
1264
1269
|
startPoint: number[];
|
|
1265
1270
|
vector: number[];
|
|
@@ -1720,6 +1725,12 @@ declare const mathExercises: (Exercise<{
|
|
|
1720
1725
|
y: number;
|
|
1721
1726
|
z: number;
|
|
1722
1727
|
}, {}> | Exercise<{}, {}> | Exercise<{}, {}> | Exercise<{
|
|
1728
|
+
l: number;
|
|
1729
|
+
L: number;
|
|
1730
|
+
h: number;
|
|
1731
|
+
askedPoint: string;
|
|
1732
|
+
givenPoints: string[];
|
|
1733
|
+
}, {}> | Exercise<{
|
|
1723
1734
|
sqrtOperand: number;
|
|
1724
1735
|
}, {}> | Exercise<{
|
|
1725
1736
|
k: number;
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,4BAA4B,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,QAAA,MAAM,aAAa
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,8 +35,12 @@ export declare class Segment {
|
|
|
35
35
|
toTex(): string;
|
|
36
36
|
toInsideName(): string;
|
|
37
37
|
toLengthTex(): string;
|
|
38
|
-
getFitCaptionCommands(text
|
|
39
|
-
|
|
38
|
+
getFitCaptionCommands({ text, color, size, }?: {
|
|
39
|
+
text?: string;
|
|
40
|
+
color?: string;
|
|
41
|
+
size?: "scriptsize" | "tiny" | "small" | "large";
|
|
42
|
+
}): string[];
|
|
43
|
+
toGGBCommands(shouldBuildPoints: boolean, { isFixed, showLabel, showUnderlyingPointsLabel, showLength, style, thickness, }?: ToGGBCommandsProps): string[];
|
|
40
44
|
includes(point: Point): boolean;
|
|
41
45
|
toVector(): Vector;
|
|
42
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/segment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAE1F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAEL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAK7C,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,MAAM,EAAqB,MAAM,aAAa,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,uBAAuB,CAAC;CACjC,CAAC;AACF,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,MAAM;IAOb,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,kBAAkB;CAYvD;AAED,KAAK,uBAAuB,GAAG;IAC7B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,KAAK,YAAY,GAAG;IAAE,UAAU,CAAC,EAAE,aAAa,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAC3E,qBAAa,OAAO;IAClB,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,KAAK,CAAC,EAAE,YAAY,CAAC;gBACT,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,YAAY;IAS9D,aAAa,IAAI,kBAAkB;IAUnC,WAAW;IAGX,SAAS;IAST,aAAa;IAYb,KAAK;IAGL,YAAY;IAGZ,WAAW;IAGX,qBAAqB,CAAC,IAAI,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/segment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAE1F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAEL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAK7C,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,MAAM,EAAqB,MAAM,aAAa,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,uBAAuB,CAAC;CACjC,CAAC;AACF,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,MAAM;IAOb,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,kBAAkB;CAYvD;AAED,KAAK,uBAAuB,GAAG;IAC7B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,KAAK,YAAY,GAAG;IAAE,UAAU,CAAC,EAAE,aAAa,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAC3E,qBAAa,OAAO;IAClB,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,KAAK,CAAC,EAAE,YAAY,CAAC;gBACT,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,YAAY;IAS9D,aAAa,IAAI,kBAAkB;IAUnC,WAAW;IAGX,SAAS;IAST,aAAa;IAYb,KAAK;IAGL,YAAY;IAGZ,WAAW;IAGX,qBAAqB,CAAC,EACpB,IAAI,EACJ,KAAK,EACL,IAAI,GACL,GAAE;QACD,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;KAC7C;IAiBN,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,EAChC,UAAkB,EAClB,KAAK,EACL,SAAS,GACV,GAAE,kBAAuB;IAgC5B,QAAQ,CAAC,KAAK,EAAE,KAAK;IAOrB,QAAQ;CAGT"}
|
|
@@ -74,20 +74,22 @@ export class Segment {
|
|
|
74
74
|
toLengthTex() {
|
|
75
75
|
return `${this.toInsideName()} = ${this.getLengthNode().toTex()}`;
|
|
76
76
|
}
|
|
77
|
-
getFitCaptionCommands(text, color) {
|
|
77
|
+
getFitCaptionCommands({ text, color, size, } = {}) {
|
|
78
78
|
const txt = text ?? this.getLength().frenchify();
|
|
79
79
|
const midPoint = this.getMidpoint().toMathString();
|
|
80
80
|
const cmds = [
|
|
81
|
-
`angle_{${this.name}} = Angle(Vector(${this.pointA.name}, ${this.pointB.name}))`,
|
|
82
|
-
`SetVisibleInView(angle_{${this.name}}, 1, false)`,
|
|
83
|
-
`text_{${this.name}} = Text(RotateText("${txt}", If(angle_{${this.name}} > 90° ∧ angle_{${this.name}} < 270°, angle_{${this.name}} + 180°, angle_{${this.name}})), ${midPoint}, true, true, 0, 0)`,
|
|
81
|
+
// `angle_{${this.name}} = Angle(Vector(${this.pointA.name}, ${this.pointB.name}))`,
|
|
82
|
+
// `SetVisibleInView(angle_{${this.name}}, 1, false)`,
|
|
83
|
+
// `text_{${this.name}} = Text(RotateText("${txt}", If(angle_{${this.name}} > 90° ∧ angle_{${this.name}} < 270°, angle_{${this.name}} + 180°, angle_{${this.name}})), ${midPoint}, true, true, 0, 0)`,
|
|
84
|
+
`text_{${this.name}} = Text("${size ? `\\${size}` : ""} ${txt}", ${midPoint}, true, true, 0, 0)`,
|
|
85
|
+
// `SetBackgroundColor(text_{${this.name}}, "white")`,
|
|
84
86
|
];
|
|
85
87
|
if (color) {
|
|
86
88
|
cmds.push(`SetColor(text_{${this.name}}, "${color}")`);
|
|
87
89
|
}
|
|
88
90
|
return cmds;
|
|
89
91
|
}
|
|
90
|
-
toGGBCommands(shouldBuildPoints, { isFixed = true, showLabel = false, showUnderlyingPointsLabel = true, showLength = false, style, } = {}) {
|
|
92
|
+
toGGBCommands(shouldBuildPoints, { isFixed = true, showLabel = false, showUnderlyingPointsLabel = true, showLength = false, style, thickness, } = {}) {
|
|
91
93
|
const commands = [
|
|
92
94
|
`${this.ggbName}=Segment(${this.pointA.name},${this.pointB.name})`,
|
|
93
95
|
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"})`,
|
|
@@ -98,9 +100,12 @@ export class Segment {
|
|
|
98
100
|
}
|
|
99
101
|
if (showLength) {
|
|
100
102
|
const length = this.getLengthNode().toTex();
|
|
101
|
-
commands.push(`SetCaption(${this.ggbName}, ${length})`);
|
|
103
|
+
commands.push(`SetCaption(${this.ggbName}, "${length}")`);
|
|
102
104
|
commands.push(`ShowLabel(${this.ggbName}, true)`);
|
|
103
105
|
}
|
|
106
|
+
if (thickness !== undefined) {
|
|
107
|
+
commands.push(`SetLineThickness(${this.ggbName}, ${thickness})`);
|
|
108
|
+
}
|
|
104
109
|
if (shouldBuildPoints) {
|
|
105
110
|
const ACommands = this.pointA.toGGBCommand({
|
|
106
111
|
isFixed,
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AlgebraicNode } from "../../tree/nodes/algebraicNode.js";
|
|
2
|
+
import { ToGGBCommandsProps } from "../../exercises/utils/geogebra/toGGBCommandsProps.js";
|
|
2
3
|
type AleaBound = {
|
|
3
4
|
min?: number;
|
|
4
5
|
max?: number;
|
|
@@ -24,7 +25,7 @@ export declare class SpacePoint {
|
|
|
24
25
|
distanceTo(B: SpacePoint): number;
|
|
25
26
|
equals(B: SpacePoint): boolean;
|
|
26
27
|
isAligned(B: SpacePoint, C: SpacePoint): void;
|
|
27
|
-
toGGBCommand(): string;
|
|
28
|
+
toGGBCommand({ isFixed, showLabel, style, size, color, }?: ToGGBCommandsProps): string[];
|
|
28
29
|
}
|
|
29
30
|
export {};
|
|
30
31
|
//# sourceMappingURL=spacePoint.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spacePoint.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/spacePoint.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"spacePoint.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/spacePoint.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAE1F,KAAK,SAAS,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AACrE,8BAAsB,qBAAqB;IACzC,MAAM,CAAC,MAAM,CACX,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,SAAS,EACjB,KAAK,CAAC,EAAE,SAAS,EACjB,KAAK,CAAC,EAAE,SAAS,GAChB,UAAU;IAyBb,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE;IA4BtC,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,MAAY;CAWrD;AAED,qBAAa,UAAU;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;gBAEf,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,aAAa,EAChB,CAAC,EAAE,aAAa,EAChB,CAAC,EAAE,aAAa;IAQlB,SAAS;IAGT,kBAAkB;IAIlB,KAAK,IAAI,MAAM;IAIf,eAAe,IAAI,MAAM;IAKzB,QAAQ,IAAI,MAAM;IAIlB,QAAQ,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,SAAM,GAAG,UAAU;IAkB/C,UAAU,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM;IAIjC,MAAM,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO;IAG9B,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU;IAOtC,YAAY,CAAC,EACX,OAAc,EACd,SAAgB,EAChB,KAAK,EACL,IAAI,EACJ,KAAK,GACN,GAAE,kBAAuB;CAmB3B"}
|
|
@@ -85,7 +85,21 @@ export class SpacePoint {
|
|
|
85
85
|
// return AB.isColinear(AC);
|
|
86
86
|
throw Error("unimplemented");
|
|
87
87
|
}
|
|
88
|
-
toGGBCommand() {
|
|
89
|
-
|
|
88
|
+
toGGBCommand({ isFixed = true, showLabel = true, style, size, color, } = {}) {
|
|
89
|
+
const commands = [
|
|
90
|
+
`${this.name} = (${this.x.toMathString()}, ${this.y.toMathString()}, ${this.z.toMathString()})`,
|
|
91
|
+
`SetFixed(${this.name},${isFixed ? "true" : "false"})`,
|
|
92
|
+
`ShowLabel(${this.name},${showLabel ? "true" : "false"})`,
|
|
93
|
+
];
|
|
94
|
+
if (style !== undefined) {
|
|
95
|
+
commands.push(`SetPointStyle(${this.name}, ${style})`);
|
|
96
|
+
}
|
|
97
|
+
if (size) {
|
|
98
|
+
commands.push(`SetPointSize(${this.name}, ${size})`);
|
|
99
|
+
}
|
|
100
|
+
if (color) {
|
|
101
|
+
commands.push(`SetColor(${this.name}, "${color}")`);
|
|
102
|
+
}
|
|
103
|
+
return commands;
|
|
90
104
|
}
|
|
91
105
|
}
|
|
@@ -9,10 +9,11 @@ export type TriangleIdentifiers = {
|
|
|
9
9
|
};
|
|
10
10
|
export declare abstract class TriangleConstructor {
|
|
11
11
|
static fromIdentifiers(identifiers: TriangleIdentifiers): Triangle;
|
|
12
|
-
static randomNiceSides({ names, randomName, intSides, }: {
|
|
12
|
+
static randomNiceSides({ names, randomName, intSides, minAngle, }: {
|
|
13
13
|
names?: string[] | undefined;
|
|
14
14
|
randomName?: boolean | undefined;
|
|
15
15
|
intSides?: boolean | undefined;
|
|
16
|
+
minAngle?: number | undefined;
|
|
16
17
|
}): Triangle;
|
|
17
18
|
static randomName(): string[];
|
|
18
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triangle.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/triangle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAKnC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAEL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,wBAAwB,CAAC;CAClC,CAAC;AAEF,8BAAsB,mBAAmB;IACvC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,mBAAmB,GAAG,QAAQ;IAgBlE,MAAM,CAAC,eAAe,CAAC,EACrB,KAAuB,EACvB,UAAkB,EAClB,QAAgB,
|
|
1
|
+
{"version":3,"file":"triangle.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/triangle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAKnC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAEL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,wBAAwB,CAAC;CAClC,CAAC;AAEF,8BAAsB,mBAAmB;IACvC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,mBAAmB,GAAG,QAAQ;IAgBlE,MAAM,CAAC,eAAe,CAAC,EACrB,KAAuB,EACvB,UAAkB,EAClB,QAAgB,EAChB,QAAY,GACb;;;;;KAAA,GAAG,QAAQ;IA+CZ,MAAM,CAAC,UAAU;CAQlB;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,CAAC,EAAE,CAAC,eAAe,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/C,kBAAkB,CAAC,EAAE,eAAe,EAAE,CAAC;IACvC,kBAAkB,CAAC,EAAE,eAAe,EAAE,CAAC;CACxC,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,CAAC,aAAa,GAAG,SAAS,CAAC,EAAE,CAAC;IAC7C,kBAAkB,CAAC,EAAE,aAAa,EAAE,CAAC;IACrC,kBAAkB,CAAC,EAAE,aAAa,EAAE,CAAC;CACtC,CAAC;AACF,qBAAa,QAAQ;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,aAAa,CAAC;gBACV,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,EAAE,aAAa;IAyClD,aAAa,IAAI,mBAAmB;IAepC,YAAY,IAAI,MAAM;IAItB,OAAO,IAAI,MAAM;IASjB,OAAO,IAAI,OAAO;IAIlB,aAAa,IAAI,OAAO;IAMxB,WAAW,IAAI,OAAO;IAUtB,SAAS,IAAI,OAAO;IASpB,aAAa,CACX,KAAK,EAAE,MAAM,EACb,IAAI,EAAE;QACJ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB;IAcH,cAAc,CACZ,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAKH,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;IAQtC,SAAS,CACP,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAYH,UAAU,CACR,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,KAAK,CAAC;KACnB;IAoCH,cAAc,IAAI,MAAM,EAAE;CAkB3B"}
|
|
@@ -16,23 +16,38 @@ export class TriangleConstructor {
|
|
|
16
16
|
sidesLengths: identifiers.props?.sidesLengths?.map((n) => n ? reifyAlgebraic(n) : undefined),
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
|
-
static randomNiceSides({ names = ["A", "B", "C"], randomName = false, intSides = false, }) {
|
|
19
|
+
static randomNiceSides({ names = ["A", "B", "C"], randomName = false, intSides = false, minAngle = 0, }) {
|
|
20
20
|
let vertices = [];
|
|
21
21
|
if (randomName)
|
|
22
22
|
vertices = TriangleConstructor.randomName();
|
|
23
23
|
else
|
|
24
24
|
vertices = names;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
let A;
|
|
26
|
+
let B;
|
|
27
|
+
let C;
|
|
28
|
+
const anglesAreNice = () => {
|
|
29
|
+
const values = [
|
|
30
|
+
new Angle([C, B, A]).evaluate(),
|
|
31
|
+
new Angle([A, C, B]).evaluate(),
|
|
32
|
+
new Angle([B, A, C]).evaluate(),
|
|
33
|
+
];
|
|
34
|
+
if (minAngle)
|
|
35
|
+
return values.every((v) => v > minAngle && v < 180 - minAngle);
|
|
36
|
+
return values.every((v) => v > 20 && v < 110);
|
|
37
|
+
};
|
|
38
|
+
do {
|
|
39
|
+
const angle = randfloat(0, 2 * Math.PI);
|
|
40
|
+
const addAngle = randfloat(Math.PI / 4, (3 * Math.PI) / 4);
|
|
41
|
+
//on construit [AC] sur (Ox) de milieu O et de taille 2*xRand
|
|
42
|
+
//puis [AB] sur (Ox) qu'on rotate
|
|
43
|
+
const xRand = intSides ? randint(5, 9) : randfloat(5, 8, 1);
|
|
44
|
+
const xRand2 = intSides ? randint(-5, 5) : randfloat(-5, 5, 1);
|
|
45
|
+
const origin = new Point("O", (0).toTree(), (0).toTree());
|
|
46
|
+
const startA = new Point(vertices[0], (-xRand).toTree(), (0).toTree());
|
|
47
|
+
A = startA.rotate(angle, origin);
|
|
48
|
+
C = new Point(vertices[2], xRand.toTree(), (0).toTree()).rotate(angle, origin);
|
|
49
|
+
B = new Point(vertices[1], (-xRand + xRand2).toTree(), (0).toTree()).rotate(angle + addAngle, startA);
|
|
50
|
+
} while (!anglesAreNice());
|
|
36
51
|
return new Triangle([A, B, C], {
|
|
37
52
|
sidesLengths: [
|
|
38
53
|
round(B.distanceTo(C), intSides ? 0 : 1).toTree(),
|
|
@@ -138,7 +153,10 @@ export class Triangle {
|
|
|
138
153
|
if (opts.color)
|
|
139
154
|
this.commands.push(`SetColor(${side.ggbName}, "${opts.color}")`);
|
|
140
155
|
if (opts.caption) {
|
|
141
|
-
this.commands.push(...side.getFitCaptionCommands(
|
|
156
|
+
this.commands.push(...side.getFitCaptionCommands({
|
|
157
|
+
text: opts.caption,
|
|
158
|
+
color: opts.color,
|
|
159
|
+
}));
|
|
142
160
|
}
|
|
143
161
|
}
|
|
144
162
|
highlightAngle(index, opts) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prism.d.ts","sourceRoot":"","sources":["../../../src/math/spaceGeometry/prism.ts"],"names":[],"mappings":"AAAA,qBAAa,KAAK;;CAEjB"}
|
|
@@ -12,8 +12,11 @@ export type SimplifyOptions = {
|
|
|
12
12
|
forbidAdditions?: boolean;
|
|
13
13
|
forbidTrigo?: boolean;
|
|
14
14
|
};
|
|
15
|
+
export type EvaluateOptions = {
|
|
16
|
+
degreeMode?: boolean;
|
|
17
|
+
};
|
|
15
18
|
export interface AlgebraicNode extends Node {
|
|
16
|
-
evaluate: (vars?: Record<string, number
|
|
19
|
+
evaluate: (vars?: Record<string, number>, opts?: EvaluateOptions) => number;
|
|
17
20
|
toDetailedEvaluation: (vars: Record<string, AlgebraicNode>) => AlgebraicNode;
|
|
18
21
|
toEquivalentNodes: (opts?: NodeOptions) => AlgebraicNode[];
|
|
19
22
|
simplify: (opts?: SimplifyOptions) => AlgebraicNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"algebraicNode.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/algebraicNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAC7C,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AACF,MAAM,WAAW,aAAc,SAAQ,IAAI;IACzC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"algebraicNode.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/algebraicNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAC7C,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AACF,MAAM,WAAW,aAAc,SAAQ,IAAI;IACzC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,CAAC;IAC5E,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,aAAa,CAAC;IAC7E,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IAC3D,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,eAAe,KAAK,aAAa,CAAC;IACpD,MAAM,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IACzC,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,aAAa,CAAC;CACjD;AACD,8BAAsB,cAAc;;IAElC,OAAO,CAAC,MAAM,CAAC,QAAQ;CAGxB;AACD,eAAO,MAAM,eAAe,SAAU,IAAI,KAAG,IAAI,IAAI,aACX,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Node, NodeIds, NodeType } from "../node.js";
|
|
2
2
|
import { FunctionNode, FunctionsIds } from "./functionNode.js";
|
|
3
|
-
import { AlgebraicNode, SimplifyOptions } from "../algebraicNode.js";
|
|
3
|
+
import { AlgebraicNode, EvaluateOptions, SimplifyOptions } from "../algebraicNode.js";
|
|
4
4
|
export declare function isCosNode(a: Node): a is CosNode;
|
|
5
5
|
export declare const cos: (a: AlgebraicNode | number | string) => CosNode;
|
|
6
6
|
export declare class CosNode implements FunctionNode {
|
|
@@ -20,7 +20,7 @@ export declare class CosNode implements FunctionNode {
|
|
|
20
20
|
toEquivalentNodes(): AlgebraicNode[];
|
|
21
21
|
toAllValidTexs(): string[];
|
|
22
22
|
simplify(opts?: SimplifyOptions): AlgebraicNode;
|
|
23
|
-
evaluate(vars?: Record<string, number
|
|
23
|
+
evaluate(vars?: Record<string, number>, opts?: EvaluateOptions): number;
|
|
24
24
|
equals(node: AlgebraicNode): boolean;
|
|
25
25
|
toDetailedEvaluation(vars: Record<string, AlgebraicNode>): CosNode;
|
|
26
26
|
derivative(varName?: string | undefined): AlgebraicNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cosNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/cosNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAC/E,OAAO,
|
|
1
|
+
{"version":3,"file":"cosNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/cosNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAI7B,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,eAAO,MAAM,GAAG,MAAO,aAAa,GAAG,MAAM,GAAG,MAAM,YAIrD,CAAC;AAEF,qBAAa,OAAQ,YAAW,YAAY;IAC1C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEP,KAAK,EAAE,aAAa;IAMhC,aAAa;;;;;;IAMb,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAIf,iBAAiB,IAAI,aAAa,EAAE;IASpC,cAAc,IAAI,MAAM,EAAE;IAI1B,QAAQ,CAAC,IAAI,GAAE,eAAoB,GAAG,aAAa;IAyBnD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe;IAO9D,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}
|