demathpy 0.1.1__tar.gz → 0.1.2__tar.gz

{demathpy-0.1.1 → demathpy-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: demathpy
-Version: 0.1.1
+Version: 0.1.2
 Summary: PDE/ODE math backend
 Author: Misekai
 Author-email: Misekai <mcore-us@misekai.net>

{demathpy-0.1.1 → demathpy-0.1.2}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "demathpy"
-version = "0.1.1"
+version = "0.1.2"
 authors = [
   { name="Misekai", email="mcore-us@misekai.net" },
 ]

{demathpy-0.1.1 → demathpy-0.1.2}/src/demathpy/ode.py

@@ -20,8 +20,6 @@ def _preprocess_expr(expr: str) -> str:
     expr = (expr or "").strip()
     expr = re.sub(r"\(\s*approx\s*\)", "", expr, flags=re.IGNORECASE)
     expr = re.sub(r"\bapprox\b", "", expr, flags=re.IGNORECASE)
-    if "=" in expr:
-        expr = expr.split("=")[-1]
     expr = normalize_symbols(expr)
     return expr.strip()
 
@@ -185,6 +183,52 @@ class ODE:
         def pos(u): return np.maximum(u, 0.0)
         def sign(u): return np.sign(u)
         def step_fn(u): return np.heaviside(u, 1.0)
+        def heaviside_fn(u, h0=1.0): return np.heaviside(u, h0)
+        def clamp(u, lower, upper): return np.clip(u, lower, upper)
+
+        def elementwise_min(*values):
+            if not values:
+                raise ValueError("min requires at least one value")
+            out = values[0]
+            for value in values[1:]:
+                out = np.minimum(out, value)
+            return out
+
+        def elementwise_max(*values):
+            if not values:
+                raise ValueError("max requires at least one value")
+            out = values[0]
+            for value in values[1:]:
+                out = np.maximum(out, value)
+            return out
+
+        def piecewise(*cases):
+            if not cases:
+                raise ValueError("Piecewise requires at least one case")
+
+            # Also support numpy-style piecewise(cond, if_true, if_false).
+            if len(cases) == 3 and not isinstance(cases[0], (tuple, list)):
+                cond, if_true, if_false = cases
+                return np.where(cond, if_true, if_false)
+
+            condlist = []
+            choicelist = []
+            default = 0.0
+
+            for case in cases:
+                if not isinstance(case, (tuple, list)) or len(case) != 2:
+                    raise ValueError("Piecewise cases must be (expr, condition) pairs")
+                expr, cond = case
+                if isinstance(cond, (bool, np.bool_)):
+                    if bool(cond):
+                        default = expr
+                    continue
+                condlist.append(cond)
+                choicelist.append(expr)
+
+            if not condlist:
+                return np.asarray(default)
+            return np.select(condlist, choicelist, default=default)
 
         env = {
             "np": np,
@@ -194,7 +238,13 @@ class ODE:
             "log": np.log, "log10": np.log10, "log2": np.log2,
             "exp": np.exp, "sqrt": np.sqrt, "abs": np.abs,
             "pi": np.pi, "inf": np.inf, 
-            "pos": pos, "sign": sign, "step": step_fn
+            "pos": pos, "sign": sign, "step": step_fn,
+            "heaviside": heaviside_fn, "Heaviside": heaviside_fn,
+            "clamp": clamp, "clip": np.clip,
+            "where": np.where,
+            "min": elementwise_min, "max": elementwise_max,
+            "minimum": np.minimum, "maximum": np.maximum,
+            "piecewise": piecewise, "Piecewise": piecewise,
         }
         
         env.update(self.external_variables)

{demathpy-0.1.1 → demathpy-0.1.2}/src/demathpy/pde.py

@@ -20,8 +20,6 @@ def _preprocess_expr(expr: str) -> str:
     expr = (expr or "").strip()
     expr = re.sub(r"\(\s*approx\s*\)", "", expr, flags=re.IGNORECASE)
     expr = re.sub(r"\bapprox\b", "", expr, flags=re.IGNORECASE)
-    if "=" in expr:
-        expr = expr.split("=")[-1]
     expr = normalize_symbols(expr)
     return expr.strip()
 
@@ -651,6 +649,53 @@ class PDE:
         def pos(u): return np.maximum(u, 0.0)
         def sech(u): return 1.0 / np.cosh(u)
         def sign(u): return np.sign(u)
+        def step_fn(u): return np.heaviside(u, 1.0)
+        def heaviside_fn(u, h0=1.0): return np.heaviside(u, h0)
+        def clamp(u, lower, upper): return np.clip(u, lower, upper)
+
+        def elementwise_min(*values):
+            if not values:
+                raise ValueError("min requires at least one value")
+            out = values[0]
+            for value in values[1:]:
+                out = np.minimum(out, value)
+            return out
+
+        def elementwise_max(*values):
+            if not values:
+                raise ValueError("max requires at least one value")
+            out = values[0]
+            for value in values[1:]:
+                out = np.maximum(out, value)
+            return out
+
+        def piecewise(*cases):
+            if not cases:
+                raise ValueError("Piecewise requires at least one case")
+
+            # Also support numpy-style piecewise(cond, if_true, if_false).
+            if len(cases) == 3 and not isinstance(cases[0], (tuple, list)):
+                cond, if_true, if_false = cases
+                return np.where(cond, if_true, if_false)
+
+            condlist = []
+            choicelist = []
+            default = 0.0
+
+            for case in cases:
+                if not isinstance(case, (tuple, list)) or len(case) != 2:
+                    raise ValueError("Piecewise cases must be (expr, condition) pairs")
+                expr, cond = case
+                if isinstance(cond, (bool, np.bool_)):
+                    if bool(cond):
+                        default = expr
+                    continue
+                condlist.append(cond)
+                choicelist.append(expr)
+
+            if not condlist:
+                return np.asarray(default)
+            return np.select(condlist, choicelist, default=default)
 
         env = {
             "np": np,
@@ -666,6 +711,12 @@ class PDE:
             "gradmag": gradmag, "gradl1": gradl1,
             "grad": grad, "div": div, "advect": advect,
             "pos": pos, "sech": sech, "sign": sign,
+            "step": step_fn, "heaviside": heaviside_fn, "Heaviside": heaviside_fn,
+            "clamp": clamp, "clip": np.clip,
+            "where": np.where,
+            "min": elementwise_min, "max": elementwise_max,
+            "minimum": np.minimum, "maximum": np.maximum,
+            "piecewise": piecewise, "Piecewise": piecewise,
         }
         
         env.update(self.external_variables)

{demathpy-0.1.1 → demathpy-0.1.2}/src/demathpy/symbols.py

@@ -377,13 +377,17 @@ def normalize_symbols(expr: str) -> str:
     expr = re.sub(r"(\))\s*([a-zA-Z_])", r"\1*\2", expr)
     # Symbol followed by operator function: eta lap(u) -> eta*lap(u)
     expr = re.sub(
-        r"([a-zA-Z_][a-zA-Z0-9_]*)\s*(lap|grad|div|dx|dz|dxx|dzz|pos|gradl1|gradmag)\s*\(",
+        r"([a-zA-Z_][a-zA-Z0-9_]*)\s*(lap|grad|div|dx|dz|dxx|dzz|pos|gradl1|gradmag|clamp|clip|piecewise|Piecewise|min|max|minimum|maximum|where)\s*\(",
         r"\1*\2(",
         expr,
     )
 
     # Fix accidental insertions like gradl1*(u) -> gradl1(u)
-    expr = re.sub(r"\b(gradl1|gradmag|lap|dx|dz|dxx|dzz|grad|div|pos)\s*\*\s*\(", r"\1(", expr)
+    expr = re.sub(
+        r"\b(gradl1|gradmag|lap|dx|dz|dxx|dzz|grad|div|pos|clamp|clip|piecewise|Piecewise|min|max|minimum|maximum|where)\s*\*\s*\(",
+        r"\1(",
+        expr,
+    )
     # Avoid inserting * for known functions
     def _fn_mul(match):
         name = match.group(1)
@@ -395,6 +399,10 @@ def normalize_symbols(expr: str) -> str:
             "log", "log10", "log2",
             "abs", "sech", "sign", "step", "heaviside",
             "lap", "dx", "dz", "dxx", "dzz", "grad", "div", "advect", "gradmag", "gradl1", "pos",
+            "clamp", "clip", "where",
+            "piecewise", "Piecewise",
+            "min", "max", "minimum", "maximum",
+            "Heaviside",
         }:
             return f"{name}("
         return f"{name}*("