prefig 0.3.8.dev20250725054648__tar.gz → 0.3.9.dev20250727054417__tar.gz

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefig
-Version: 0.3.8.dev20250725054648
+Version: 0.3.9.dev20250727054417
 Summary: An authoring system for mathematical diagrams
 Home-page: https://prefigure.org
 License: GPL-3.0-or-later

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/prefig/core/math_utilities.py

@@ -15,6 +15,9 @@ def set_diagram(d):
 # introduce some useful mathematical operations
 #   that are meant to be available to authors
 
+def ln(x):
+    return math.log(x)
+
 def dot(u, v):
     return np.dot(np.array(u), np.array(v))
 
@@ -80,6 +83,17 @@ def rotate(v, theta):
 def deriv(f, a):
     return calculus.derivative(f, a)
 
+def grad(f, a):
+    a = list(a)
+    grad = []
+    for j in range(len(a)):
+        def f_trace(x):
+            b = a[:]
+            b[j] = x
+            return f(*b)
+        grad.append(calculus.derivative(f_trace, a[j]))
+    return np.array(grad)
+
 def zip_lists(a, b):
     return list(zip(a, b))
 

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/prefig/core/polygon.py

@@ -188,6 +188,9 @@ def spline(element, diagram, parent, outline_status):
 
     cs = CubicSpline(t_vals, points, bc_type=bc)
 
+    if element.get('name', None) is not None:
+        un.enter_function(element.get('name'), cs)
+
     N = un.valid_eval(element.get('N', '100'))
     domain = element.get('domain', None)
     if domain is not None:

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/prefig/core/slope_field.py

@@ -11,6 +11,7 @@ from . import math_utilities as math_util
 from . import calculus
 
 log = logging.getLogger('prefigure')
+np.seterr(divide="ignore", invalid="ignore")
 
 # Add a graphical element for slope fields
 def slope_field(element, diagram, parent, outline_status):
@@ -140,52 +141,95 @@ def vector_field(element, diagram, parent, outline_status):
     else:
         line_template.set('stroke', element.get('stroke', 'blue'))
     line_template.set('thickness', element.get('thickness', '2'))
-    if element.get('arrows', 'yes') == 'yes':
-        line_template.set('arrows', '1')
+    line_template.set('arrows', '1')
 
     if element.get('arrow-width', None) is not None:
         line_template.set('arrow-width', element.get('arrow-width'))
     if element.get('arrow-angles', None) is not None:
         line_template.set('arrow-angles', element.get('arrow-angles'))
 
-    spacings = element.get('spacings', None)
-    if spacings is not None:
+    field_data = []
+    if element.get('curve', None) is not None:
+        curve = un.valid_eval(element.get('curve'))
         try:
-            spacings = un.valid_eval(spacings)
-            rx, ry = spacings
+            domain = un.valid_eval(element.get('domain'))
         except:
-            log.error(f"Error parsing slope-field attribute @spacings={element.get('spacings')}")
+            log.error('A @domain is needed if adding a vector field to a curve')
+            return
+        try:
+            N = un.valid_eval(element.get('N'))
+        except:
+            log.error('A @N is needed if adding a vector field to a curve')
             return
-    else:
-        rx = grid_axes.find_gridspacing((bbox[0], bbox[2]))
-        ry = grid_axes.find_gridspacing((bbox[1], bbox[3]))
 
-    # we will go through and generate the vectors first
-    # since we'll need to scale them
-    field_data = []
-    max_scale = 0
-    x = rx[0]
-    while x <= rx[2]:
-        y = ry[0]
-        while y <= ry[2]:
-            f_value = f(x, y)
+        t = domain[0]
+        # if "f" a function of t or (x,y)?
+        one_variable = True
+        try:
+            f(t)
+        except TypeError:
+            one_variable = False
+
+        dt = (domain[1]-domain[0])/(N-1)
+        for _ in range(N):
+            position = curve(t)
+            if one_variable:
+                field_data.append([position, f(t)])
+            else:
+                field_data.append([position, f(*position)])
+            t += dt
+        scale_factor = un.valid_eval(element.get('scale', '1'))
+
+    else:
+        spacings = element.get('spacings', None)
+        if spacings is not None:
             try:
-                if len(f_value) != 2:
-                    log.error("Only two-dimensional vector fields are supported")
-                    return;
+                spacings = un.valid_eval(spacings)
+                rx, ry = spacings
             except:
-                pass
-            max_scale = max(max_scale,
-                            abs((f_value[0])/rx[1]),
-                            abs((f_value[1])/ry[1]))
-            field_data.append([np.array([x,y]), f_value])
-            y += ry[1]
-        x += rx[1]
+                log.error(f"Error parsing slope-field attribute @spacings={element.get('spacings')}")
+                return
+        else:
+            rx = grid_axes.find_gridspacing((bbox[0], bbox[2]))
+            ry = grid_axes.find_gridspacing((bbox[1], bbox[3]))
+
+        # we will go through and generate the vectors first
+        # since we'll need to scale them
+        max_scale = 0
+        exponent = un.valid_eval(element.get('exponent', '1'))
+        x = rx[0]
+        while x <= rx[2]:
+            y = ry[0]
+            while y <= ry[2]:
+                f_value = f(x, y)
+                if any(np.isnan(f_value)):
+                    y += ry[1]
+                    continue
 
-    scale_factor = min(1, 0.75 / max_scale)
-    if element.get('scale') is not None:
-        scale = un.valid_eval(element.get('scale'))
-        scale_factor = scale
+                try:
+                    if len(f_value) != 2:
+                        log.error("Only two-dimensional vector fields are supported")
+                        return;
+                except:
+                    pass
+                norm = math_util.length(f_value)
+                if norm < 1e-10:
+                    f_value = np.array((0,0))
+                else:
+                    # we will scale the length by length**exponent
+                    # to promote the length of shorter vectors
+                    f_value = norm**exponent * (1/norm * f_value)
+                max_scale = max(max_scale,
+                                abs((f_value[0])/rx[1]),
+                                abs((f_value[1])/ry[1]))
+                field_data.append([np.array([x,y]), f_value])
+                y += ry[1]
+            x += rx[1]
+
+        scale_factor = min(1, 0.75 / max_scale)
+        if element.get('scale') is not None:
+            scale = un.valid_eval(element.get('scale'))
+            scale_factor = scale
 
     for datum in field_data:
         p, v = datum
@@ -205,18 +249,3 @@ def vector_field(element, diagram, parent, outline_status):
 
     group.group(element, diagram, parent, outline_status)
 
-def gradient(element, diagram, parent, outline_status):
-    try:
-        f = un.valid_eval(element.get("function"))
-    except:
-        log.error("Error retrieving function in gradient element")
-        return
-
-    def grad(a, b):
-        f_x_trace = lambda x: f(x, b)
-        f_y_trace = lambda y: f(a, y)
-        return np.array([calculus.derivative(f_x_trace, a),
-                         calculus.derivative(f_y_trace, b)])
-    un.enter_namespace("__grad", grad)
-    element.set("function", "__grad")
-    vector_field(element, diagram, parent, outline_status)

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/prefig/core/tags.py

@@ -41,11 +41,11 @@ tag_dict = {
     'caption': label.caption,
     'circle': circle.circle,
     'clip': clip.clip,
+    'contour': implicit.implicit_curve,
     'coordinates': coordinates.coordinates,
     'definition': definition.definition,
     'derivative': definition.derivative,
     'ellipse': circle.ellipse,
-    'gradient': slope_field.gradient,
     'graph': graph.graph,
     'grid': grid_axes.grid,
     'grid-axes': grid_axes.grid_axes,

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/prefig/core/user_namespace.py

@@ -66,6 +66,8 @@ def validate_node(node, args=None):
         return True
     if isinstance(node, ast.Expression):
         return validate_node(node.body, args)
+    if isinstance(node, ast.Starred):
+        return validate_node(node.value)
     if isinstance(node, ast.Name):
         if node.id in variables:
             return True
@@ -170,6 +172,11 @@ def derivative(f, name):
     functions.add(name)
     variables.add(name)
 
+def enter_function(name, f):
+    globals()[name] = f
+    functions.add(name)
+    variables.add(name)
+
 def enter_namespace(name, value):
     globals()[name] = value
     variables.add(name)

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/prefig/resources/schema/pf_schema.rnc

@@ -313,6 +313,7 @@ GraphicalElements =
         Area-Under-Curve* &
         Axes* &
         Circle* &
+        Contour* &
         Ellipse* &
         Graph* &
         Grid* &
@@ -337,7 +338,8 @@ GraphicalElements =
         Tick-Mark* &
         Tangent-line* &
         Triangle* &
-        Vector*
+        Vector* & 
+        Vector-Field*
     )
 
 Angle-Marker = element angle-marker {
@@ -433,6 +435,7 @@ Grid = element grid {
     attribute coordinates {text}?,
     attribute spacing-degrees {"yes"|"no"}?,
     attribute scales {"linear"|"semilogx"|"semilogy"|"loglog"}?,
+    Stroke-Attributes,
     CommonAttributes
 }
 
@@ -457,6 +460,7 @@ Grid-Axes = element grid-axes {
     attribute h-zero-label {"yes"|"no"}?,
     attribute v-zero-label {"yes"|"no"}?,
     attribute label-commas {"yes"|"no"}?,
+    StrokeAttributes,
     CommonAttributes,
     XLabel?,
     YLabel?    
@@ -469,10 +473,21 @@ Tick-Mark = element tick-mark {
     attribute stroke {text}?,
     attribute size {text}?,
     attribute thickness {text}?,
+    StrokeAttributes,
     LabelAttributes,
     LabelText?
 }
 
+Contour = element contour {
+    attribute at {text}?,
+    attribute function {text},
+    attribute k {text}?,
+    attribute depth {text}?,
+    attribute initial-depth {text}?,
+    StrokeAttributes,
+    CommonAttributes
+}
+
 Circle = element circle {
     attribute at {text}?,
     attribute center {text},
@@ -744,6 +759,7 @@ Spline = element spline {
     attribute closed {"yes"|"no"}?,
     attribute arrow-width {text}?,
     attribute arrow-angles {text}?,
+    attribute name {text}?,
     FillAttributes,
     CommonAttributes
 }
@@ -781,4 +797,18 @@ Vector = element vector {
     CommonAttributes
 }
 
+Vector-Field = element vector-field {
+    attribute at {text}?,
+    attribute function {text}?,
+    attribute spacings {text}?,
+    attribute scale {text}?,
+    attribute curve {text}?,
+    attribute domain {text}?,
+    attribute N {text}?,
+    attribute arrow-width {text}?,
+    attribute arrow-angles {text?}?,
+    StrokeAttributes,
+    CommonAttributes
+}
+
 }

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/prefig/resources/schema/pf_schema.rng

@@ -762,6 +762,9 @@
       <zeroOrMore>
         <ref name="Circle"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="Contour"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="Ellipse"/>
       </zeroOrMore>
@@ -837,6 +840,9 @@
       <zeroOrMore>
         <ref name="Vector"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="Vector-Field"/>
+      </zeroOrMore>
     </interleave>
   </define>
   <define name="Angle-Marker">
@@ -1176,6 +1182,7 @@
           </choice>
         </attribute>
       </optional>
+      <ref name="Stroke-Attributes"/>
       <ref name="CommonAttributes"/>
     </element>
   </define>
@@ -1291,6 +1298,7 @@
           </choice>
         </attribute>
       </optional>
+      <ref name="StrokeAttributes"/>
       <ref name="CommonAttributes"/>
       <optional>
         <ref name="XLabel"/>
@@ -1318,12 +1326,32 @@
       <optional>
         <attribute name="thickness"/>
       </optional>
+      <ref name="StrokeAttributes"/>
       <ref name="LabelAttributes"/>
       <optional>
         <ref name="LabelText"/>
       </optional>
     </element>
   </define>
+  <define name="Contour">
+    <element name="contour">
+      <optional>
+        <attribute name="at"/>
+      </optional>
+      <attribute name="function"/>
+      <optional>
+        <attribute name="k"/>
+      </optional>
+      <optional>
+        <attribute name="depth"/>
+      </optional>
+      <optional>
+        <attribute name="initial-depth"/>
+      </optional>
+      <ref name="StrokeAttributes"/>
+      <ref name="CommonAttributes"/>
+    </element>
+  </define>
   <define name="Circle">
     <element name="circle">
       <optional>
@@ -2029,6 +2057,9 @@
       <optional>
         <attribute name="arrow-angles"/>
       </optional>
+      <optional>
+        <attribute name="name"/>
+      </optional>
       <ref name="FillAttributes"/>
       <ref name="CommonAttributes"/>
     </element>
@@ -2112,4 +2143,41 @@
       <ref name="CommonAttributes"/>
     </element>
   </define>
+  <define name="Vector-Field">
+    <element name="vector-field">
+      <optional>
+        <attribute name="at"/>
+      </optional>
+      <optional>
+        <attribute name="function"/>
+      </optional>
+      <optional>
+        <attribute name="spacings"/>
+      </optional>
+      <optional>
+        <attribute name="scale"/>
+      </optional>
+      <optional>
+        <attribute name="curve"/>
+      </optional>
+      <optional>
+        <attribute name="domain"/>
+      </optional>
+      <optional>
+        <attribute name="N"/>
+      </optional>
+      <optional>
+        <attribute name="arrow-width"/>
+      </optional>
+      <optional>
+        <attribute name="arrow-angles">
+          <optional>
+            <text/>
+          </optional>
+        </attribute>
+      </optional>
+      <ref name="StrokeAttributes"/>
+      <ref name="CommonAttributes"/>
+    </element>
+  </define>
 </grammar>

{prefig-0.3.8.dev20250725054648 → prefig-0.3.9.dev20250727054417}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prefig"
-version = "0.3.8.dev20250725054648"
+version = "0.3.9.dev20250727054417"
 description = "An authoring system for mathematical diagrams"
 readme = "README.md"
 homepage = "https://prefigure.org"