Spaces:
Runtime error
Runtime error
Update app.py
Browse files
app.py
CHANGED
|
@@ -285,6 +285,161 @@ def compute_Sn_Claude(a_0, a_n, b_n, verbose=True):
|
|
| 285 |
# Konwersja do stringa
|
| 286 |
#S_n_str = pretty_factorial(str(S_n_expr))
|
| 287 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 288 |
# Oblicz S_1 podstawiając n=1
|
| 289 |
try:
|
| 290 |
S_1_expr = sp.simplify(S_n_expr.subs(n, 1))
|
|
@@ -688,7 +843,7 @@ def parse_recurrence_equation_3(equation_text, compat):
|
|
| 688 |
|
| 689 |
# Obliczenie S_n
|
| 690 |
print("\n=== Obliczanie S_n ===")
|
| 691 |
-
S_n_expr, S_n_str, S_1_expr, S_1_str =
|
| 692 |
|
| 693 |
# Obliczenie 1/(S_n * a_n)
|
| 694 |
try:
|
|
|
|
| 285 |
# Konwersja do stringa
|
| 286 |
#S_n_str = pretty_factorial(str(S_n_expr))
|
| 287 |
|
| 288 |
+
# Oblicz S_1 podstawiając n=1
|
| 289 |
+
try:
|
| 290 |
+
S_1_expr = sp.simplify(S_n_expr.subs(n, 1))
|
| 291 |
+
S_1_expr = convert_negative_powers_to_fractions(S_1_expr)
|
| 292 |
+
S_1_str = to_latex_display_chat(S_1_expr)
|
| 293 |
+
if verbose:
|
| 294 |
+
print(f"S_1 obliczone: {S_1_expr}")
|
| 295 |
+
except Exception as e:
|
| 296 |
+
if verbose:
|
| 297 |
+
print(f"Nie udało się obliczyć S_1: {e}")
|
| 298 |
+
S_1_expr = None
|
| 299 |
+
S_1_str = "?"
|
| 300 |
+
|
| 301 |
+
return S_n_expr, S_n_str, S_1_expr, S_1_str
|
| 302 |
+
|
| 303 |
+
def compute_Sn_Claude_hard(a_0, a_n, b_n, verbose=True):
|
| 304 |
+
"""
|
| 305 |
+
Oblicza S_n = a_0 * Π_{i=1}^{n-1} a_i / Π_{i=1}^{n} b_i.
|
| 306 |
+
Uwzględnia przypadki prowadzące do silni i teleskopowe skracanie się wyrazów.
|
| 307 |
+
"""
|
| 308 |
+
import sympy as sp
|
| 309 |
+
|
| 310 |
+
if verbose:
|
| 311 |
+
print("Compute S_n:", a_0, a_n, b_n)
|
| 312 |
+
|
| 313 |
+
# Konwersje na sympy
|
| 314 |
+
a_n_sym = sp.sympify(a_n) if not isinstance(a_n, sp.Expr) else a_n
|
| 315 |
+
b_n_sym = sp.sympify(b_n) if not isinstance(b_n, sp.Expr) else b_n
|
| 316 |
+
a0_sym = sp.sympify(a_0) if not isinstance(a_0, sp.Expr) else a_0
|
| 317 |
+
|
| 318 |
+
# Zamień wszystkie symbole 'n' na N_SYMBOL
|
| 319 |
+
a_n_sym = a_n_sym.subs(sp.Symbol('n'), N_SYMBOL)
|
| 320 |
+
b_n_sym = b_n_sym.subs(sp.Symbol('n'), N_SYMBOL)
|
| 321 |
+
n = N_SYMBOL # Użyj globalnego symbolu
|
| 322 |
+
|
| 323 |
+
# Symbol do iteracji (musi być inny niż n)
|
| 324 |
+
i = sp.Symbol("i", integer=True, positive=True)
|
| 325 |
+
|
| 326 |
+
if verbose:
|
| 327 |
+
print(f"a_n_sym: {a_n_sym}, b_n_sym: {b_n_sym}")
|
| 328 |
+
print(f"Używany symbol n: {n}, id: {id(n)}")
|
| 329 |
+
print("--- WYKRYWANIE PRZYPADKU SPECJALNEGO ---")
|
| 330 |
+
|
| 331 |
+
# Przypadek specjalny 1: a_n = n oraz b_n = 1 => S_n = a_0 * (n-1)!
|
| 332 |
+
cond_an = sp.simplify(a_n_sym - n)
|
| 333 |
+
cond_bn = sp.simplify(b_n_sym - 1)
|
| 334 |
+
|
| 335 |
+
if verbose:
|
| 336 |
+
print(f"cond_an: {cond_an}, is_zero: {cond_an.is_zero}")
|
| 337 |
+
print(f"cond_bn: {cond_bn}, is_zero: {cond_bn.is_zero}")
|
| 338 |
+
|
| 339 |
+
is_special_case_1 = (cond_an.is_zero and cond_bn.is_zero)
|
| 340 |
+
|
| 341 |
+
if is_special_case_1:
|
| 342 |
+
if verbose:
|
| 343 |
+
print(">>> Wykryto przypadek S_n = a_0*(n-1)! <<<")
|
| 344 |
+
S_n_expr = sp.simplify(a0_sym * sp.factorial(n - 1))
|
| 345 |
+
else:
|
| 346 |
+
# Przypadek specjalny 2: a_n = 1 oraz b_n = n => S_n = a_0 / n!
|
| 347 |
+
cond_an_2 = sp.simplify(a_n_sym - 1)
|
| 348 |
+
cond_bn_2 = sp.simplify(b_n_sym - n)
|
| 349 |
+
|
| 350 |
+
is_special_case_2 = (cond_an_2.is_zero and cond_bn_2.is_zero)
|
| 351 |
+
|
| 352 |
+
if is_special_case_2:
|
| 353 |
+
if verbose:
|
| 354 |
+
print(">>> Wykryto przypadek S_n = a_0/n! <<<")
|
| 355 |
+
S_n_expr = sp.simplify(a0_sym / sp.factorial(n))
|
| 356 |
+
else:
|
| 357 |
+
# Przypadek specjalny 3: b_n = n²/(n-1)² (teleskopowe skracanie)
|
| 358 |
+
# Uproszczenie: iloczyn od 1 do n daje n²
|
| 359 |
+
b_n_expanded = sp.expand(b_n_sym * (n-1)**2)
|
| 360 |
+
is_telescopic_square = sp.simplify(b_n_expanded - n**2).is_zero
|
| 361 |
+
|
| 362 |
+
if is_telescopic_square:
|
| 363 |
+
if verbose:
|
| 364 |
+
print(">>> Wykryto teleskopowe b_n = n²/(n-1)² => iloczyn = n² <<<")
|
| 365 |
+
# Π_{i=1}^{n} i²/(i-1)² = n² (bo 1²/0² nie występuje, a reszta się skraca)
|
| 366 |
+
# W praktyce: 1² * 2²/1² * 3²/2² * ... * n²/(n-1)² = n²
|
| 367 |
+
prod_b_done = n**2
|
| 368 |
+
|
| 369 |
+
# Oblicz a_i
|
| 370 |
+
a_i = a_n_sym.subs(n, i)
|
| 371 |
+
prod_a = sp.Product(a_i, (i, 1, n - 1))
|
| 372 |
+
try:
|
| 373 |
+
prod_a_done = prod_a.doit()
|
| 374 |
+
except Exception:
|
| 375 |
+
prod_a_done = prod_a
|
| 376 |
+
|
| 377 |
+
S_n_expr = sp.simplify(a0_sym * prod_a_done / prod_b_done)
|
| 378 |
+
else:
|
| 379 |
+
# Przypadek specjalny 4: b_n = n/(n-1) (teleskopowe skracanie liniowe)
|
| 380 |
+
b_n_expanded_linear = sp.expand(b_n_sym * (n-1))
|
| 381 |
+
is_telescopic_linear = sp.simplify(b_n_expanded_linear - n).is_zero
|
| 382 |
+
|
| 383 |
+
if is_telescopic_linear:
|
| 384 |
+
if verbose:
|
| 385 |
+
print(">>> Wykryto teleskopowe b_n = n/(n-1) => iloczyn = n <<<")
|
| 386 |
+
# Π_{i=1}^{n} i/(i-1) = n (bo 1/0 nie występuje, a reszta się skraca)
|
| 387 |
+
prod_b_done = n
|
| 388 |
+
|
| 389 |
+
# Oblicz a_i - tu może być a_n = 1, więc iloczyn to po prostu a_0
|
| 390 |
+
a_i = a_n_sym.subs(n, i)
|
| 391 |
+
|
| 392 |
+
# Jeśli a_i = 1, to iloczyn = 1
|
| 393 |
+
if sp.simplify(a_i - 1).is_zero:
|
| 394 |
+
prod_a_done = sp.Integer(1)
|
| 395 |
+
if verbose:
|
| 396 |
+
print(">>> a_i = 1, więc iloczyn a = 1 <<<")
|
| 397 |
+
else:
|
| 398 |
+
prod_a = sp.Product(a_i, (i, 1, n - 1))
|
| 399 |
+
try:
|
| 400 |
+
prod_a_done = prod_a.doit()
|
| 401 |
+
except Exception:
|
| 402 |
+
prod_a_done = prod_a
|
| 403 |
+
|
| 404 |
+
S_n_expr = sp.simplify(a0_sym * prod_a_done / prod_b_done)
|
| 405 |
+
else:
|
| 406 |
+
# Przypadek ogólny
|
| 407 |
+
if verbose:
|
| 408 |
+
print(">>> Przypadek ogólny <<<")
|
| 409 |
+
a_i = a_n_sym.subs(n, i)
|
| 410 |
+
b_i = b_n_sym.subs(n, i)
|
| 411 |
+
|
| 412 |
+
if verbose:
|
| 413 |
+
print(f"a_i: {a_i}, b_i: {b_i}")
|
| 414 |
+
|
| 415 |
+
prod_a = sp.Product(a_i, (i, 1, n - 1))
|
| 416 |
+
prod_b = sp.Product(b_i, (i, 1, n))
|
| 417 |
+
|
| 418 |
+
try:
|
| 419 |
+
prod_a_done = prod_a.doit()
|
| 420 |
+
except Exception as e:
|
| 421 |
+
if verbose:
|
| 422 |
+
print(f"Nie udało się obliczyć prod_a: {e}")
|
| 423 |
+
prod_a_done = prod_a
|
| 424 |
+
|
| 425 |
+
try:
|
| 426 |
+
prod_b_done = prod_b.doit()
|
| 427 |
+
except Exception as e:
|
| 428 |
+
if verbose:
|
| 429 |
+
print(f"Nie udało się obliczyć prod_b: {e}")
|
| 430 |
+
prod_b_done = prod_b
|
| 431 |
+
|
| 432 |
+
S_n_expr = sp.simplify(a0_sym * prod_a_done / prod_b_done)
|
| 433 |
+
|
| 434 |
+
# KLUCZOWE: Agresywnie uprość i zamień n na N_SYMBOL
|
| 435 |
+
S_n_expr = S_n_expr.subs(sp.Symbol('n'), N_SYMBOL)
|
| 436 |
+
S_n_expr = aggressive_simplify(S_n_expr)
|
| 437 |
+
S_n_expr = convert_negative_powers_to_fractions(S_n_expr)
|
| 438 |
+
S_n_expr = aggressive_simplify(S_n_expr)
|
| 439 |
+
|
| 440 |
+
# Konwersja do stringa
|
| 441 |
+
S_n_str = to_latex_display_chat(S_n_expr)
|
| 442 |
+
|
| 443 |
# Oblicz S_1 podstawiając n=1
|
| 444 |
try:
|
| 445 |
S_1_expr = sp.simplify(S_n_expr.subs(n, 1))
|
|
|
|
| 843 |
|
| 844 |
# Obliczenie S_n
|
| 845 |
print("\n=== Obliczanie S_n ===")
|
| 846 |
+
S_n_expr, S_n_str, S_1_expr, S_1_str = compute_Sn_Claude_hard(a_0, a_n, b_n)
|
| 847 |
|
| 848 |
# Obliczenie 1/(S_n * a_n)
|
| 849 |
try:
|