rgwfuncs 0.0.48__py3-none-any.whl → 0.0.51__py3-none-any.whl

rgwfuncs/algebra_lib.py

@@ -1,7 +1,6 @@
 import re
 import math
 import ast
-# import numpy as np
 from sympy import symbols, latex, simplify, solve, diff, Expr, factor, cancel, Eq
 from sympy.core.sympify import SympifyError
 from sympy.core import S
@@ -412,69 +411,6 @@ def factor_polynomial_expression(
     return latex_result
 
 
-def cancel_polynomial_expression(
-    expression: str,
-    subs: Optional[Dict[str, float]] = None
-) -> str:
-    """
-    Cancels common factors within a polynomial expression and converts it to LaTeX format.
-
-    This function parses an algebraic expression given in Python syntax, cancels any common factors,
-    and converts the resulting simplified expression into a LaTeX formatted string. The function can
-    also handle optional substitutions of variables before performing the cancellation.
-
-    Parameters:
-    expression (str): The algebraic expression to simplify and convert to LaTeX.
-                      It should be a valid expression formatted using Python syntax.
-    subs (Optional[Dict[str, float]]): An optional dictionary where the keys are variable names in the
-                                       expression, and the values are the corresponding numbers to substitute
-                                       into the expression before simplification.
-
-    Returns:
-    str: The LaTeX formatted string of the simplified expression. If the expression involves
-         indeterminate forms due to operations like division by zero, a descriptive error message is returned instead.
-
-    Raises:
-    ValueError: If the expression cannot be parsed due to syntax errors or if operations result in
-                undefined behavior, such as division by zero.
-
-    """
-    transformations = standard_transformations + (implicit_multiplication_application,)
-
-    def parse_and_cancel_expression(expr_str: str, sym_vars: Dict[str, symbols]) -> symbols:
-        try:
-            expr = parse_expr(expr_str, local_dict=sym_vars, transformations=transformations)
-            if subs:
-                if not isinstance(subs, dict):
-                    raise ValueError(f"Substitutions must be a dictionary. Received: {subs}")
-                subs_symbols = {symbols(k): v for k, v in subs.items()}
-                expr = expr.subs(subs_symbols)
-
-            canceled_expr = cancel(expr)
-
-            # Check for NaN or indeterminate forms
-            if canceled_expr.has(S.NaN) or canceled_expr.has(S.Infinity) or canceled_expr.has(S.ComplexInfinity):
-                return "Undefined result. This could be a division by zero error."
-
-            return canceled_expr
-
-        except (SyntaxError, ValueError, TypeError, AttributeError, ZeroDivisionError, SympifyError) as e:
-            return f"Error: {str(e)}"
-
-    variable_names = set(re.findall(r'\b[a-zA-Z]\w*\b', expression))
-    sym_vars = {var: symbols(var) for var in variable_names}
-
-    expr = parse_and_cancel_expression(expression, sym_vars)
-
-    # If the expression is already a string (i.e., "Undefined" or error message), return it directly
-    if isinstance(expr, str):
-        return expr
-
-    # Otherwise, convert to LaTeX as usual
-    latex_result = latex(expr)
-    return latex_result
-
-
 def simplify_polynomial_expression(
     expression: str,
     subs: Optional[Dict[str, float]] = None
@@ -650,6 +586,69 @@ def simplify_polynomial_expression(
         raise ValueError(f"Error simplifying expression: {e}")
 
 
+def cancel_polynomial_expression(
+    expression: str,
+    subs: Optional[Dict[str, float]] = None
+) -> str:
+    """
+    Cancels common factors within a polynomial expression and converts it to LaTeX format.
+
+    This function parses an algebraic expression given in Python syntax, cancels any common factors,
+    and converts the resulting simplified expression into a LaTeX formatted string. The function can
+    also handle optional substitutions of variables before performing the cancellation.
+
+    Parameters:
+    expression (str): The algebraic expression to simplify and convert to LaTeX.
+                      It should be a valid expression formatted using Python syntax.
+    subs (Optional[Dict[str, float]]): An optional dictionary where the keys are variable names in the
+                                       expression, and the values are the corresponding numbers to substitute
+                                       into the expression before simplification.
+
+    Returns:
+    str: The LaTeX formatted string of the simplified expression. If the expression involves
+         indeterminate forms due to operations like division by zero, a descriptive error message is returned instead.
+
+    Raises:
+    ValueError: If the expression cannot be parsed due to syntax errors or if operations result in
+                undefined behavior, such as division by zero.
+
+    """
+    transformations = standard_transformations + (implicit_multiplication_application,)
+
+    def parse_and_cancel_expression(expr_str: str, sym_vars: Dict[str, symbols]) -> symbols:
+        try:
+            expr = parse_expr(expr_str, local_dict=sym_vars, transformations=transformations)
+            if subs:
+                if not isinstance(subs, dict):
+                    raise ValueError(f"Substitutions must be a dictionary. Received: {subs}")
+                subs_symbols = {symbols(k): v for k, v in subs.items()}
+                expr = expr.subs(subs_symbols)
+
+            canceled_expr = cancel(expr)
+
+            # Check for NaN or indeterminate forms
+            if canceled_expr.has(S.NaN) or canceled_expr.has(S.Infinity) or canceled_expr.has(S.ComplexInfinity):
+                return "Undefined result. This could be a division by zero error."
+
+            return canceled_expr
+
+        except (SyntaxError, ValueError, TypeError, AttributeError, ZeroDivisionError, SympifyError) as e:
+            return f"Error: {str(e)}"
+
+    variable_names = set(re.findall(r'\b[a-zA-Z]\w*\b', expression))
+    sym_vars = {var: symbols(var) for var in variable_names}
+
+    expr = parse_and_cancel_expression(expression, sym_vars)
+
+    # If the expression is already a string (i.e., "Undefined" or error message), return it directly
+    if isinstance(expr, str):
+        return expr
+
+    # Otherwise, convert to LaTeX as usual
+    latex_result = latex(expr)
+    return latex_result
+
+
 def solve_homogeneous_polynomial_expression(
     expression: str,
     variable: str,
@@ -677,36 +676,28 @@ def solve_homogeneous_polynomial_expression(
     """
 
     try:
-        print("679", expression)
-        print("681", variable)
-        print("682", subs)
-
+        # Handle symbols
         variable_symbols = set(re.findall(r'\b[a-zA-Z]\w*\b', expression))
         sym_vars = {var: symbols(var) for var in variable_symbols}
 
+        # Parse the expression
         expr = parse_expr(expression, local_dict=sym_vars)
-        print("Parsed expression:", expr)
 
+        # Apply substitutions
         if subs:
             expr = expr.subs({symbols(k): v for k, v in subs.items()})
-            print("Expression after substitution:", expr)
 
+        # Solve the equation
         var_symbol = symbols(variable)
-
         eq = Eq(expr, 0)
-        print("Equation to solve:", eq)
-
         solutions = solve(eq, var_symbol)
 
-        if solutions:
-            latex_solutions = [latex(simplify(sol)) for sol in solutions]
-            result = r"\left[" + ", ".join(latex_solutions) + r"\right]"
-        else:
-            result = r"\left[\right]"
+        # Convert solutions to LaTeX strings with handling for exact representations
+        latex_solutions = [latex(sol) for sol in solutions]
 
-        print("704", result)
+        result = r"\left[" + ", ".join(latex_solutions) + r"\right]"
+        print("693", result)
         return result
 
     except Exception as e:
         raise ValueError(f"Error solving the expression: {e}")
-

{rgwfuncs-0.0.48.dist-info → rgwfuncs-0.0.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rgwfuncs
-Version: 0.0.48
+Version: 0.0.51
 Summary: A functional programming paradigm for mathematical modelling and data science
 Home-page: https://github.com/ryangerardwilson/rgwfunc
 Author: Ryan Gerard Wilson
@@ -430,35 +430,7 @@ Factors a polynomial expression written in Python syntax and converts it into a
 
 --------------------------------------------------------------------------------
 
-### 8. `cancel_polynomial_expression`
-
-Cancels common factors within a polynomial expression written in Python syntax and converts it to a LaTeX formatted string. This function parses an algebraic expression, cancels common factors using SymPy, and translates the reduced expression into a LaTeX representation. It can also accommodate optional substitutions to be made prior to simplification.
-
-- Parameters:
-  - `expression` (str): The algebraic expression to simplify and convert to LaTeX. This string should be formatted using Python syntax.
-  - `subs` (Optional[Dict[str, float]]): An optional dictionary of substitutions where the keys are variable names in the expression, and the values are the numbers to substitute.
-
-- Returns:
-  - `str`: The LaTeX formatted string of the simplified expression. If the expression involves indeterminate forms due to operations like division by zero, a descriptive error message is returned instead.
-
-- Raises:
-  - `ValueError`: If the expression cannot be parsed due to syntax errors or involves undefined operations, such as division by zero.
-
-- Example:
-
-    from rgwfuncs import cancel_polynomial_expression
-
-    # Cancel common factors within a polynomial expression
-    latex_result1 = cancel_polynomial_expression("(x**2 - 4) / (x - 2)")
-    print(latex_result1)  # Output: "x + 2"
-
-    # Cancel with substituted values
-    latex_result2 = cancel_polynomial_expression("(x**2 - 4) / (x - 2)", {"x": 2})
-    print(latex_result2)  # Output: "Undefined result. This could be a division by zero error."
-
---------------------------------------------------------------------------------
-
-### 9. `simplify_polynomial_expression`
+### 8. `simplify_polynomial_expression`
 
 Simplifies an algebraic expression in polynomial form and returns it in LaTeX format. Takes an algebraic expression, in polynomial form, written in Python syntax and simplifies it. The result is returned as a LaTeX formatted string, suitable for academic or professional documentation.
 
@@ -491,6 +463,34 @@ Simplifies an algebraic expression in polynomial form and returns it in LaTeX fo
 
 --------------------------------------------------------------------------------
 
+### 9. `cancel_polynomial_expression`
+
+Cancels common factors within a polynomial expression written in Python syntax and converts it to a LaTeX formatted string. This function parses an algebraic expression, cancels common factors using SymPy, and translates the reduced expression into a LaTeX representation. It can also accommodate optional substitutions to be made prior to simplification.
+
+- Parameters:
+  - `expression` (str): The algebraic expression to simplify and convert to LaTeX. This string should be formatted using Python syntax.
+  - `subs` (Optional[Dict[str, float]]): An optional dictionary of substitutions where the keys are variable names in the expression, and the values are the numbers to substitute.
+
+- Returns:
+  - `str`: The LaTeX formatted string of the simplified expression. If the expression involves indeterminate forms due to operations like division by zero, a descriptive error message is returned instead.
+
+- Raises:
+  - `ValueError`: If the expression cannot be parsed due to syntax errors or involves undefined operations, such as division by zero.
+
+- Example:
+
+    from rgwfuncs import cancel_polynomial_expression
+
+    # Cancel common factors within a polynomial expression
+    latex_result1 = cancel_polynomial_expression("(x**2 - 4) / (x - 2)")
+    print(latex_result1)  # Output: "x + 2"
+
+    # Cancel with substituted values
+    latex_result2 = cancel_polynomial_expression("(x**2 - 4) / (x - 2)", {"x": 2})
+    print(latex_result2)  # Output: "Undefined result. This could be a division by zero error."
+
+--------------------------------------------------------------------------------
+
 ### 10. `solve_homogeneous_polynomial_expression`
 
 Solves a homogeneous polynomial expression for a specified variable and returns solutions in LaTeX format. Assumes that the expression is homoegeneous (i.e. equal to zero), and solves for a designated variable. May optionally include substitutions for other variables in the equation. The solutions are provided as a LaTeX formatted string. The method solves equations for specified variables, with optional substitutions, returning LaTeX-formatted solutions.

{rgwfuncs-0.0.48.dist-info → rgwfuncs-0.0.51.dist-info}/RECORD

@@ -1,12 +1,12 @@
 rgwfuncs/__init__.py,sha256=vs8xv3IVx7KGpPxEXrIePD3gb_QI1XTXpD_n9817foA,1610
-rgwfuncs/algebra_lib.py,sha256=Y9DMuEMa3R2kgReHPdqlpAt80aorvMRR7LmtDqbQFSU,28360
+rgwfuncs/algebra_lib.py,sha256=sLQUxXG4mNNO55XclTgIrwVrg5LbwELOFsiSAm_9G20,28212
 rgwfuncs/df_lib.py,sha256=qqRQdakheLy8wMZRBfHwKyIp8DmdZIWfAiLKWgq03QU,68977
 rgwfuncs/docs_lib.py,sha256=y3wSAOPO3qsA4HZ7xAtW8HimM8w-c8hjcEzMRLJ96ao,1960
 rgwfuncs/interactive_shell_lib.py,sha256=A7EWsYxAfDev_N0-2GjRvAtp0bAwBPHIczXb8Gu9fzI,1107
 rgwfuncs/str_lib.py,sha256=rtAdRlnSJIu3JhI-tA_A0wCiPK2m-zn5RoGpBxv_g-4,2228
-rgwfuncs-0.0.48.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-rgwfuncs-0.0.48.dist-info/METADATA,sha256=e-1-ftsJikT2kND8zramQCjqc1BBzN3d1XYhm1Iawdk,55152
-rgwfuncs-0.0.48.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-rgwfuncs-0.0.48.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.48.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.48.dist-info/RECORD,,
+rgwfuncs-0.0.51.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+rgwfuncs-0.0.51.dist-info/METADATA,sha256=Q-t10jPxJYG_orABThvIy6q1-WQvwOYwe_3TNLuLYRw,55152
+rgwfuncs-0.0.51.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+rgwfuncs-0.0.51.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.51.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.51.dist-info/RECORD,,