print statements in places

problem_generator.py

@@ -110,18 +110,24 @@ def generate_like_terms ():
 @register_problem_generator("quadratic")
 def generate_quadratic ():
     #ax² + bx + c = 0
-    r1 = random.choice([i for i in range(-10, 16)])
-    r2 = random.choice([i for i in range(-10, 16)])
+    r1 = 0
+    r2 = 0
+    while r1 == 0 and r2 == 0:
+        r1 = random.choice(range(-10, 13))
+        r2 = random.choice(range(-10, 13))
     n = random.choice([i for i in range(-5, 6) if i != 0])
     s = random.choice([i for i in range(-5, 6) if i != 0])
 
     x = symbols('x')
-    expr = n *(x - r1) * (x - r2)
+    expr = n *(s * x - r1) * (x - r2)
+    print(f"n:{n}, s:{s}")
     expr = expand(expr)
-    if r1 == r2:
-        solution = r1
+    root1 = Rational(r1, s)
+    root2 = Integer(r2)
+    if root1 == root2:
+        solution = sstr(root1)
     else:
-        solution = [r1, r2]
+        solution = [sstr(root1), sstr(root2)]
 
     return {
         "type": "quadratic",
@@ -210,8 +216,14 @@ def generate_binomial ():
     e = a * (ans + b) + c * (ans + d)
 
     x = symbols('x')
-    left_expr = Mul(a, x + b, evaluate=False)
-    right_expr = Mul(c, x + d, evaluate=False)
+    if a != 1:
+        left_expr = Mul(a, x + b, evaluate=False)
+    else:
+        left_expr = x+b
+    if c != 1:
+        right_expr = Mul(c, x + d, evaluate=False)
+    else:
+        right_expr = x+d
     expr = Add(left_expr, right_expr, evaluate=False)
 
     return {
@@ -251,6 +263,6 @@ def generate_problem():
     
     problem_type = random.choices(types, weights=weights)[0]
     template = TEMPLATES[problem_type]
-    return generate_like_terms()
+    return generate_binomial()
     #return template()