Make analog function output variables have correct dependency

In my other commits on this branch, I modified adms.implicit.xml to propagate probe and variable dependencies from analog function argument lists into output variables (other than the return value, which was already handled correctly). In doing so, I had neglected setting the "dependency" element of the ADMS data tree on those variables, and so they were incorrectly being set to "constant". This led to the incorrect setting downstream of the OPdependent element as well. This commit correctly sets "dependency", and therefore OPdependent (which is set later by probing "dependency"). Qucs#67
tvrusso · Nov 28, 2022 · eb5011f · eb5011f
1 parent ed6cac8
commit eb5011f
Show file tree

Hide file tree

Showing 2 changed files with 873 additions and 0 deletions.
diff --git a/admsXml/adms.implicit.xml b/admsXml/adms.implicit.xml
@@ -192,6 +192,20 @@
                              format="%(function/name) output arg $position is %(.), must be a variable\n"/>
                 <admst:push into="$function/arguments[position(.)=$position]/probe" select="$function/@probe" onduplicate="ignore"/>
                 <admst:push into="$function/arguments[position(.)=$position]/variable" select="$function/@variable" onduplicate="ignore"/>
+                <admst:choose>
+                  <admst:when test="$function/arguments/dependency[.='linear' or .='nonlinear']">
+                    <admst:value-to select="$function/arguments[position(.)=$position]/dependency" string="nonlinear"/>
+                    <admst:value-to select="$function/arguments[position(.)=$position]/prototype/dependency" string="nonlinear"/>
+                  </admst:when>
+                  <admst:when test="$function/arguments/dependency[.='noprobe']">
+                    <admst:value-to select="$function/arguments[position(.)=$position]/dependency" string="noprobe"/>
+                    <admst:value-to select="$function/arguments[position(.)=$position]/prototype/dependency" string="noprobe"/>
+                  </admst:when>
+                  <admst:otherwise>
+                    <admst:value-to select="$function/arguments[position(.)=$position]/dependency" string="constant"/>
+                    <admst:value-to select="$function/arguments[position(.)=$position]/prototype/dependency" string="constant"/>
+                  </admst:otherwise>
+                </admst:choose>
                 <admst:choose>
                   <admst:when test="[$globalpartitionning='initial_model']">
                     <admst:value-to select="$function/arguments[position(.)=$position]/setinmodel" string="yes"/>