fix slowdown in v1.006 - defer evaluation in paramauto

Author: ovitrac

docs/class_examples.html

@@ -353,7 +353,7 @@ <h2>Welcome to Usage Class Examples</h2>
 <p>Select a module in the left menu to view usage examples. These examples are not for production and are automatically extracted from the main section of each module.</p>
 <p>Back to the <a href='index.html'>Python'Pizza3 documentation</a>.</p>
 <p>When no module is selected, you see this welcome page. They are used to test classes with typical codes. The main section often serves as a testing script, example usage block, or self-contained test block. It's a way to demonstrate how the module's functionality works or to run simple unit tests and examples inline.</p>
-<p>Generated on: 2025-02-20 12:54:09</p>
+<p>Generated on: 2025-02-20 21:47:30</p>
 
 </div>
 

docs/datatemplate3.html

@@ -96,7 +96,7 @@
         <div style="border: 2px solid red; padding: 10px; margin-bottom: 20px;">
             <h3 style="color: red;">Notice</h3>
             <p>This is a raw view of the Python source code due to an error in generating the documentation.</p>
-            <p><strong>Date of Conversion:</strong> 2025-02-20 12:54:11</p>
+            <p><strong>Date of Conversion:</strong> 2025-02-20 21:47:32</p>
         </div>
 
 <h2></h2>

docs/dscript_math_example.html

@@ -96,7 +96,7 @@
         <div style="border: 2px solid red; padding: 10px; margin-bottom: 20px;">
             <h3 style="color: red;">Notice</h3>
             <p>This is a raw view of the Python source code due to an error in generating the documentation.</p>
-            <p><strong>Date of Conversion:</strong> 2025-02-20 12:54:13</p>
+            <p><strong>Date of Conversion:</strong> 2025-02-20 21:47:33</p>
         </div>
 
 <h2></h2>

docs/dump_case4.html

@@ -96,7 +96,7 @@
         <div style="border: 2px solid red; padding: 10px; margin-bottom: 20px;">
             <h3 style="color: red;">Notice</h3>
             <p>This is a raw view of the Python source code due to an error in generating the documentation.</p>
-            <p><strong>Date of Conversion:</strong> 2025-02-20 12:54:13</p>
+            <p><strong>Date of Conversion:</strong> 2025-02-20 21:47:34</p>
         </div>
 
 <h2></h2>

docs/dumpreduce.html

@@ -96,7 +96,7 @@
         <div style="border: 2px solid red; padding: 10px; margin-bottom: 20px;">
             <h3 style="color: red;">Notice</h3>
             <p>This is a raw view of the Python source code due to an error in generating the documentation.</p>
-            <p><strong>Date of Conversion:</strong> 2025-02-20 12:54:14</p>
+            <p><strong>Date of Conversion:</strong> 2025-02-20 21:47:35</p>
         </div>
 
 <h2></h2>

docs/dumptemplate.html

@@ -96,7 +96,7 @@
         <div style="border: 2px solid red; padding: 10px; margin-bottom: 20px;">
             <h3 style="color: red;">Notice</h3>
             <p>This is a raw view of the Python source code due to an error in generating the documentation.</p>
-            <p><strong>Date of Conversion:</strong> 2025-02-20 12:54:15</p>
+            <p><strong>Date of Conversion:</strong> 2025-02-20 21:47:36</p>
         </div>
 
 <h2></h2>

docs/dumptemplate3.html

@@ -96,7 +96,7 @@
         <div style="border: 2px solid red; padding: 10px; margin-bottom: 20px;">
             <h3 style="color: red;">Notice</h3>
             <p>This is a raw view of the Python source code due to an error in generating the documentation.</p>
-            <p><strong>Date of Conversion:</strong> 2025-02-20 12:54:14</p>
+            <p><strong>Date of Conversion:</strong> 2025-02-20 21:47:35</p>
         </div>
 
 <h2></h2>

docs/geometry.html

@@ -96,7 +96,7 @@
         <div style="border: 2px solid red; padding: 10px; margin-bottom: 20px;">
             <h3 style="color: red;">Notice</h3>
             <p>This is a raw view of the Python source code due to an error in generating the documentation.</p>
-            <p><strong>Date of Conversion:</strong> 2025-02-20 12:54:36</p>
+            <p><strong>Date of Conversion:</strong> 2025-02-20 21:47:51</p>
         </div>
 
 <h2></h2>

docs/index.html

@@ -328,7 +328,7 @@ <h2>Welcome to Pizza3 Matlab Documentation</h2>
 <p>Back to the <a href='index.html'>Python'Pizza3 documentation</a>.</p>
 <hr>
 <p><i>When no function is selected, you see this welcome page.</i></p>
-Generated on: 2025-02-20 12:55:01</div>
+Generated on: 2025-02-20 21:48:17</div>
 <div id='Hertz_forces' class='doc-content' style='display: none;'>
 <h1>Code to explain the displacement of SPH particles (amorphous) along a rigid wall made with beads of the same size (organized)</h1>
 <p>INRAE\Olivier Vitrac, Han Chen - 2023-02-23</p>

docs/index_matlab.html

@@ -9028,13 +9028,14 @@ <h3 id="dynamic-properties">Dynamic Properties</h3>
     _maxdisplay = 40        # maximum number of characters to display (should be even)
     _propertyasattribute = False
     _precision = 4
+    _needs_sorting = False
 
     # attributes for the iterator method
     # Please keep it static, duplicate the object before changing _iter_
     _iter_ = 0
 
     # excluded attributes (keep the , in the Tupple if it is singleton)
-    _excludedattr = {&#39;_iter_&#39;,&#39;__class__&#39;,&#39;_protection&#39;,&#39;_evaluation&#39;,&#39;_returnerror&#39;,&#39;_debug&#39;,&#39;_precision&#39;} # used by keys() and len()
+    _excludedattr = {&#39;_iter_&#39;,&#39;__class__&#39;,&#39;_protection&#39;,&#39;_evaluation&#39;,&#39;_returnerror&#39;,&#39;_debug&#39;,&#39;_precision&#39;,&#39;_needs_sorting&#39;} # used by keys() and len()
 
 
     # Methods
@@ -9259,6 +9260,10 @@ <h3 id="dynamic-properties">Dynamic Properties</h3>
 
         The new instance is created by copying the fields from the left-hand operand (a)
         and then updating with the fields from the right-hand operand (b).
+
+        If self or s is of class paramauto, the current state of _needs_sorting is propagated
+        but not forced to be true.
+
         &#34;&#34;&#34;
         if not isinstance(s, struct):
             raise TypeError(f&#34;the second operand must be {self._type}&#34;)
@@ -9274,15 +9279,24 @@ <h3 id="dynamic-properties">Dynamic Properties</h3>
             else:
                 return 0  # fallback for unknown derivations
 
+        # current classes
+        leftprecedence = get_precedence(self)
+        rightprecedence = get_precedence(s)
         # Determine which class to use for the duplicate.
         # If s (b) has a higher precedence than self (a), use s&#39;s class; otherwise, use self&#39;s.
-        hi_class = self.__class__ if get_precedence(self) &gt;= get_precedence(s) else s.__class__
+        hi_class = self.__class__ if leftprecedence &gt;= rightprecedence else s.__class__
         # Create a new instance of the chosen class by copying self&#39;s fields.
         dup = hi_class(**self)
         # Update with the fields from s.
         dup.update(**s)
-        if sortdefinitions:
-            dup.sortdefinitions(raiseerror=raiseerror, silentmode=silentmode)
+        if sortdefinitions: # defer sorting by preserving the state of _needs_sorting
+            if leftprecedence &lt; rightprecedence == 2: # left is promoted
+                dup._needs_sorting = s._needs_sorting
+            elif rightprecedence &lt; leftprecedence == 2: # right is promoted
+                dup._needs_sorting = self._needs_sorting
+            elif leftprecedence == rightprecedence == 2: # left and right are equivalent
+                dup._needs_sorting = self._needs_sorting or s._needs_sorting
+            # dup.sortdefinitions(raiseerror=raiseerror, silentmode=silentmode)
         return dup
 
     def __iadd__(self,s,sortdefinitions=False,raiseerror=False, silentmode=True):
@@ -9292,7 +9306,9 @@ <h3 id="dynamic-properties">Dynamic Properties</h3>
         if not isinstance(s,struct):
             raise TypeError(f&#34;the second operand must be {self._type}&#34;)
         self.update(**s)
-        if sortdefinitions: self.sortdefinitions(raiseerror=raiseerror,silentmode=silentmode)
+        if sortdefinitions:
+            self._needs_sorting = True
+            # self.sortdefinitions(raiseerror=raiseerror,silentmode=silentmode)
         return self
 
     def __sub__(self,s):
@@ -9563,6 +9579,7 @@ <h3 id="dynamic-properties">Dynamic Properties</h3>
                     s.setattr(k[i],True)
         return s
 
+
     def sortdefinitions(self,raiseerror=True,silentmode=False):
         &#34;&#34;&#34; sortdefintions sorts all definitions
             so that they can be executed as param().
@@ -9828,7 +9845,6 @@ <h3 id="dynamic-properties">Dynamic Properties</h3>
         s.update(a=10, b=[1, 2, 3], new_field=&#34;new_value&#34;)
         &#34;&#34;&#34;
         protected_attributes = getattr(self, &#39;_excludedattr&#39;, ())
-
         for key, value in kwargs.items():
             if key in protected_attributes:
                 print(f&#34;Warning: Cannot update protected attribute &#39;{key}&#39;&#34;)
@@ -11347,7 +11363,6 @@ <h2 id="usage">Usage:</h2>
     s.update(a=10, b=[1, 2, 3], new_field=&#34;new_value&#34;)
     &#34;&#34;&#34;
     protected_attributes = getattr(self, &#39;_excludedattr&#39;, ())
-
     for key, value in kwargs.items():
         if key in protected_attributes:
             print(f&#34;Warning: Cannot update protected attribute &#39;{key}&#39;&#34;)

docs/pizza/dforcefield.html

@@ -18187,16 +18187,31 @@ <h3 id="examples_1">Examples</h3>
     &#34;&#34;&#34;
 
     def __add__(self,p):
-        return super(param,self).__add__(p,sortdefinitions=True,raiseerror=False)
+        return super().__add__(p,sortdefinitions=True,raiseerror=False)
+        self._needs_sorting = True
 
     def __iadd__(self,p):
-        return super(param,self).__iadd__(p,sortdefinitions=True,raiseerror=False)
+        return super().__iadd__(p,sortdefinitions=True,raiseerror=False)
+        self._needs_sorting = True
 
     def __repr__(self):
         self.sortdefinitions(raiseerror=False)
         #super(param,self).__repr__()
         super().__repr__()
-        return str(self)</code></pre>
+        return str(self)
+
+    def setattr(self,key,value):
+        &#34;&#34;&#34; set field and value &#34;&#34;&#34;
+        if isinstance(value,list) and len(value)==0 and key in self:
+            delattr(self, key)
+        else:
+            self.__dict__[key] = value
+            self.__dict__[&#34;_needs_sorting&#34;] = True
+
+    def sortdefinitions(self, raiseerror=True, silentmode=True):
+        if self._needs_sorting:
+            super().sortdefinitions(raiseerror=raiseerror, silentmode=silentmode)
+            self._needs_sorting = False</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">
@@ -18210,6 +18225,47 @@ <h3>Subclasses</h3>
 <li>pizza.forcefield.parameterforcefield</li>
 <li>pizza.region.regiondata</li>
 </ul>
+<h3>Methods</h3>
+<dl>
+<dt id="dscript.paramauto.setattr"><code class="name flex">
+<span>def <span class="ident">setattr</span></span>(<span>self, key, value)</span>
+</code></dt>
+<dd>
+<div class="desc"><p>set field and value</p></div>
+<details class="source">
+<summary>
+<span>Expand source code</span>
+</summary>
+<pre><code class="python">def setattr(self,key,value):
+    &#34;&#34;&#34; set field and value &#34;&#34;&#34;
+    if isinstance(value,list) and len(value)==0 and key in self:
+        delattr(self, key)
+    else:
+        self.__dict__[key] = value
+        self.__dict__[&#34;_needs_sorting&#34;] = True</code></pre>
+</details>
+</dd>
+<dt id="dscript.paramauto.sortdefinitions"><code class="name flex">
+<span>def <span class="ident">sortdefinitions</span></span>(<span>self, raiseerror=True, silentmode=True)</span>
+</code></dt>
+<dd>
+<div class="desc"><p>sortdefintions sorts all definitions
+so that they can be executed as param().
+If any inconsistency is found, an error message is generated.</p>
+<p>Flags = default values
+raiseerror=True show erros of True
+silentmode=False no warning if True</p></div>
+<details class="source">
+<summary>
+<span>Expand source code</span>
+</summary>
+<pre><code class="python">def sortdefinitions(self, raiseerror=True, silentmode=True):
+    if self._needs_sorting:
+        super().sortdefinitions(raiseerror=raiseerror, silentmode=silentmode)
+        self._needs_sorting = False</code></pre>
+</details>
+</dd>
+</dl>
 </dd>
 <dt id="dscript.pipescript"><code class="flex name class">
 <span>class <span class="ident">pipescript</span></span>
@@ -24054,6 +24110,10 @@ <h4><code><a title="dscript.lamdaScript" href="#dscript.lamdaScript">lamdaScript
 </li>
 <li>
 <h4><code><a title="dscript.paramauto" href="#dscript.paramauto">paramauto</a></code></h4>
+<ul class="">
+<li><code><a title="dscript.paramauto.setattr" href="#dscript.paramauto.setattr">setattr</a></code></li>
+<li><code><a title="dscript.paramauto.sortdefinitions" href="#dscript.paramauto.sortdefinitions">sortdefinitions</a></code></li>
+</ul>
 </li>
 <li>
 <h4><code><a title="dscript.pipescript" href="#dscript.pipescript">pipescript</a></code></h4>