math-exercises 3.0.148 → 3.0.149
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/math/calculLitteral/inequations/inverseInequalityWithGraph.js +1 -1
- package/lib/exercises/math/dataRepresentations/halfPieChartCommenting.js +2 -2
- package/lib/exercises/math/dataRepresentations/halfPieChartReading.js +2 -2
- package/lib/exercises/math/dataRepresentations/pieChartReading.js +2 -2
- package/lib/exercises/math/dataRepresentations/plausibleGraph.js +2 -2
- package/lib/exercises/math/dataRepresentations/scatterPlotCommenting.js +2 -2
- package/lib/exercises/math/derivation/tangent/derivativeNumberOrImageReading.js +1 -1
- package/lib/exercises/math/derivation/tangent/derivativeNumberReading.js +1 -1
- package/lib/exercises/math/derivation/tangent/derivativeTangentEquationReading.js +1 -1
- package/lib/exercises/math/functions/affines/affineExpressionReading.js +1 -1
- package/lib/exercises/math/functions/affines/interceptReading.js +1 -1
- package/lib/exercises/math/functions/affines/leadingCoefficient.js +1 -1
- package/lib/exercises/math/functions/basics/graphicEquation.js +1 -1
- package/lib/exercises/math/functions/basics/graphicInequation.js +1 -1
- package/lib/exercises/math/functions/basics/imageFunctionGeogebra.js +2 -2
- package/lib/exercises/math/functions/basics/twoFunctionsEquation.js +2 -2
- package/lib/exercises/math/functions/basics/twoFunctionsInequation.js +2 -2
- package/lib/exercises/math/functions/basics/valueTableFromGraph.js +1 -1
- package/lib/exercises/math/functions/variations/readExtremaOnGraph.js +1 -1
- package/lib/exercises/math/geometry/areas/calculateAreaFromCodedShape.js +2 -2
- package/lib/exercises/math/geometry/cartesian/cartesianEquationOfLine.js +1 -1
- package/lib/exercises/math/geometry/cartesian/directionVector.js +1 -1
- package/lib/exercises/math/geometry/cartesian/pointCoordinatesNoAxisNumbers.js +4 -4
- package/lib/exercises/math/geometry/cartesian/pointCoordinatesNoOrthonorm.js +4 -4
- package/lib/exercises/math/geometry/lines/drawLineFromCartesianEquation.js +1 -1
- package/lib/exercises/math/geometry/lines/reductEquationReading.js +1 -1
- package/lib/exercises/math/geometry/optimisation/geometryExtremaReadingOnGraph.js +1 -1
- package/lib/exercises/math/geometry/quadrilaterals/parallelogramRectangle.js +4 -4
- package/lib/exercises/math/geometry/quadrilaterals/parallelogramRhombus.js +4 -4
- package/lib/exercises/math/geometry/thales/index.d.ts +2 -0
- package/lib/exercises/math/geometry/thales/index.d.ts.map +1 -1
- package/lib/exercises/math/geometry/thales/index.js +2 -0
- package/lib/exercises/math/geometry/thales/thalesIsParallelFromAbstractFormula.js +1 -1
- package/lib/exercises/math/geometry/vectors/constructions/placePointFromPointAndVector.js +2 -2
- package/lib/exercises/math/geometry/vectors/parallelogram/parallelogramCriterion.js +4 -4
- package/lib/exercises/math/geometry/volumes/coneVolume.js +2 -2
- package/lib/exercises/math/geometry/volumes/parallelepipedVolume.js +8 -8
- package/lib/exercises/math/geometry/volumes/sphereVolume.js +1 -1
- package/lib/exercises/math/geometry/volumes/variableVolume.js +1 -1
- package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithSquareOrRectBase.js +5 -5
- package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleBase.js +5 -5
- package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.js +4 -4
- package/lib/exercises/math/probaStat/stats2var/fineAdjustementExercise.js +1 -1
- package/lib/exercises/math/sequences/sequencePlot.js +1 -1
- package/lib/exercises/pc/mole/concentrationReading.js +1 -1
- package/lib/exercises/pc/recognizeRefractionOrReflectionAngles.js +5 -5
- package/lib/exercises/pc/sound/findPeriodFromGraph.js +2 -2
- package/lib/exercises/pc/sound/findPeriodOrFrequencyFromGraph.js +2 -2
- package/lib/geogebra/lagrange.js +1 -1
- package/lib/geogebra/spline.js +1 -1
- package/lib/index.d.ts +29 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/math/geometry/circle.d.ts.map +1 -1
- package/lib/math/geometry/circle.js +1 -1
- package/lib/math/geometry/line.d.ts.map +1 -1
- package/lib/math/geometry/line.js +1 -1
- package/lib/math/geometry/parabola.d.ts.map +1 -1
- package/lib/math/geometry/parabola.js +1 -1
- package/lib/math/geometry/point.d.ts.map +1 -1
- package/lib/math/geometry/point.js +1 -1
- package/lib/math/geometry/ray.d.ts.map +1 -1
- package/lib/math/geometry/ray.js +1 -1
- package/lib/math/geometry/segment.d.ts.map +1 -1
- package/lib/math/geometry/segment.js +1 -1
- package/lib/tree/nodes/node.d.ts +4 -2
- package/lib/tree/nodes/node.d.ts.map +1 -1
- package/lib/tree/nodes/node.js +2 -0
- package/lib/tree/nodes/nodeConstructor.d.ts.map +1 -1
- package/lib/tree/nodes/nodeConstructor.js +4 -0
- package/package.json +1 -1
|
@@ -84,7 +84,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
84
84
|
const ggb = new GeogebraConstructor({
|
|
85
85
|
commands: [
|
|
86
86
|
`C = CircularSector((0,0), (1,0), (-1,0))`,
|
|
87
|
-
`SetFixed(C, true)`,
|
|
87
|
+
`SetFixed(C, true, false)`,
|
|
88
88
|
`SetLineThickness(C, 1)`,
|
|
89
89
|
// `SetVisibleInView(C, 1, false)`,
|
|
90
90
|
// ...pointsObj.flatMap((p) => p.toGGBCommand()),
|
|
@@ -92,7 +92,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
92
92
|
const midPoint = getMidPoint(points[(i + 1 + points.length) % points.length], points[i]);
|
|
93
93
|
return [
|
|
94
94
|
`C_${i} = CircularSector((0,0), ${pointsObj[(i + 1 + pointsObj.length) % pointsObj.length].toMathString()}, ${p.toMathString()})`,
|
|
95
|
-
`SetFixed(C_${i}, true)`,
|
|
95
|
+
`SetFixed(C_${i}, true, false)`,
|
|
96
96
|
`SetColor(C_${i}, "${colorWithOpacity(colors[i], 80)}")`,
|
|
97
97
|
`SetLineThickness(C_${i}, 0)`,
|
|
98
98
|
// `SetCaption(C_${i}, "$\\tiny \\text{${labels[i]}}$")`,
|
|
@@ -84,7 +84,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
84
84
|
const ggb = new GeogebraConstructor({
|
|
85
85
|
commands: [
|
|
86
86
|
`C = CircularSector((0,0), (1,0), (-1,0))`,
|
|
87
|
-
`SetFixed(C, true)`,
|
|
87
|
+
`SetFixed(C, true, false)`,
|
|
88
88
|
`SetLineThickness(C, 1)`,
|
|
89
89
|
// `SetVisibleInView(C, 1, false)`,
|
|
90
90
|
// ...pointsObj.flatMap((p) => p.toGGBCommand()),
|
|
@@ -92,7 +92,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
92
92
|
const midPoint = getMidPoint(points[(i + 1 + points.length) % points.length], points[i]);
|
|
93
93
|
return [
|
|
94
94
|
`C_${i} = CircularSector((0,0), ${pointsObj[(i + 1 + pointsObj.length) % pointsObj.length].toMathString()}, ${p.toMathString()})`,
|
|
95
|
-
`SetFixed(C_${i}, true)`,
|
|
95
|
+
`SetFixed(C_${i}, true, false)`,
|
|
96
96
|
`SetColor(C_${i}, "${colorWithOpacity(colors[i], 80)}")`,
|
|
97
97
|
`SetLineThickness(C_${i}, 0)`,
|
|
98
98
|
// `SetCaption(C_${i}, "$\\tiny \\text{${labels[i]}}$")`,
|
|
@@ -84,12 +84,12 @@ const getGGBOptions = (identifiers) => {
|
|
|
84
84
|
const ggb = new GeogebraConstructor({
|
|
85
85
|
commands: [
|
|
86
86
|
`C = Circle((0,0), 1)`,
|
|
87
|
-
`SetFixed(C, true)`,
|
|
87
|
+
`SetFixed(C, true, false)`,
|
|
88
88
|
`SetLineThickness(C, 1)`,
|
|
89
89
|
// ...pointsObj.flatMap((p) => p.toGGBCommand()),
|
|
90
90
|
...pointsObj.flatMap((p, i) => [
|
|
91
91
|
`C_${i} = CircularSector((0,0), ${pointsObj[(i + 1 + pointsObj.length) % pointsObj.length].toMathString()}, ${p.toMathString()})`,
|
|
92
|
-
`SetFixed(C_${i}, true)`,
|
|
92
|
+
`SetFixed(C_${i}, true, false)`,
|
|
93
93
|
`SetColor(C_${i}, "${colorWithOpacity(colors[i], 80)}")`,
|
|
94
94
|
`SetLineThickness(C_${i}, 0)`,
|
|
95
95
|
// `SetCaption(C_${i}, "$\\tiny \\text{${labels[i]}}$")`,
|
|
@@ -133,14 +133,14 @@ const getCorrectionGGBOptions = (identifiers) => {
|
|
|
133
133
|
const ggb = new GeogebraConstructor({
|
|
134
134
|
commands: [
|
|
135
135
|
`C = Circle((0,0), 1)`,
|
|
136
|
-
`SetFixed(C, true)`,
|
|
136
|
+
`SetFixed(C, true, false)`,
|
|
137
137
|
`SetLineThickness(C, 1)`,
|
|
138
138
|
// ...pointsObj.flatMap((p) => p.toGGBCommand()),
|
|
139
139
|
...pointsObj
|
|
140
140
|
.slice(0, -1)
|
|
141
141
|
.flatMap((_, i) => [
|
|
142
142
|
`C_${i} = CircularSector((0,0), ${pointsObj[i].toMathString()}, ${pointsObj[i + 1].toMathString()})`,
|
|
143
|
-
`SetFixed(C_${i}, true)`,
|
|
143
|
+
`SetFixed(C_${i}, true, false)`,
|
|
144
144
|
`SetColor(C_${i}, "${colorWithOpacity(colors[i], 80)}")`,
|
|
145
145
|
`SetLineThickness(C_${i}, 0)`,
|
|
146
146
|
`Text("$\\tiny \\text{${labels[i]}$", (${getMidPoint(anglesCumulated[i], anglesCumulated[i + 1]).join(",")}), true, true, 0, 0)`,
|
|
@@ -100,9 +100,9 @@ const getGGBOptions = (identifiers) => {
|
|
|
100
100
|
const commands = cloudPoints.points.flatMap((point, i) => {
|
|
101
101
|
return [
|
|
102
102
|
`${point.name}=Point({${point.getXnumber()},${point.getYnumber()}})`,
|
|
103
|
-
`SetFixed(${point.name},true)`,
|
|
103
|
+
`SetFixed(${point.name},true, false)`,
|
|
104
104
|
`Lbl_{${i}} = Text("\\tiny ${point.name}", (${point.x.toMathString()},${point.y.evaluate() + 0.7}), true, true, 0, 0)`,
|
|
105
|
-
`SetFixed(Lbl_{${i}},true)`,
|
|
105
|
+
`SetFixed(Lbl_{${i}},true, false)`,
|
|
106
106
|
];
|
|
107
107
|
});
|
|
108
108
|
const ggb = new GeogebraConstructor({
|
|
@@ -57,7 +57,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
57
57
|
`g(x) = (${penteString}) * x + (${originString})`,
|
|
58
58
|
`SetColor(g, "${orange}")`,
|
|
59
59
|
`A = (${xA},${yA})`,
|
|
60
|
-
"SetFixed(A, true)",
|
|
60
|
+
"SetFixed(A, true, false)",
|
|
61
61
|
"SetPointStyle(A, 1)",
|
|
62
62
|
];
|
|
63
63
|
const xMin = Math.min(xA, xB);
|
|
@@ -52,7 +52,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
52
52
|
`g(x) = (${penteString}) * x + (${originString})`,
|
|
53
53
|
`SetColor(g, "${orange}")`,
|
|
54
54
|
`A = (${xA},${yA})`,
|
|
55
|
-
"SetFixed(A, true)",
|
|
55
|
+
"SetFixed(A, true, false)",
|
|
56
56
|
"SetPointStyle(A, 1)",
|
|
57
57
|
];
|
|
58
58
|
const xMin = Math.min(xA, xB);
|
|
@@ -118,7 +118,7 @@ const getGGBOptions = ({ trinomCoeffs, xA, yA, }) => {
|
|
|
118
118
|
label: "$\\mathcal C_f$",
|
|
119
119
|
}),
|
|
120
120
|
`A = (${xA},${yA})`,
|
|
121
|
-
"SetFixed(A, true)",
|
|
121
|
+
"SetFixed(A, true, false)",
|
|
122
122
|
"SetPointStyle(A, 1)",
|
|
123
123
|
`g(x) = Tangent(f,A)`,
|
|
124
124
|
`SetColor(g, "${orange}")`,
|
|
@@ -35,7 +35,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
35
35
|
const commands = [
|
|
36
36
|
`l = Line[(0, ${b}), (${secondPoint[0]}, ${secondPoint[1]})]`,
|
|
37
37
|
`SetColor(l, "${randomColor()}")`,
|
|
38
|
-
"SetFixed(l, true)",
|
|
38
|
+
"SetFixed(l, true, false)",
|
|
39
39
|
];
|
|
40
40
|
const ggb = new GeogebraConstructor({
|
|
41
41
|
commands,
|
|
@@ -27,7 +27,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
27
27
|
const commands = [
|
|
28
28
|
`l = Line((0, ${b}), (${secondPoint[0]}, ${secondPoint[1]}))`,
|
|
29
29
|
`SetColor(l, "${randomColor()}")`,
|
|
30
|
-
"SetFixed(l, true)",
|
|
30
|
+
"SetFixed(l, true, false)",
|
|
31
31
|
];
|
|
32
32
|
const xMin = Math.min(0, secondPoint[0]);
|
|
33
33
|
const xMax = Math.max(0, secondPoint[0]);
|
|
@@ -47,7 +47,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
47
47
|
const yMax = Math.max(yA, yB);
|
|
48
48
|
const commands = [
|
|
49
49
|
`L = Line((${xA}, ${yA}), (${xB}, ${yB}))`,
|
|
50
|
-
"SetFixed(L, true)",
|
|
50
|
+
"SetFixed(L, true, false)",
|
|
51
51
|
`SetColor(L, "${randomColor()}")`,
|
|
52
52
|
];
|
|
53
53
|
const ggb = new GeogebraConstructor({
|
|
@@ -52,7 +52,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
52
52
|
`S = Spline(${splinePoints
|
|
53
53
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
54
54
|
.join(",")})`,
|
|
55
|
-
"SetFixed(S, true)",
|
|
55
|
+
"SetFixed(S, true, false)",
|
|
56
56
|
`SetColor(S, "${randomColor()}")`,
|
|
57
57
|
];
|
|
58
58
|
const ggb = new GeogebraConstructor({
|
|
@@ -33,7 +33,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
33
33
|
`S =Spline(${identifiers.splinePoints
|
|
34
34
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
35
35
|
.join(",")})`,
|
|
36
|
-
"SetFixed(S, true)",
|
|
36
|
+
"SetFixed(S, true, false)",
|
|
37
37
|
`SetColor(S, "${randomColor()}")`,
|
|
38
38
|
];
|
|
39
39
|
const ggb = new GeogebraConstructor({ commands });
|
|
@@ -75,7 +75,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
75
75
|
`S = Spline(${allPoints
|
|
76
76
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
77
77
|
.join(",")})`,
|
|
78
|
-
"SetFixed(S, true)",
|
|
78
|
+
"SetFixed(S, true, false)",
|
|
79
79
|
`SetColor(S, "${randomColor()}")`,
|
|
80
80
|
`SetCaption(S, "$f$")`,
|
|
81
81
|
`ShowLabel(S, true)`,
|
|
@@ -100,7 +100,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
100
100
|
`P = Polynomial(${allPoints
|
|
101
101
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
102
102
|
.join(",")})`,
|
|
103
|
-
"SetFixed(P, true)",
|
|
103
|
+
"SetFixed(P, true, false)",
|
|
104
104
|
`SetColor(P, "${randomColor()}")`,
|
|
105
105
|
`SetCaption(P, "$f$")`,
|
|
106
106
|
`ShowLabel(P, true)`,
|
|
@@ -48,14 +48,14 @@ const getGGBOptions = (identifiers) => {
|
|
|
48
48
|
`S = Spline(${fSplinePoints
|
|
49
49
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
50
50
|
.join(",")})`,
|
|
51
|
-
"SetFixed(S, true)",
|
|
51
|
+
"SetFixed(S, true, false)",
|
|
52
52
|
`SetColor(S, "${fColor}")`,
|
|
53
53
|
`SetCaption(S, "$f$")`,
|
|
54
54
|
`ShowLabel(S, true)`,
|
|
55
55
|
`T = Spline(${gSplinePoints
|
|
56
56
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
57
57
|
.join(",")})`,
|
|
58
|
-
"SetFixed(T, true)",
|
|
58
|
+
"SetFixed(T, true, false)",
|
|
59
59
|
`SetColor(T, "${gColor}")`,
|
|
60
60
|
`SetCaption(T, "$g$")`,
|
|
61
61
|
`ShowLabel(T, true)`,
|
|
@@ -43,14 +43,14 @@ const getGGBOptions = (identifiers) => {
|
|
|
43
43
|
`S = Spline(${fSplinePoints
|
|
44
44
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
45
45
|
.join(",")})`,
|
|
46
|
-
"SetFixed(S, true)",
|
|
46
|
+
"SetFixed(S, true, false)",
|
|
47
47
|
`SetColor(S, "${fColor}")`,
|
|
48
48
|
`SetCaption(S, "$f$")`,
|
|
49
49
|
`ShowLabel(S, true)`,
|
|
50
50
|
`T = Spline(${gSplinePoints
|
|
51
51
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
52
52
|
.join(",")})`,
|
|
53
|
-
"SetFixed(T, true)",
|
|
53
|
+
"SetFixed(T, true, false)",
|
|
54
54
|
`SetColor(T, "${gColor}")`,
|
|
55
55
|
`SetCaption(T, "$g$")`,
|
|
56
56
|
`ShowLabel(T, true)`,
|
|
@@ -76,7 +76,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
76
76
|
`E = (${width / 2},${height})`,
|
|
77
77
|
...["A", "B", "C", "D", "E"].flatMap((e) => [
|
|
78
78
|
`SetVisibleInView(${e},1, false)`,
|
|
79
|
-
`SetFixed(${e}, true)`,
|
|
79
|
+
`SetFixed(${e}, true, false)`,
|
|
80
80
|
]),
|
|
81
81
|
`Segment(E, C)`,
|
|
82
82
|
`Segment(D, C)`,
|
|
@@ -91,7 +91,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
91
91
|
`c = Angle(A,D,C)`,
|
|
92
92
|
`ShowLabel(c, false)`,
|
|
93
93
|
`P = Polygon(B,A,E,C)`,
|
|
94
|
-
`SetFixed(P, true)`,
|
|
94
|
+
`SetFixed(P, true, false)`,
|
|
95
95
|
`Text("$\\scriptsize B$", (0, -0.1*${height}), true, true, 0, 0)`,
|
|
96
96
|
`Text("$\\scriptsize C$", (${width}, -0.1*${height}), true, true, 0, 0)`,
|
|
97
97
|
`Text("$\\scriptsize D$", (${width}, ${height}+0.3+${Math.min(1, 0.1 * height)}), true, true, 0, 0)`,
|
|
@@ -77,7 +77,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
77
77
|
`d = Line((${aX},${aY}),(${bX},${bY}))`,
|
|
78
78
|
`SetCaption(d, "$d$")`,
|
|
79
79
|
`ShowLabel(d,true)`,
|
|
80
|
-
`SetFixed(d,true)`,
|
|
80
|
+
`SetFixed(d,true, false)`,
|
|
81
81
|
];
|
|
82
82
|
const ggb = new GeogebraConstructor({ commands });
|
|
83
83
|
return ggb.getOptions({
|
|
@@ -45,7 +45,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
45
45
|
const commands = [
|
|
46
46
|
`line = Line((${x1}, ${y1}), (${x2}, ${y2}))`,
|
|
47
47
|
`SetColor(line, "${randomColor()}")`,
|
|
48
|
-
`SetFixed(line, true)`,
|
|
48
|
+
`SetFixed(line, true, false)`,
|
|
49
49
|
];
|
|
50
50
|
const xMin = Math.min(x1, x2);
|
|
51
51
|
const yMin = Math.min(y1, y2);
|
|
@@ -19,19 +19,19 @@ const getGGBOptions = (identifiers) => {
|
|
|
19
19
|
`ShowLabel(A, true)`,
|
|
20
20
|
"SetPointStyle(A, 1)",
|
|
21
21
|
`SetPointSize(A, 4)`,
|
|
22
|
-
`SetFixed(A, true)`,
|
|
22
|
+
`SetFixed(A, true, false)`,
|
|
23
23
|
"O = (0,0)",
|
|
24
|
-
`SetFixed(O, true)`,
|
|
24
|
+
`SetFixed(O, true, false)`,
|
|
25
25
|
`SetCaption(O, "0")`,
|
|
26
26
|
`ShowLabel(O, true)`,
|
|
27
27
|
`SetPointSize(O, 4)`,
|
|
28
28
|
"I = (1,0)",
|
|
29
|
-
`SetFixed(I, true)`,
|
|
29
|
+
`SetFixed(I, true, false)`,
|
|
30
30
|
`SetCaption(I, "1")`,
|
|
31
31
|
`ShowLabel(I, true)`,
|
|
32
32
|
`SetPointSize(I, 4)`,
|
|
33
33
|
"J = (0,1)",
|
|
34
|
-
`SetFixed(J, true)`,
|
|
34
|
+
`SetFixed(J, true, false)`,
|
|
35
35
|
`ShowLabel(J, true)`,
|
|
36
36
|
`SetCaption(J, "1")`,
|
|
37
37
|
`SetPointSize(J, 4)`,
|
|
@@ -28,17 +28,17 @@ const getGGBOptions = (identifiers) => {
|
|
|
28
28
|
// `SetPointStyle(A, 0)`,
|
|
29
29
|
`SetPointSize(A, 4)`,
|
|
30
30
|
"SetPointStyle(A, 1)",
|
|
31
|
-
`SetFixed(A, true)`,
|
|
31
|
+
`SetFixed(A, true, false)`,
|
|
32
32
|
"O = (0,0)",
|
|
33
|
-
`SetFixed(O, true)`,
|
|
33
|
+
`SetFixed(O, true, false)`,
|
|
34
34
|
`ShowLabel(O, true)`,
|
|
35
35
|
`SetPointSize(O, 4)`,
|
|
36
36
|
"I = (1,0)",
|
|
37
|
-
`SetFixed(I, true)`,
|
|
37
|
+
`SetFixed(I, true, false)`,
|
|
38
38
|
`ShowLabel(I, true)`,
|
|
39
39
|
`SetPointSize(I, 4)`,
|
|
40
40
|
"J = (0,1)",
|
|
41
|
-
`SetFixed(J, true)`,
|
|
41
|
+
`SetFixed(J, true, false)`,
|
|
42
42
|
`ShowLabel(J, true)`,
|
|
43
43
|
`SetPointSize(J, 4)`,
|
|
44
44
|
];
|
|
@@ -72,7 +72,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
72
72
|
const commands = [
|
|
73
73
|
`l = Line[(0, ${b}), (${secondPoint[0]}, ${secondPoint[1]})]`,
|
|
74
74
|
`SetColor(l, "${randomColor()}")`,
|
|
75
|
-
"SetFixed(l, true)",
|
|
75
|
+
"SetFixed(l, true, false)",
|
|
76
76
|
];
|
|
77
77
|
const ggb = new GeogebraConstructor({
|
|
78
78
|
commands,
|
|
@@ -71,7 +71,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
71
71
|
const ggb = new GeogebraConstructor({
|
|
72
72
|
commands: [
|
|
73
73
|
`A = Function(x(${round(perimeter / 2, 2)}-x), 0, ${perimeter / 2})`,
|
|
74
|
-
`SetFixed(A, true)`,
|
|
74
|
+
`SetFixed(A, true, false)`,
|
|
75
75
|
`SetColor(A, "${blueDark}")`,
|
|
76
76
|
`SetCaption(A, "A(x)")`,
|
|
77
77
|
`ShowLabel(A, true)`,
|
|
@@ -58,16 +58,16 @@ const getGGBOptions = (identifiers) => {
|
|
|
58
58
|
const commands = [
|
|
59
59
|
"B = (-2, -2)",
|
|
60
60
|
`ShowLabel(B, true)`,
|
|
61
|
-
`SetFixed(B, true)`,
|
|
61
|
+
`SetFixed(B, true, false)`,
|
|
62
62
|
"A = (-2, 2)",
|
|
63
63
|
`ShowLabel(A, true)`,
|
|
64
|
-
`SetFixed(A, true)`,
|
|
64
|
+
`SetFixed(A, true, false)`,
|
|
65
65
|
"D = (1, 2)",
|
|
66
66
|
`ShowLabel(D, true)`,
|
|
67
|
-
`SetFixed(D, true)`,
|
|
67
|
+
`SetFixed(D, true, false)`,
|
|
68
68
|
"C= (1, -2)",
|
|
69
69
|
`ShowLabel(C, true)`,
|
|
70
|
-
`SetFixed(C, true)`,
|
|
70
|
+
`SetFixed(C, true, false)`,
|
|
71
71
|
"SA = Segment(A, B)",
|
|
72
72
|
"SB = Segment(B, C)",
|
|
73
73
|
"SC = Segment(C, D)",
|
|
@@ -58,16 +58,16 @@ const getGGBOptions = (identifiers) => {
|
|
|
58
58
|
const commands = [
|
|
59
59
|
"C = (-6, -6)",
|
|
60
60
|
`ShowLabel(C, true)`,
|
|
61
|
-
`SetFixed(C, true)`,
|
|
61
|
+
`SetFixed(C, true, false)`,
|
|
62
62
|
"D = (-3, 3)",
|
|
63
63
|
`ShowLabel(D, true)`,
|
|
64
|
-
`SetFixed(D, true)`,
|
|
64
|
+
`SetFixed(D, true, false)`,
|
|
65
65
|
"A = (6, 6)",
|
|
66
66
|
`ShowLabel(A, true)`,
|
|
67
|
-
`SetFixed(A, true)`,
|
|
67
|
+
`SetFixed(A, true, false)`,
|
|
68
68
|
"B = (3, -3)",
|
|
69
69
|
`ShowLabel(B, true)`,
|
|
70
|
-
`SetFixed(B, true)`,
|
|
70
|
+
`SetFixed(B, true, false)`,
|
|
71
71
|
"SA = Segment(A, B)",
|
|
72
72
|
"SB = Segment(B, C)",
|
|
73
73
|
"SC = Segment(C, D)",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,0CAA0C,CAAC;AACzD,cAAc,qCAAqC,CAAC"}
|
|
@@ -612,7 +612,7 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
|
|
|
612
612
|
answer: getAnswer(identifiers, opts),
|
|
613
613
|
instruction: getInstruction(identifiers, opts),
|
|
614
614
|
keys: getKeys(identifiers, opts),
|
|
615
|
-
answerFormat: "
|
|
615
|
+
answerFormat: "raw",
|
|
616
616
|
identifiers,
|
|
617
617
|
hint: getHint(identifiers),
|
|
618
618
|
correction: getCorrection(identifiers),
|
|
@@ -62,7 +62,7 @@ const getGGBAnswer = (identifiers) => {
|
|
|
62
62
|
isStartingPointAsked
|
|
63
63
|
? `a = Vector(${solutionPoint.toMathString()},${point.toMathString()})`
|
|
64
64
|
: `a = Vector(${point.toMathString()}, ${solutionPoint.toMathString()})`,
|
|
65
|
-
`SetFixed(a, true)`,
|
|
65
|
+
`SetFixed(a, true, false)`,
|
|
66
66
|
];
|
|
67
67
|
};
|
|
68
68
|
const getStudentGGBOptions = (identifiers) => {
|
|
@@ -95,7 +95,7 @@ const getStudentGGBOptions = (identifiers) => {
|
|
|
95
95
|
`${vector.name}=Vector(${vectorStartPoint.toMathString()},${vectorEndPoint.toMathString()})`,
|
|
96
96
|
`SetCaption(${vector.name},"$${vector.toTex()}$")`,
|
|
97
97
|
`ShowLabel(${vector.name},true)`,
|
|
98
|
-
`SetFixed(${vector.name},true)`,
|
|
98
|
+
`SetFixed(${vector.name},true, false)`,
|
|
99
99
|
],
|
|
100
100
|
customToolBar: toolBarConstructor({
|
|
101
101
|
point: true,
|
|
@@ -103,16 +103,16 @@ const getCorrectionGGBOptions = (identifiers) => {
|
|
|
103
103
|
commands: [
|
|
104
104
|
`${pointNames[0]} = (-1, 0)`,
|
|
105
105
|
`ShowLabel(${pointNames[0]}, true)`,
|
|
106
|
-
`SetFixed(${pointNames[0]}, true)`,
|
|
106
|
+
`SetFixed(${pointNames[0]}, true, false)`,
|
|
107
107
|
`${pointNames[1]} = (1,2)`,
|
|
108
108
|
`ShowLabel(${pointNames[1]}, true)`,
|
|
109
|
-
`SetFixed(${pointNames[1]}, true)`,
|
|
109
|
+
`SetFixed(${pointNames[1]}, true, false)`,
|
|
110
110
|
`${pointNames[2]} = (2, 0)`,
|
|
111
111
|
`ShowLabel(${pointNames[2]}, true)`,
|
|
112
|
-
`SetFixed(${pointNames[2]}, true)`,
|
|
112
|
+
`SetFixed(${pointNames[2]}, true, false)`,
|
|
113
113
|
`${pointNames[3]} = (0, -2)`,
|
|
114
114
|
`ShowLabel(${pointNames[3]}, true)`,
|
|
115
|
-
`SetFixed(${pointNames[3]}, true)`,
|
|
115
|
+
`SetFixed(${pointNames[3]}, true, false)`,
|
|
116
116
|
`Polygon(${pointNames.join(",")})`,
|
|
117
117
|
`Vector(${pointNames[0]}, ${pointNames[1]})`,
|
|
118
118
|
`Vector(${pointNames[3]}, ${pointNames[2]})`,
|
|
@@ -76,8 +76,8 @@ const getGGBOptions = (identifiers) => {
|
|
|
76
76
|
const commands = [
|
|
77
77
|
`A = (0, 0, 0)`,
|
|
78
78
|
`B = (0, 0, ${height})`,
|
|
79
|
-
`SetFixed(A, true)`,
|
|
80
|
-
`SetFixed(B, true)`,
|
|
79
|
+
`SetFixed(A, true, false)`,
|
|
80
|
+
`SetFixed(B, true, false)`,
|
|
81
81
|
`SetVisibleInView(A, -1, false)`,
|
|
82
82
|
`SetVisibleInView(B, -1, false)`,
|
|
83
83
|
`Cone(A, B, ${radius})`,
|
|
@@ -65,14 +65,14 @@ const getGGBOptions = (identifiers) => {
|
|
|
65
65
|
`ShowLabel(F, true)`,
|
|
66
66
|
`ShowLabel(G, true)`,
|
|
67
67
|
`ShowLabel(H, true)`,
|
|
68
|
-
`SetFixed(A, true)`,
|
|
69
|
-
`SetFixed(B, true)`,
|
|
70
|
-
`SetFixed(C, true)`,
|
|
71
|
-
`SetFixed(D, true)`,
|
|
72
|
-
`SetFixed(E, true)`,
|
|
73
|
-
`SetFixed(F, true)`,
|
|
74
|
-
`SetFixed(G, true)`,
|
|
75
|
-
`SetFixed(H, true)`,
|
|
68
|
+
`SetFixed(A, true, false)`,
|
|
69
|
+
`SetFixed(B, true, false)`,
|
|
70
|
+
`SetFixed(C, true, false)`,
|
|
71
|
+
`SetFixed(D, true, false)`,
|
|
72
|
+
`SetFixed(E, true, false)`,
|
|
73
|
+
`SetFixed(F, true, false)`,
|
|
74
|
+
`SetFixed(G, true, false)`,
|
|
75
|
+
`SetFixed(H, true, false)`,
|
|
76
76
|
];
|
|
77
77
|
const ggb = new GeogebraConstructor({
|
|
78
78
|
commands,
|
|
@@ -76,7 +76,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
76
76
|
`J = (${width}, ${subHeight})`,
|
|
77
77
|
`K = J + 0.5*${depth}(cos(45°), sin(45°))`,
|
|
78
78
|
`L = I + 0.5*${depth}(cos(45°), sin(45°))`,
|
|
79
|
-
...["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L"].flatMap((v) => [`SetFixed(${v}, true)`, `SetVisibleInView(${v},1, false)`]),
|
|
79
|
+
...["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L"].flatMap((v) => [`SetFixed(${v}, true, false)`, `SetVisibleInView(${v},1, false)`]),
|
|
80
80
|
// `SetVisibleInView(A,1,true)`,
|
|
81
81
|
// `SetVisibleInView(B,1,true)`,
|
|
82
82
|
// `SetVisibleInView(F,1,true)`,
|
|
@@ -48,15 +48,15 @@ const getGGBOptions = (identifiers) => {
|
|
|
48
48
|
`ShowLabel(B,true)`,
|
|
49
49
|
`ShowLabel(C,true)`,
|
|
50
50
|
`ShowLabel(D,true)`,
|
|
51
|
-
`SetFixed(A,true)`,
|
|
52
|
-
`SetFixed(B,true)`,
|
|
53
|
-
`SetFixed(C,true)`,
|
|
54
|
-
`SetFixed(D,true)`,
|
|
51
|
+
`SetFixed(A,true, false)`,
|
|
52
|
+
`SetFixed(B,true, false)`,
|
|
53
|
+
`SetFixed(C,true, false)`,
|
|
54
|
+
`SetFixed(D,true, false)`,
|
|
55
55
|
`Poly=Polygon(A,B,C,D)`,
|
|
56
56
|
];
|
|
57
57
|
commands = commands.concat([
|
|
58
58
|
`H=Point({${sideSizes[0] / 2},${sideSizes[1] / 2},${h}})`,
|
|
59
|
-
`SetFixed(H,true)`,
|
|
59
|
+
`SetFixed(H,true, false)`,
|
|
60
60
|
`ShowLabel(H,true)`,
|
|
61
61
|
`Pyra=Pyramid(Poly,H)`,
|
|
62
62
|
]);
|
|
@@ -90,9 +90,9 @@ const getGGBOptions = (identifiers) => {
|
|
|
90
90
|
`ShowLabel(A,True)`,
|
|
91
91
|
`ShowLabel(B,True)`,
|
|
92
92
|
`ShowLabel(C,True)`,
|
|
93
|
-
`SetFixed(A,true)`,
|
|
94
|
-
`SetFixed(B,true)`,
|
|
95
|
-
`SetFixed(C,true)`,
|
|
93
|
+
`SetFixed(A,true, false)`,
|
|
94
|
+
`SetFixed(B,true, false)`,
|
|
95
|
+
`SetFixed(C,true, false)`,
|
|
96
96
|
`Poly=Polygon(A,B,C)`,
|
|
97
97
|
];
|
|
98
98
|
commands = commands.concat([
|
|
@@ -100,8 +100,8 @@ const getGGBOptions = (identifiers) => {
|
|
|
100
100
|
`D=Point({0,0,0})`,
|
|
101
101
|
`ShowLabel(D,true)`,
|
|
102
102
|
`ShowLabel(H,true)`,
|
|
103
|
-
`SetFixed(H,true)`,
|
|
104
|
-
`SetFixed(D,true)`,
|
|
103
|
+
`SetFixed(H,true, false)`,
|
|
104
|
+
`SetFixed(D,true, false)`,
|
|
105
105
|
`Pyra=Pyramid(Poly,H)`,
|
|
106
106
|
]);
|
|
107
107
|
const ggb = new GeogebraConstructor({
|
|
@@ -55,14 +55,14 @@ const getGGBOptions = (identifiers) => {
|
|
|
55
55
|
`ShowLabel(A,True)`,
|
|
56
56
|
`ShowLabel(B,True)`,
|
|
57
57
|
`ShowLabel(C,True)`,
|
|
58
|
-
`SetFixed(A,true)`,
|
|
59
|
-
`SetFixed(B,true)`,
|
|
60
|
-
`SetFixed(C,true)`,
|
|
58
|
+
`SetFixed(A,true, false)`,
|
|
59
|
+
`SetFixed(B,true, false)`,
|
|
60
|
+
`SetFixed(C,true, false)`,
|
|
61
61
|
`Poly=Polygon(A,B,C)`,
|
|
62
62
|
];
|
|
63
63
|
commands = commands.concat([
|
|
64
64
|
`H=Point({${ABSide / 4},${ACSide / 4},${h}})`,
|
|
65
|
-
`SetFixed(H,true)`,
|
|
65
|
+
`SetFixed(H,true, false)`,
|
|
66
66
|
`ShowLabel(H,true)`,
|
|
67
67
|
`Pyra=Pyramid(Poly,H)`,
|
|
68
68
|
]);
|
|
@@ -25,7 +25,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
25
25
|
return `${point.name}=Point({${point.getXnumber()},${point.getYnumber()}})`;
|
|
26
26
|
});
|
|
27
27
|
commands.push(...cloudPoints.points.map((point) => {
|
|
28
|
-
return `SetFixed(${point.name},true)`;
|
|
28
|
+
return `SetFixed(${point.name},true, false)`;
|
|
29
29
|
}));
|
|
30
30
|
const ggb = new GeogebraConstructor({
|
|
31
31
|
commands,
|
|
@@ -20,7 +20,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
20
20
|
return `A${index}=(${point[0]},${point[1]})`;
|
|
21
21
|
});
|
|
22
22
|
commands.push(...points.map((_, index) => {
|
|
23
|
-
return `SetFixed(A${index},true)`;
|
|
23
|
+
return `SetFixed(A${index},true, false)`;
|
|
24
24
|
}), ...points.map((_, index) => {
|
|
25
25
|
return `SetLabelMode(A${index},1)`;
|
|
26
26
|
}));
|
|
@@ -17,7 +17,7 @@ const getGGBOptions = (identifiers) => {
|
|
|
17
17
|
const { concentration, absorbtion } = identifiers;
|
|
18
18
|
const commands = [
|
|
19
19
|
`L = Line[(0,0), (${concentration}, ${absorbtion})]`,
|
|
20
|
-
`SetFixed(L, true)`,
|
|
20
|
+
`SetFixed(L, true, false)`,
|
|
21
21
|
`SetColor(L, "${randomColor()}")`,
|
|
22
22
|
];
|
|
23
23
|
const ggb = new GeogebraConstructor({
|
|
@@ -57,11 +57,11 @@ const getGGBOptions = (identifiers) => {
|
|
|
57
57
|
`SetColor(R,"#F78D04")`,
|
|
58
58
|
`SetColor(I,"#F78D04")`,
|
|
59
59
|
`SetColor(YText,"${orangeDark}")`,
|
|
60
|
-
`SetFixed(E,true)`,
|
|
61
|
-
`SetFixed(R,true)`,
|
|
62
|
-
`SetFixed(I,true)`,
|
|
63
|
-
`SetFixed(DashedLine,true)`,
|
|
64
|
-
`SetFixed(Y,true)`,
|
|
60
|
+
`SetFixed(E,true, false)`,
|
|
61
|
+
`SetFixed(R,true, false)`,
|
|
62
|
+
`SetFixed(I,true, false)`,
|
|
63
|
+
`SetFixed(DashedLine,true, false)`,
|
|
64
|
+
`SetFixed(Y,true, false)`,
|
|
65
65
|
`FirstPolygon = Polygon((15, 0), (15,12), (-15, 12), (-15, 0))`,
|
|
66
66
|
`SecondPolygon = Polygon((15, 0), (15,-12), (-15, -12), (-15, 0))`,
|
|
67
67
|
`SetColor(FirstPolygon,"${blueMain}")`,
|
|
@@ -21,11 +21,11 @@ const getGGBOptions = (identifiers) => {
|
|
|
21
21
|
`S =Spline(${splinePoints
|
|
22
22
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
23
23
|
.join(",")})`,
|
|
24
|
-
"SetFixed(S, true)",
|
|
24
|
+
"SetFixed(S, true, false)",
|
|
25
25
|
`SetColor(S, "${color}")`,
|
|
26
26
|
];
|
|
27
27
|
for (let i = 1; i < 10; i++) {
|
|
28
|
-
commands.push(`S_{${i}} = Translate(S, (${i * period}, 0))`, `SetFixed(S_{${i}}, true)`, `SetColor(S_{${i}}, "${color}")`);
|
|
28
|
+
commands.push(`S_{${i}} = Translate(S, (${i * period}, 0))`, `SetFixed(S_{${i}}, true, false)`, `SetColor(S_{${i}}, "${color}")`);
|
|
29
29
|
}
|
|
30
30
|
const ggb = new GeogebraConstructor({
|
|
31
31
|
commands,
|
|
@@ -27,11 +27,11 @@ const getGGBOptions = (identifiers) => {
|
|
|
27
27
|
`S =Spline(${splinePoints
|
|
28
28
|
.map((point) => `(${point[0]},${point[1]})`)
|
|
29
29
|
.join(",")})`,
|
|
30
|
-
"SetFixed(S, true)",
|
|
30
|
+
"SetFixed(S, true, false)",
|
|
31
31
|
`SetColor(S, "${color}")`,
|
|
32
32
|
];
|
|
33
33
|
for (let i = 1; i < 10; i++) {
|
|
34
|
-
commands.push(`S_{${i}} = Translate(S, (${i * period}, 0))`, `SetFixed(S_{${i}}, true)`, `SetColor(S_{${i}}, "${color}")`);
|
|
34
|
+
commands.push(`S_{${i}} = Translate(S, (${i * period}, 0))`, `SetFixed(S_{${i}}, true, false)`, `SetColor(S_{${i}}, "${color}")`);
|
|
35
35
|
}
|
|
36
36
|
const ggb = new GeogebraConstructor({
|
|
37
37
|
commands,
|
package/lib/geogebra/lagrange.js
CHANGED
package/lib/geogebra/spline.js
CHANGED
package/lib/index.d.ts
CHANGED
|
@@ -1765,6 +1765,35 @@ declare const mathExercises: (Exercise<{
|
|
|
1765
1765
|
isPapillon: boolean;
|
|
1766
1766
|
}, {
|
|
1767
1767
|
configurationType: string;
|
|
1768
|
+
}> | Exercise<{
|
|
1769
|
+
triangleIds1: import("./math/geometry/triangles/triangle.js").TriangleIdentifiers;
|
|
1770
|
+
triangleIds2: import("./math/geometry/triangles/triangle.js").TriangleIdentifiers;
|
|
1771
|
+
formula: {
|
|
1772
|
+
lhs: number[][];
|
|
1773
|
+
rhs: number[][];
|
|
1774
|
+
isEqualSymbol: boolean;
|
|
1775
|
+
};
|
|
1776
|
+
isPapillon: boolean;
|
|
1777
|
+
rand: number;
|
|
1778
|
+
isUsualFormula: boolean;
|
|
1779
|
+
}, {
|
|
1780
|
+
configurationType: string;
|
|
1781
|
+
formulaType: string;
|
|
1782
|
+
}> | Exercise<{
|
|
1783
|
+
triangleIds1: import("./math/geometry/triangles/triangle.js").TriangleIdentifiers;
|
|
1784
|
+
triangleIds2: import("./math/geometry/triangles/triangle.js").TriangleIdentifiers;
|
|
1785
|
+
isPapillon: boolean;
|
|
1786
|
+
randTarget: number;
|
|
1787
|
+
formulas: {
|
|
1788
|
+
lhs: number[][];
|
|
1789
|
+
rhs: number[][];
|
|
1790
|
+
isEqualSymbol: boolean;
|
|
1791
|
+
rand: number;
|
|
1792
|
+
isUsualFormula: boolean;
|
|
1793
|
+
}[];
|
|
1794
|
+
}, {
|
|
1795
|
+
configurationType: string;
|
|
1796
|
+
formulaType: string;
|
|
1768
1797
|
}> | Exercise<{
|
|
1769
1798
|
randLetters: string[];
|
|
1770
1799
|
vectors: string[];
|
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;AAC7D,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAC;AAE3D,OAAO,4BAA4B,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,QAAA,MAAM,aAAa
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAC;AAE3D,OAAO,4BAA4B,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kDAA+B,CAAC;AACnD,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kDAA6B,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"circle.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/circle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,MAAM;IACjB,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBACD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,MAAM;IAMtD,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,GACjC,GACD,kBAAuB;
|
|
1
|
+
{"version":3,"file":"circle.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/circle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,MAAM;IACjB,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBACD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,MAAM;IAMtD,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,GACjC,GACD,kBAAuB;CAoC1B"}
|
|
@@ -25,7 +25,7 @@ export class Circle {
|
|
|
25
25
|
commands.push(`${this.name}=Circle(${this.center.toMathString()},${this.point.toMathString()})`);
|
|
26
26
|
}
|
|
27
27
|
commands.push(...[
|
|
28
|
-
`SetFixed(${this.name},${isFixed ? "true" : "false"})`,
|
|
28
|
+
`SetFixed(${this.name},${isFixed ? "true" : "false"},${isFixed ? "false" : "true"})`,
|
|
29
29
|
`ShowLabel(${this.name},${showLabel ? "true" : "false"})`,
|
|
30
30
|
]);
|
|
31
31
|
return commands;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/line.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAG1F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAS,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAmB3E,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,EAAqB,MAAM,aAAa,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,gBAAgB,CAAC;CAC1B,CAAC;AACF,8BAAsB,eAAe;IACnC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM;IAO3B,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,eAAe;IAOnD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO;IAGnC,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM;IAItD,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS;CAsBnC;AACD,qBAAa,IAAI;IACf,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7B,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;gBAGd,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,KAAK,EACb,IAAI,CAAC,EAAE,MAAM;IA4Bf,aAAa;;;;;IAOb,WAAW,CAAC,IAAI,EAAE,IAAI;IAYtB,iBAAiB;IAIjB,YAAY,CAAC,KAAK,EAAE,KAAK;IAYzB,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAW7B,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,SAAI;IAkBjC,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM;IAK7C,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM;IAW7C,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM;IAa5B,iBAAiB,QAAO,SAAS,CAO/B;IAEF,oBAAoB,IAAI,SAAS;IAUjC,iBAAiB;IA2BjB,KAAK;IAGL,gBAAgB;IAIhB,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,EAEhC,KAAiB,EACjB,KAAiB,GAClB,GAAE,kBAAuB;
|
|
1
|
+
{"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/line.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAG1F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAS,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAmB3E,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,EAAqB,MAAM,aAAa,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,gBAAgB,CAAC;CAC1B,CAAC;AACF,8BAAsB,eAAe;IACnC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM;IAO3B,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,eAAe;IAOnD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO;IAGnC,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM;IAItD,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS;CAsBnC;AACD,qBAAa,IAAI;IACf,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7B,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;gBAGd,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,KAAK,EACb,IAAI,CAAC,EAAE,MAAM;IA4Bf,aAAa;;;;;IAOb,WAAW,CAAC,IAAI,EAAE,IAAI;IAYtB,iBAAiB;IAIjB,YAAY,CAAC,KAAK,EAAE,KAAK;IAYzB,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAW7B,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,SAAI;IAkBjC,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM;IAK7C,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM;IAW7C,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM;IAa5B,iBAAiB,QAAO,SAAS,CAO/B;IAEF,oBAAoB,IAAI,SAAS;IAUjC,iBAAiB;IA2BjB,KAAK;IAGL,gBAAgB;IAIhB,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,EAEhC,KAAiB,EACjB,KAAiB,GAClB,GAAE,kBAAuB;IA6C5B,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,EAAE,MAAM;IAa5C,SAAS,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,EAAE,CAAC,EAAE,aAAa,GAAG,MAAM;CAG/D"}
|
|
@@ -223,7 +223,7 @@ export class Line {
|
|
|
223
223
|
commands.push(`${this.ggbName}=Line(${this.pointA.toMathString()},${this.pointB.toMathString()})`);
|
|
224
224
|
}
|
|
225
225
|
commands.push(...[
|
|
226
|
-
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"})`,
|
|
226
|
+
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"},${isFixed ? "false" : "true"})`,
|
|
227
227
|
`ShowLabel(${this.ggbName},${showLabel ? "true" : "false"})`,
|
|
228
228
|
]);
|
|
229
229
|
if (label) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parabola.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/parabola.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,QAAQ;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;gBACJ,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM;IAS1C,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,EAEhC,KAAiB,GAClB,GAAE,kBAAuB;
|
|
1
|
+
{"version":3,"file":"parabola.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/parabola.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,QAAQ;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;gBACJ,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM;IAS1C,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,EAEhC,KAAiB,GAClB,GAAE,kBAAuB;CAoC7B"}
|
|
@@ -29,7 +29,7 @@ export class Parabola {
|
|
|
29
29
|
commands.push(`SetCaption(${this.ggbName}, "${label}")`);
|
|
30
30
|
}
|
|
31
31
|
commands.push(...[
|
|
32
|
-
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"})`,
|
|
32
|
+
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"},${isFixed ? "false" : "true"})`,
|
|
33
33
|
`ShowLabel(${this.ggbName},${showLabel ? "true" : "false"})`,
|
|
34
34
|
]);
|
|
35
35
|
return commands;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/point.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,eAAe,EAChB,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAM7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAIvC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AACF,8BAAsB,gBAAgB;IACpC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE;IAGrC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM;IAKhC,MAAM,CAAC,MAAM,CAAC,IAAI,SAAM;IAGxB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAM,EAAE,GAAG,SAAK,GAAG,KAAK;IAMvD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,gBAAgB;IAQpD,MAAM,CAAC,SAAS,CACd,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,EACE,OAAa,EACb,WAAW,GACZ,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAO;IAQpD,MAAM,CAAC,eAAe,CACpB,KAAK,EAAE,MAAM,EACb,EACE,KAAK,EACL,WAAW,EACX,mBAAmB,GACpB,EAAE;QACD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B;IA+BH,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM;CAclC;AAED,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;gBAEf,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,aAAa,GAAG,MAAM,EACzB,CAAC,EAAE,aAAa,GAAG,MAAM;IAO3B,KAAK,IAAI,MAAM;IAGf,aAAa,IAAI,gBAAgB;IAQjC,eAAe,IAAI,MAAM;IAGzB,QAAQ,IAAI,MAAM;IAIlB,UAAU,IAAI,MAAM;IAIpB,UAAU,IAAI,MAAM;IAIpB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,SAAM,GAAG,KAAK;IAOzC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,SAAM,GAAG,KAAK;IAQrC,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM;IAK5B,cAAc,CAAC,CAAC,EAAE,KAAK,GAAG,aAAa;IAMvC,MAAM,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO;IAGzB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK;IAK5B,YAAY;IAGZ,YAAY,CAAC,EACX,OAAc,EACd,SAAgB,EAChB,KAAK,EACL,IAAI,EACJ,KAAK,EACL,KAAK,GACN,GAAE,kBAAuB;
|
|
1
|
+
{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/point.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,7 +130,7 @@ export class Point {
|
|
|
130
130
|
toGGBCommand({ isFixed = true, showLabel = true, style, size, color, label, } = {}) {
|
|
131
131
|
const commands = [
|
|
132
132
|
`${this.name} = (${this.x.toMathString()}, ${this.y.toMathString()})`,
|
|
133
|
-
`SetFixed(${this.name},${isFixed ? "true" : "false"})`,
|
|
133
|
+
`SetFixed(${this.name},${isFixed ? "true" : "false"},${isFixed ? "false" : "true"})`,
|
|
134
134
|
`ShowLabel(${this.name},${showLabel ? "true" : "false"})`,
|
|
135
135
|
];
|
|
136
136
|
if (label !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ray.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/ray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAE1F,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEvE,8BAAsB,cAAc;IAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM;IAO3B,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,cAAc;CAOnD;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,WAAW,EAAE,gBAAgB,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,qBAAa,GAAG;IACd,UAAU,EAAE,KAAK,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;gBACJ,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,MAAM;IAMhE,aAAa,IAAI,cAAc;IAO/B,KAAK;IAGL,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,GACjC,GAAE,kBAAuB;
|
|
1
|
+
{"version":3,"file":"ray.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/ray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAE1F,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEvE,8BAAsB,cAAc;IAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM;IAO3B,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,cAAc;CAOnD;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,WAAW,EAAE,gBAAgB,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,qBAAa,GAAG;IACd,UAAU,EAAE,KAAK,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;gBACJ,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,MAAM;IAMhE,aAAa,IAAI,cAAc;IAO/B,KAAK;IAGL,aAAa,CACX,iBAAiB,EAAE,OAAO,EAC1B,EACE,OAAc,EACd,SAAiB,EACjB,yBAAgC,GACjC,GAAE,kBAAuB;CAsB7B"}
|
package/lib/math/geometry/ray.js
CHANGED
|
@@ -36,7 +36,7 @@ export class Ray {
|
|
|
36
36
|
toGGBCommands(shouldBuildPoints, { isFixed = true, showLabel = false, showUnderlyingPointsLabel = true, } = {}) {
|
|
37
37
|
const commands = [
|
|
38
38
|
`${this.ggbName}=Ray(${this.startPoint.name},${this.secondPoint.name})`,
|
|
39
|
-
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"})`,
|
|
39
|
+
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"},${isFixed ? "false" : "true"})`,
|
|
40
40
|
`ShowLabel(${this.ggbName},${showLabel ? "true" : "false"})`,
|
|
41
41
|
];
|
|
42
42
|
if (shouldBuildPoints) {
|
|
@@ -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,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAK7C,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGvE,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;
|
|
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,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAK7C,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGvE,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;IAkC5B,QAAQ,CAAC,KAAK,EAAE,KAAK;IAOrB,QAAQ;CAGT"}
|
|
@@ -92,7 +92,7 @@ export class Segment {
|
|
|
92
92
|
toGGBCommands(shouldBuildPoints, { isFixed = true, showLabel = false, showUnderlyingPointsLabel = true, showLength = false, style, thickness, } = {}) {
|
|
93
93
|
const commands = [
|
|
94
94
|
`${this.ggbName}=Segment(${this.pointA.name},${this.pointB.name})`,
|
|
95
|
-
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"})`,
|
|
95
|
+
`SetFixed(${this.ggbName},${isFixed ? "true" : "false"},${isFixed ? "false" : "true"})`,
|
|
96
96
|
`ShowLabel(${this.ggbName},${showLabel ? "true" : "false"})`,
|
|
97
97
|
];
|
|
98
98
|
if (style !== undefined) {
|
package/lib/tree/nodes/node.d.ts
CHANGED
|
@@ -13,7 +13,8 @@ export declare enum NodeType {
|
|
|
13
13
|
set = 11,
|
|
14
14
|
trinom = 12,
|
|
15
15
|
monom = 13,
|
|
16
|
-
complex = 14
|
|
16
|
+
complex = 14,
|
|
17
|
+
notequality = 15
|
|
17
18
|
}
|
|
18
19
|
export type NodeOptions = {
|
|
19
20
|
forceTimesSign?: boolean;
|
|
@@ -89,7 +90,8 @@ export declare enum NodeIds {
|
|
|
89
90
|
inequationSolution = 37,
|
|
90
91
|
binomialCoefficient = 38,
|
|
91
92
|
trinom = 39,
|
|
92
|
-
monom = 40
|
|
93
|
+
monom = 40,//40
|
|
94
|
+
notEqual = 41
|
|
93
95
|
}
|
|
94
96
|
export interface Node {
|
|
95
97
|
type: NodeType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/node.ts"],"names":[],"mappings":"AAGA,oBAAY,QAAQ;IAClB,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,UAAU,IAAA;IACV,KAAK,IAAA;IACL,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,MAAM,KAAA;IACN,GAAG,KAAA;IACH,MAAM,KAAA;IACN,KAAK,KAAA;IACL,OAAO,KAAA;
|
|
1
|
+
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/node.ts"],"names":[],"mappings":"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"}
|
package/lib/tree/nodes/node.js
CHANGED
|
@@ -17,6 +17,7 @@ export var NodeType;
|
|
|
17
17
|
NodeType[NodeType["trinom"] = 12] = "trinom";
|
|
18
18
|
NodeType[NodeType["monom"] = 13] = "monom";
|
|
19
19
|
NodeType[NodeType["complex"] = 14] = "complex";
|
|
20
|
+
NodeType[NodeType["notequality"] = 15] = "notequality";
|
|
20
21
|
})(NodeType || (NodeType = {}));
|
|
21
22
|
export var NodeIds;
|
|
22
23
|
(function (NodeIds) {
|
|
@@ -61,4 +62,5 @@ export var NodeIds;
|
|
|
61
62
|
NodeIds[NodeIds["binomialCoefficient"] = 38] = "binomialCoefficient";
|
|
62
63
|
NodeIds[NodeIds["trinom"] = 39] = "trinom";
|
|
63
64
|
NodeIds[NodeIds["monom"] = 40] = "monom";
|
|
65
|
+
NodeIds[NodeIds["notEqual"] = 41] = "notEqual";
|
|
64
66
|
})(NodeIds || (NodeIds = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeConstructor.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/nodeConstructor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"nodeConstructor.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/nodeConstructor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAyBnD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoB1C,eAAO,MAAM,cAAc,GAAI,aAAa,eAAe,EAAE,MAAM,OAAO,KACnB,aAAa,CAAC;AACrE,eAAO,MAAM,SAAS,GAAI,aAAa,eAAe,SACR,CAAC;AAE/C,MAAM,MAAM,eAAe,GAAG;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACpE,8BAAsB,eAAe;IACnC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;CAqT3E"}
|
|
@@ -6,6 +6,7 @@ import { ComplexNode } from "./complex/complexNode.js";
|
|
|
6
6
|
import { EqualNode } from "./equations/equalNode.js";
|
|
7
7
|
import { EquationSolutionNode } from "./equations/equationSolutionNode.js";
|
|
8
8
|
import { MultiEqualNode } from "./equations/multiEqualNode.js";
|
|
9
|
+
import { NotEqualNode } from "./equations/notEqualNode.js";
|
|
9
10
|
import { AbsNode } from "./functions/absNode.js";
|
|
10
11
|
import { ArcsinNode } from "./functions/arcSinNode.js";
|
|
11
12
|
import { ArccosNode } from "./functions/arccosNode.js";
|
|
@@ -74,6 +75,9 @@ export class NodeConstructor {
|
|
|
74
75
|
case NodeIds.multiEqual: {
|
|
75
76
|
return new MultiEqualNode(identifiers.children.map((e) => NodeConstructor.fromIdentifiers(e)));
|
|
76
77
|
}
|
|
78
|
+
case NodeIds.notEqual: {
|
|
79
|
+
return new NotEqualNode(NodeConstructor.fromIdentifiers(identifiers.leftChild), NodeConstructor.fromIdentifiers(identifiers.rightChild));
|
|
80
|
+
}
|
|
77
81
|
/**Inequations */
|
|
78
82
|
case NodeIds.inequation: {
|
|
79
83
|
return new InequationNode(identifiers.children.map((e) => NodeConstructor.fromIdentifiers(e)), identifiers.symbols);
|