rgwfuncs 0.0.53__py3-none-any.whl → 0.0.55__py3-none-any.whl

rgwfuncs/algebra_lib.py

@@ -744,12 +744,12 @@ def plot_polynomial_functions(
     show_legend : bool
         Whether to add a legend to the plot (defaults to True).
     open_file : bool
-        If saving to path is not desireable, opens the svg as a temp file, else opens
-        the file from the actual location using the system's default viewer (defaults to
-        False).
+        If saving to path is not desirable, opens the SVG as a temp file;  
+        otherwise opens the file from the actual location using the system's  
+        default viewer (defaults to False).
     save_path : Optional[str]
-        If specified, saves the output string as a .svg at the indicated path (defaults to
-        None).
+        If specified, saves the output string as a .svg at the indicated path  
+        (defaults to None).
 
     Returns
     -------
@@ -772,33 +772,34 @@ def plot_polynomial_functions(
 
         expr_tmp = re.sub(DIFF_PATTERN, diff_replacer, expr_str)
         expr_tmp = expr_tmp.replace("np.", "")
+
+        # Attempt to convert basic Pythonic polynomial expressions to LaTeX
         try:
+            # Suppose you have a helper function python_polynomial_expression_to_latex
+            # If not, you can do a naive replacement or skip
+            from python_latex_helpers import python_polynomial_expression_to_latex
             latex_expr = python_polynomial_expression_to_latex(expr_tmp)
             return latex_expr
         except Exception:
-            # Fallback: just do naive **
+            # Fallback: naive ** -> ^
             return expr_tmp.replace("**", "^")
 
-    def handle_open_and_save(
-        svg_string: str,
-        open_file: bool,
-        save_path: Optional[str]
-    ) -> None:
-        # Save the SVG to a file if a save path is provided
-        if save_path:
+    def handle_open_and_save(svg_string: str, open_it: bool, path: Optional[str]) -> None:
+        # Save the SVG to a file if a path is provided
+        if path:
             try:
-                with open(save_path, 'w', encoding='utf-8') as file:
+                with open(path, 'w', encoding='utf-8') as file:
                     file.write(svg_string)
-                print(f"[INFO] SVG saved to: {save_path}")
+                print(f"[INFO] SVG saved to: {path}")
             except IOError as e:
-                print(f"[ERROR] Failed to save SVG to {save_path}. IOError: {e}")
+                print(f"[ERROR] Failed to save SVG to {path}. IOError: {e}")
 
         # Handle opening the file if requested
-        if open_file and save_path:
-            result = subprocess.run(["xdg-open", save_path], stderr=subprocess.DEVNULL)
+        if open_it and path:
+            result = subprocess.run(["xdg-open", path], stderr=subprocess.DEVNULL)
             if result.returncode != 0:
                 print("[ERROR] Failed to open the SVG file with the default viewer.")
-        elif open_file:
+        elif open_it:
             with tempfile.NamedTemporaryFile(delete=False, suffix=".svg") as tmpfile:
                 temp_svg_path = tmpfile.name
                 tmpfile.write(svg_string.encode('utf-8'))
@@ -810,60 +811,76 @@ def plot_polynomial_functions(
     fig, ax = plt.subplots()
 
     for entry in functions:
+        # Each entry is something like {"x**2": {"x": "*", "a": ...}}
         if len(entry) != 1:
-            print("Skipping invalid item. Must have exactly 1 expression->substitutions pair.")
+            print("[WARNING] Skipping invalid item. Must have exactly 1 expression->substitutions pair.")
             continue
 
-        expression, sub_dict = list(entry.items())[0]
+        # Extract the expression string and substitutions
+        expression, sub_dict = next(iter(entry.items()))
+
+        # Check presence of "x"
         if "x" not in sub_dict:
-            print(f"Skipping '{expression}' because sub-dict lacks 'x' key.")
+            print(f"[WARNING] Skipping '{expression}' because there is no 'x' key.")
             continue
 
-        # If "x" is "*", create a default domain
         x_val = sub_dict["x"]
+
+        # 1) If x == "*", generate from -zoom..+zoom
+        print("830", x_val)
+        print("830", type(x_val))
         if isinstance(x_val, str) and x_val == "*":
             x_values = np.linspace(-zoom, zoom, 1201)
-            sub_dict["x"] = x_values
+            sub_dict["x"] = x_values  # might as well update it in place
+        # 2) If x is already a NumPy array, use as-is
         elif isinstance(x_val, np.ndarray):
             x_values = x_val
         else:
-            print(f"Skipping '{expression}' because 'x' is neither '*' nor a NumPy array.")
+            print(f"[WARNING] Skipping '{expression}' because 'x' is neither '*' nor a NumPy array.")
             continue
 
-        # Evaluate the expression
+        # Evaluate the expression with the variables from sub_dict
+        # We'll inject them into an eval() context, including 'np'
         try:
             eval_context = {"np": np}
+            # Put all user-provided variables (like a=1.23) in:
             eval_context.update(sub_dict)
             y_values = eval(expression, {"np": np}, eval_context)
         except Exception as e:
-            print(f"Error evaluating expression '{expression}': {e}")
+            print(f"[ERROR] Could not evaluate '{expression}' -> {e}")
             continue
 
+        # Check we got a NumPy array
         if not isinstance(y_values, np.ndarray):
-            print(f"Skipping '{expression}' because it did not produce a NumPy array.")
+            print(f"[WARNING] Skipping '{expression}' because it did not produce a NumPy array.")
             continue
 
-        # If y_values is shorter than x_values (like np.diff), truncate x
+        # If y is shorter (like np.diff), truncate x
         if len(y_values) < len(x_values):
             x_values = x_values[:len(y_values)]
 
-        # Convert expression to a nice LaTeX string
+        # Convert the expression to a LaTeX label
         label_expr = latexify_expression(expression)
         ax.plot(x_values, y_values, label=rf"${label_expr}$")
 
     # Configure axes
     ax.set_xlim(-zoom, zoom)
     ax.set_ylim(-zoom, zoom)
+
+    # Place spines at center
     ax.spines['left'].set_position('zero')
     ax.spines['bottom'].set_position('zero')
+    # Hide the right and top spines
     ax.spines['right'].set_color('none')
     ax.spines['top'].set_color('none')
-    ax.set_aspect('equal', 'box')
     ax.xaxis.set_ticks_position('bottom')
     ax.yaxis.set_ticks_position('left')
+
+    # Ensure equal aspect ratio
+    ax.set_aspect('equal', 'box')
     ax.grid(True)
 
-    # Show legend
+    # If requested, show the legend
     if show_legend:
         leg = ax.legend(
             loc='upper center',
@@ -872,16 +889,15 @@ def plot_polynomial_functions(
             shadow=True,
             ncol=1
         )
-        plt.savefig(
-            buffer,
-            format='svg',
-            bbox_inches='tight',
-            bbox_extra_artists=[leg]  # ensures the legend is fully captured
-        )
+        plt.savefig(buffer, format='svg', bbox_inches='tight', bbox_extra_artists=[leg])
     else:
         plt.savefig(buffer, format='svg', bbox_inches='tight')
 
     plt.close(fig)
     svg_string = buffer.getvalue().decode('utf-8')
+
+    # Optionally open/save the file
     handle_open_and_save(svg_string, open_file, save_path)
+
     return svg_string
+

{rgwfuncs-0.0.53.dist-info → rgwfuncs-0.0.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rgwfuncs
-Version: 0.0.53
+Version: 0.0.55
 Summary: A functional programming paradigm for mathematical modelling and data science
 Home-page: https://github.com/ryangerardwilson/rgwfunc
 Author: Ryan Gerard Wilson
@@ -550,7 +550,7 @@ This function plots polynomial functions described by a list of expressions and
 
 • Displaying the SVG:
 
-    ![Plot](./media/plot_polynomial_functions_example_1.svg)
+![Plot](./media/plot_polynomial_functions_example_1.svg)
 
 --------------------------------------------------------------------------------
 

{rgwfuncs-0.0.53.dist-info → rgwfuncs-0.0.55.dist-info}/RECORD

@@ -1,12 +1,12 @@
 rgwfuncs/__init__.py,sha256=JjkuVeRV_Bkw8vnqSbJsRcYQRm4iCI3futR86cf3tRI,1637
-rgwfuncs/algebra_lib.py,sha256=AcGurkWyq3sd-HXPqUDnioEyiYwC_H70PBkJHOcXO7I,35183
+rgwfuncs/algebra_lib.py,sha256=YlXv8R-xD4IQoTaatw9AQyAsi5lWh00K1huQ53figC8,36017
 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.53.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-rgwfuncs-0.0.53.dist-info/METADATA,sha256=dkIVCAMIVUoI1teXGoalzHFYQT1usUebDMG5Mr6bafE,57140
-rgwfuncs-0.0.53.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-rgwfuncs-0.0.53.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.53.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.53.dist-info/RECORD,,
+rgwfuncs-0.0.55.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+rgwfuncs-0.0.55.dist-info/METADATA,sha256=2fr5olJy55MoAetAhCcPOsEVa6Ia3CGiDcKBnpiU-0g,57136
+rgwfuncs-0.0.55.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+rgwfuncs-0.0.55.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.55.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.55.dist-info/RECORD,,