AnnaAneta commited on
Commit
e805ccd
路
verified 路
1 Parent(s): 7999544

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +18 -10
app.py CHANGED
@@ -49,7 +49,7 @@ def parse_recurrence_equation(equation_text):
49
  rhs = sp.sympify(rhs_str)
50
 
51
  # --- Wyci膮gni臋cie wsp贸艂czynnik贸w ---
52
- a_n = lhs.coeff(T(n)) # uwzgl臋dnia np. n*T_n
53
  b_n = rhs.coeff(T(n-1))
54
  c_n = sp.simplify(rhs - b_n*T(n-1))
55
 
@@ -82,20 +82,27 @@ def parse_recurrence_equation(equation_text):
82
  i = sp.Symbol("i", integer=True, positive=True)
83
  a_n_sym = a_n if isinstance(a_n, sp.Expr) else sp.sympify(str(a_n))
84
  b_n_sym = b_n if isinstance(b_n, sp.Expr) else sp.sympify(str(b_n))
85
- c_n_sym = c_n if isinstance(c_n, sp.Expr) else sp.sympify(str(c_n))
86
 
87
  a_i = a_n_sym.subs(n, i)
88
  b_i = b_n_sym.subs(n, i)
89
- c_i = c_n_sym.subs(n, i)
90
 
91
- a0_sym = a_0 if isinstance(a_0, sp.Expr) else sp.sympify(str(a_0))
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
92
 
93
- # --- S_n dla og贸lnej rekurencji z sum膮 c_n ---
94
- prod_a = sp.Product(a_i, (i, 1, n-1)).doit()
95
- prod_b = sp.Product(b_i, (i, 1, n)).doit()
96
- sum_c = sp.Sum(c_i / sp.Product(a_i / b_i, (i, 1, n))).doit() # og贸lny wz贸r sumy
97
-
98
- S_n_expr = sp.simplify(sp.cancel(a0_sym * prod_a / prod_b + sum_c))
99
  S_n_str = pretty_factorial(str(S_n_expr))
100
 
101
  except Exception:
@@ -117,6 +124,7 @@ def parse_recurrence_equation(equation_text):
117
 
118
 
119
 
 
120
  # --- Dopasowanie podobnych zada艅 ---
121
  def find_similar(query, top_k=3):
122
  corpus = [(i, d["statement"] + " | " + d.get("topic", "") + " | " + d.get("group_id", ""))
 
49
  rhs = sp.sympify(rhs_str)
50
 
51
  # --- Wyci膮gni臋cie wsp贸艂czynnik贸w ---
52
+ a_n = lhs.coeff(T(n)) # np. n*T_n
53
  b_n = rhs.coeff(T(n-1))
54
  c_n = sp.simplify(rhs - b_n*T(n-1))
55
 
 
82
  i = sp.Symbol("i", integer=True, positive=True)
83
  a_n_sym = a_n if isinstance(a_n, sp.Expr) else sp.sympify(str(a_n))
84
  b_n_sym = b_n if isinstance(b_n, sp.Expr) else sp.sympify(str(b_n))
 
85
 
86
  a_i = a_n_sym.subs(n, i)
87
  b_i = b_n_sym.subs(n, i)
 
88
 
89
+ # specjalny przypadek: a_n = n i b_n = 1
90
+ if sp.simplify(a_n_sym - n) == 0 and sp.simplify(b_n_sym - 1) == 0:
91
+ S_n_expr = a_0 * sp.factorial(n - 1)
92
+ else:
93
+ prod_a = sp.Product(a_i, (i, 1, n-1))
94
+ prod_b = sp.Product(b_i, (i, 1, n))
95
+ try:
96
+ prod_a_done = prod_a.doit()
97
+ except Exception:
98
+ prod_a_done = prod_a
99
+ try:
100
+ prod_b_done = prod_b.doit()
101
+ except Exception:
102
+ prod_b_done = prod_b
103
+ a0_sym = a_0 if isinstance(a_0, sp.Expr) else sp.sympify(str(a_0))
104
+ S_n_expr = sp.simplify(sp.cancel(a0_sym * prod_a_done / prod_b_done))
105
 
 
 
 
 
 
 
106
  S_n_str = pretty_factorial(str(S_n_expr))
107
 
108
  except Exception:
 
124
 
125
 
126
 
127
+
128
  # --- Dopasowanie podobnych zada艅 ---
129
  def find_similar(query, top_k=3):
130
  corpus = [(i, d["statement"] + " | " + d.get("topic", "") + " | " + d.get("group_id", ""))