Spaces:
Runtime error
Runtime error
Update app.py
Browse files
app.py
CHANGED
|
@@ -19,12 +19,12 @@ def pretty_factorial(expr):
|
|
| 19 |
|
| 20 |
expr_str = re.sub(pattern, repl, expr_str)
|
| 21 |
return expr_str
|
| 22 |
-
|
| 23 |
def compute_Sn(a_0, a_n, b_n):
|
| 24 |
-
|
| 25 |
-
Oblicza S_n = a_0 * Π_{i=1}^{n-1} a_i / Π_{i=1}^{n} b_i
|
| 26 |
-
Obsługuje poprawnie przypadki, gdy a_n lub b_n prowadzą do silni.
|
| 27 |
-
|
| 28 |
n = sp.Symbol("n", integer=True, positive=True)
|
| 29 |
i = sp.Symbol("i", integer=True, positive=True)
|
| 30 |
|
|
@@ -61,6 +61,63 @@ def compute_Sn(a_0, a_n, b_n):
|
|
| 61 |
S_n_str = pretty_factorial(str(S_n_expr))
|
| 62 |
|
| 63 |
return S_n_expr, S_n_str
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 64 |
|
| 65 |
def parse_recurrence_equation(equation_text):
|
| 66 |
"""
|
|
|
|
| 19 |
|
| 20 |
expr_str = re.sub(pattern, repl, expr_str)
|
| 21 |
return expr_str
|
| 22 |
+
"""
|
| 23 |
def compute_Sn(a_0, a_n, b_n):
|
| 24 |
+
|
| 25 |
+
# Oblicza S_n = a_0 * Π_{i=1}^{n-1} a_i / Π_{i=1}^{n} b_i
|
| 26 |
+
# Obsługuje poprawnie przypadki, gdy a_n lub b_n prowadzą do silni.
|
| 27 |
+
|
| 28 |
n = sp.Symbol("n", integer=True, positive=True)
|
| 29 |
i = sp.Symbol("i", integer=True, positive=True)
|
| 30 |
|
|
|
|
| 61 |
S_n_str = pretty_factorial(str(S_n_expr))
|
| 62 |
|
| 63 |
return S_n_expr, S_n_str
|
| 64 |
+
"""
|
| 65 |
+
|
| 66 |
+
def compute_Sn(a_0, a_n, b_n):
|
| 67 |
+
"""
|
| 68 |
+
Oblicza S_n = a_0 * Π_{i=1}^{n-1} a_i / Π_{i=1}^{n} b_i.
|
| 69 |
+
Uwzględnia przypadki prowadzące do silni.
|
| 70 |
+
"""
|
| 71 |
+
import sympy as sp
|
| 72 |
+
|
| 73 |
+
# Główny symbol n – MUSI być ten sam w całej funkcji
|
| 74 |
+
n = sp.Symbol("n", integer=True, positive=True)
|
| 75 |
+
i = sp.Symbol("i", integer=True, positive=True)
|
| 76 |
+
|
| 77 |
+
# Konwersje na sympy
|
| 78 |
+
a_n_sym = a_n if isinstance(a_n, sp.Expr) else sp.sympify(a_n)
|
| 79 |
+
b_n_sym = b_n if isinstance(b_n, sp.Expr) else sp.sympify(b_n)
|
| 80 |
+
a0_sym = a_0 if isinstance(a_0, sp.Expr) else sp.sympify(a_0)
|
| 81 |
+
|
| 82 |
+
print("a_n_sym:", a_n_sym, " b_n_sym:", b_n_sym)
|
| 83 |
+
|
| 84 |
+
# --- WYKRYWANIE PRZYPADKU SPECJALNEGO ---
|
| 85 |
+
# a_n = n oraz b_n = 1 => S_n = a_0 * (n-1)!
|
| 86 |
+
# UWAGA: sprawdzamy z użyciem TEGO SAMEGO SYMBOLU n
|
| 87 |
+
cond_an = sp.simplify(a_n_sym - n)
|
| 88 |
+
cond_bn = sp.simplify(b_n_sym - 1)
|
| 89 |
+
|
| 90 |
+
print("cond_an:", cond_an, " cond_bn:", cond_bn)
|
| 91 |
+
|
| 92 |
+
if cond_an.is_zero and cond_bn.is_zero:
|
| 93 |
+
print(">>> Wykryto przypadek S_n = a0*(n-1)! <<<")
|
| 94 |
+
S_n_expr = a0_sym * sp.factorial(n - 1)
|
| 95 |
+
else:
|
| 96 |
+
# Przypadek ogólny
|
| 97 |
+
a_i = a_n_sym.subs(n, i)
|
| 98 |
+
b_i = b_n_sym.subs(n, i)
|
| 99 |
+
|
| 100 |
+
print("a_i:", a_i, " b_i:", b_i)
|
| 101 |
+
|
| 102 |
+
prod_a = sp.Product(a_i, (i, 1, n - 1))
|
| 103 |
+
prod_b = sp.Product(b_i, (i, 1, n))
|
| 104 |
+
|
| 105 |
+
try:
|
| 106 |
+
prod_a_done = prod_a.doit()
|
| 107 |
+
except Exception:
|
| 108 |
+
prod_a_done = prod_a
|
| 109 |
+
|
| 110 |
+
try:
|
| 111 |
+
prod_b_done = prod_b.doit()
|
| 112 |
+
except Exception:
|
| 113 |
+
prod_b_done = prod_b
|
| 114 |
+
|
| 115 |
+
S_n_expr = sp.simplify(sp.cancel(a0_sym * prod_a_done / prod_b_done))
|
| 116 |
+
|
| 117 |
+
# Konwersja do czytelnej wersji
|
| 118 |
+
S_n_str = pretty_factorial(str(S_n_expr))
|
| 119 |
+
|
| 120 |
+
return S_n_expr, S_n_str
|
| 121 |
|
| 122 |
def parse_recurrence_equation(equation_text):
|
| 123 |
"""
|