Skip to content

Commit c6e034c

Browse files
committed
Fix tests with maxima 5.48
1 parent cb03043 commit c6e034c

File tree

24 files changed

+78
-82
lines changed

24 files changed

+78
-82
lines changed

src/doc/de/tutorial/tour_algebra.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ berechnet:
172172
sage: t = var("t")
173173
sage: f = t^2*exp(t) - sin(t)
174174
sage: f.laplace(t,s)
175-
-1/(s^2 + 1) + 2/(s - 1)^3
175+
2/(s^3 - 3*s^2 + 3*s - 1) - 1/(s^2 + 1)
176176

177177
Hier ist ein komplizierteres Beispiel. Die Verschiebung des
178178
Gleichgewichts einer verkoppelten Feder, die an der linken Wand

src/doc/en/constructions/calculus.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Sage can also compute symbolic definite integrals involving limits.
155155
(x, k, w)
156156
sage: f = x^3 * e^(k*x) * sin(w*x)
157157
sage: f.integrate(x)
158-
((24*k^3*w - 24*k*w^3 - (k^6*w + 3*k^4*w^3 + 3*k^2*w^5 + w^7)*x^3 + 6*(k^5*w + 2*k^3*w^3 + k*w^5)*x^2 - 6*(3*k^4*w + 2*k^2*w^3 - w^5)*x)*cos(w*x)*e^(k*x) - (6*k^4 - 36*k^2*w^2 + 6*w^4 - (k^7 + 3*k^5*w^2 + 3*k^3*w^4 + k*w^6)*x^3 + 3*(k^6 + k^4*w^2 - k^2*w^4 - w^6)*x^2 - 6*(k^5 - 2*k^3*w^2 - 3*k*w^4)*x)*e^(k*x)*sin(w*x))/(k^8 + 4*k^6*w^2 + 6*k^4*w^4 + 4*k^2*w^6 + w^8)
158+
((24*k^3*w*e^(k*x) - 24*k*w^3*e^(k*x) - (k^6*w*e^(k*x) + 3*k^4*w^3*e^(k*x) + 3*k^2*w^5*e^(k*x) + w^7*e^(k*x))*x^3 + 6*(k^5*w*e^(k*x) + 2*k^3*w^3*e^(k*x) + k*w^5*e^(k*x))*x^2 - 6*(3*k^4*w*e^(k*x) + 2*k^2*w^3*e^(k*x) - w^5*e^(k*x))*x)*cos(w*x) - (6*k^4*e^(k*x) - 36*k^2*w^2*e^(k*x) + 6*w^4*e^(k*x) - (k^7*e^(k*x) + 3*k^5*w^2*e^(k*x) + 3*k^3*w^4*e^(k*x) + k*w^6*e^(k*x))*x^3 + 3*(k^6*e^(k*x) + k^4*w^2*e^(k*x) - k^2*w^4*e^(k*x) - w^6*e^(k*x))*x^2 - 6*(k^5*e^(k*x) - 2*k^3*w^2*e^(k*x) - 3*k*w^4*e^(k*x))*x)*sin(w*x))/(k^8 + 4*k^6*w^2 + 6*k^4*w^4 + 4*k^2*w^6 + w^8)
159159
sage: integrate(1/x^2, x, 1, infinity)
160160
1
161161

@@ -257,8 +257,7 @@ is one way to compute LT's and
257257
(s, t)
258258
sage: f = t^5*exp(t)*sin(t)
259259
sage: L = laplace(f, t, s); L
260-
3840*(s - 1)^5/(s^2 - 2*s + 2)^6 - 3840*(s - 1)^3/(s^2 - 2*s + 2)^5 +
261-
720*(s - 1)/(s^2 - 2*s + 2)^4
260+
240*(3*s^5 - 15*s^4 + 20*s^3 - 12*s + 4)/(s^12 - 12*s^11 + 72*s^10 - 280*s^9 + 780*s^8 - 1632*s^7 + 2624*s^6 - 3264*s^5 + 3120*s^4 - 2240*s^3 + 1152*s^2 - 384*s + 64)
262261

263262
is another way.
264263

src/doc/en/tutorial/tour_algebra.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ You can compute Laplace transforms also; the Laplace transform of
182182
sage: t = var("t")
183183
sage: f = t^2*exp(t) - sin(t)
184184
sage: f.laplace(t,s)
185-
-1/(s^2 + 1) + 2/(s - 1)^3
185+
2/(s^3 - 3*s^2 + 3*s - 1) - 1/(s^2 + 1)
186186

187187
Here is a more involved example. The displacement from equilibrium
188188
(respectively) for a coupled spring attached to a wall on the left

src/doc/es/tutorial/tour_algebra.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ de :math:`t^2e^t -\sin(t)` se calcula como sigue:
164164
sage: t = var("t")
165165
sage: f = t^2*exp(t) - sin(t)
166166
sage: f.laplace(t,s)
167-
-1/(s^2 + 1) + 2/(s - 1)^3
167+
2/(s^3 - 3*s^2 + 3*s - 1) - 1/(s^2 + 1)
168168

169169
Veamos un ejemplo más complicado. El desplazamiento desde el punto de equilibrio
170170
de dos resortes acoplados, sujetos a una pared a la izquierda

src/doc/fr/tutorial/tour_algebra.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ transformée de Laplace de :math:`t^2e^t -\sin(t)` s'obtient comme suit :
149149
sage: t = var("t")
150150
sage: f = t^2*exp(t) - sin(t)
151151
sage: f.laplace(t,s)
152-
-1/(s^2 + 1) + 2/(s - 1)^3
152+
2/(s^3 - 3*s^2 + 3*s - 1) - 1/(s^2 + 1)
153153

154154
Voici un exemple plus élaboré. L'élongation à partir du point
155155
d'équilibre de ressorts couplés attachés à gauche à un mur

src/doc/it/tutorial/tour_algebra.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Si può anche calcolare la trasformata di Laplace; la trasformata di Laplace di
150150
sage: t = var("t")
151151
sage: f = t^2*exp(t) - sin(t)
152152
sage: f.laplace(t,s)
153-
-1/(s^2 + 1) + 2/(s - 1)^3
153+
2/(s^3 - 3*s^2 + 3*s - 1) - 1/(s^2 + 1)
154154

155155
Il successivo è un esempio più articolato. Lo scostamento dall'equilibrio
156156
(rispettivamente) per due molle accoppiate fissate ad un muro a sinistra

src/doc/ja/tutorial/tour_algebra.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Sageを使って常微分方程式を研究することもできる. :math:`x'
176176
sage: t = var("t")
177177
sage: f = t^2*exp(t) - sin(t)
178178
sage: f.laplace(t,s)
179-
-1/(s^2 + 1) + 2/(s - 1)^3
179+
2/(s^3 - 3*s^2 + 3*s - 1) - 1/(s^2 + 1)
180180

181181

182182
もう少し手間のかかる問題を考えてみよう.

src/doc/pt/tutorial/tour_algebra.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Laplace de :math:`t^2e^t -\sin(t)` é calculada da seguinte forma:
169169
sage: t = var("t")
170170
sage: f = t^2*exp(t) - sin(t)
171171
sage: f.laplace(t,s)
172-
-1/(s^2 + 1) + 2/(s - 1)^3
172+
2/(s^3 - 3*s^2 + 3*s - 1) - 1/(s^2 + 1)
173173

174174
A seguir, um exemplo mais complicado. O deslocamento, com respeito à
175175
posição de equilíbrio, de duas massas presas a uma parede através de

src/doc/ru/tutorial/tour_algebra.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Sage может использоваться для решения диффер
166166
sage: t = var("t")
167167
sage: f = t^2*exp(t) - sin(t)
168168
sage: f.laplace(t,s)
169-
-1/(s^2 + 1) + 2/(s - 1)^3
169+
2/(s^3 - 3*s^2 + 3*s - 1) - 1/(s^2 + 1)
170170

171171
Приведем более сложный пример. Отклонение от положения равновесия для пары
172172
пружин, прикрепленных к стене слева,

src/doc/zh/constructions/calculus.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Sage 还可以计算涉及极限的符号定积分。
148148
(x, k, w)
149149
sage: f = x^3 * e^(k*x) * sin(w*x)
150150
sage: f.integrate(x)
151-
((24*k^3*w - 24*k*w^3 - (k^6*w + 3*k^4*w^3 + 3*k^2*w^5 + w^7)*x^3 + 6*(k^5*w + 2*k^3*w^3 + k*w^5)*x^2 - 6*(3*k^4*w + 2*k^2*w^3 - w^5)*x)*cos(w*x)*e^(k*x) - (6*k^4 - 36*k^2*w^2 + 6*w^4 - (k^7 + 3*k^5*w^2 + 3*k^3*w^4 + k*w^6)*x^3 + 3*(k^6 + k^4*w^2 - k^2*w^4 - w^6)*x^2 - 6*(k^5 - 2*k^3*w^2 - 3*k*w^4)*x)*e^(k*x)*sin(w*x))/(k^8 + 4*k^6*w^2 + 6*k^4*w^4 + 4*k^2*w^6 + w^8)
151+
((24*k^3*w*e^(k*x) - 24*k*w^3*e^(k*x) - (k^6*w*e^(k*x) + 3*k^4*w^3*e^(k*x) + 3*k^2*w^5*e^(k*x) + w^7*e^(k*x))*x^3 + 6*(k^5*w*e^(k*x) + 2*k^3*w^3*e^(k*x) + k*w^5*e^(k*x))*x^2 - 6*(3*k^4*w*e^(k*x) + 2*k^2*w^3*e^(k*x) - w^5*e^(k*x))*x)*cos(w*x) - (6*k^4*e^(k*x) - 36*k^2*w^2*e^(k*x) + 6*w^4*e^(k*x) - (k^7*e^(k*x) + 3*k^5*w^2*e^(k*x) + 3*k^3*w^4*e^(k*x) + k*w^6*e^(k*x))*x^3 + 3*(k^6*e^(k*x) + k^4*w^2*e^(k*x) - k^2*w^4*e^(k*x) - w^6*e^(k*x))*x^2 - 6*(k^5*e^(k*x) - 2*k^3*w^2*e^(k*x) - 3*k*w^4*e^(k*x))*x)*sin(w*x))/(k^8 + 4*k^6*w^2 + 6*k^4*w^4 + 4*k^2*w^6 + w^8)
152152
sage: integrate(1/x^2, x, 1, infinity)
153153
1
154154

@@ -241,8 +241,7 @@ Sage 还可以计算涉及极限的符号定积分。
241241
(s, t)
242242
sage: f = t^5*exp(t)*sin(t)
243243
sage: L = laplace(f, t, s); L
244-
3840*(s - 1)^5/(s^2 - 2*s + 2)^6 - 3840*(s - 1)^3/(s^2 - 2*s + 2)^5 +
245-
720*(s - 1)/(s^2 - 2*s + 2)^4
244+
240*(3*s^5 - 15*s^4 + 20*s^3 - 12*s + 4)/(s^12 - 12*s^11 + 72*s^10 - 280*s^9 + 780*s^8 - 1632*s^7 + 2624*s^6 - 3264*s^5 + 3120*s^4 - 2240*s^3 + 1152*s^2 - 384*s + 64)
246245

247246
上面是另一种方法。
248247

0 commit comments

Comments
 (0)