Skip to content

Propagate probe and variable dependencies into analog function output variables #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Propagate probe and variable dependencies into analog function output variables #85

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94a0e27
Propagate dependencies into AF output args
tvrusso Aug 8, 2019
ed6cac8
Assure various "setin*" attributes are set for AF outputs
tvrusso Aug 8, 2019
0be3dbc
Make analog function output variables have correct dependency
tvrusso Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions admsXml/adms.implicit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
<admst:variable name="globalopdependent" string="no"/>
<admst:variable name="globalpartitionning"/>
<admst:variable name="globaltreenode"/>
<admst:variable name="globalhandleafoutputs" string="no"/>
<admst:variable name="globalaf"/>

<admst:template match="e:dependency">
<admst:choose>
Expand Down Expand Up @@ -71,6 +73,9 @@
<admst:when test="[datatypename='probe']">
<admst:value-to select="dependency" string="linear"/>
<admst:push into="$globalexpression/probe" select="." onduplicate="ignore"/>
<admst:if test="[$globalhandleafoutputs='yes']">
<admst:push into="$globalaf/@probe" select="." onduplicate="ignore"/>
</admst:if>
</admst:when>
<admst:when test="[datatypename='array']">
<admst:apply-templates select="variable" match="e:dependency"/>
Expand All @@ -81,6 +86,12 @@
<admst:push into="$globalexpression/variable" select="." onduplicate="ignore"/>
<admst:push into="$globaltreenode/@variable" select="." onduplicate="ignore"/>
<admst:value-to select="dependency" path="prototype/dependency"/>

<admst:if test="[$globalhandleafoutputs='yes']">
<admst:push into="$globalaf/@probe" select="probe" onduplicate="ignore"/>
<admst:push into="$globalaf/@variable" select="." onduplicate="ignore"/>
</admst:if>

</admst:when>
<admst:when test="[datatypename='mapply_unary']">
<admst:apply-templates select="arg1" match="e:dependency"/>
Expand Down Expand Up @@ -160,7 +171,66 @@
<admst:value-to select="dependency" string="constant"/>
</admst:when>
<admst:otherwise>
<!-- track dependencies of analog function output arguments -->
<admst:if test="[definition/datatypename='analogfunction']">
<admst:variable name="function" select="%(.)"/>
<admst:if test="[exists(definition/variable[(output='yes') and (name!=$function/name)])]">
<admst:variable name="globalhandleafoutputs" string="yes"/>
<admst:variable name="globalaf" path="."/>
</admst:if>
</admst:if>
<!-- process arguments normally -->
<admst:apply-templates select="arguments" match="e:dependency"/>
<!-- propagate dependencies into output arguments -->
<admst:if test="[$globalhandleafoutputs='yes']">
<admst:variable name="globalhandleafoutputs" string="no"/>
<admst:variable name="globalaf"/>
<admst:for-each select="definition/variable">
<admst:if test="[(output='yes') and (name!=$function/name)]">
<admst:variable name="position" select="%(position(.)-1)"/>
<admst:fatal test="[$function/arguments[position(.)=$position]/datatypename!='variable']"
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"/>
</admst:when>
<admst:when test="[$globalpartitionning='initial_instance']">
<admst:value-to select="$function/arguments[position(.)=$position]/setininstance" string="yes"/>
</admst:when>
<admst:when test="[$globalpartitionning='initial_step']">
<admst:value-to select="$function/arguments[position(.)=$position]/setininitial_step" string="yes"/>
</admst:when>
<admst:when test="[$globalpartitionning='noise']">
<admst:value-to select="$function/arguments[position(.)=$position]/setinnoise" string="yes"/>
</admst:when>
<admst:when test="[$globalpartitionning='final_step']">
<admst:value-to select="$function/arguments[position(.)=$position]/setinfinal" string="yes"/>
</admst:when>
<admst:otherwise>
<admst:value-to select="$function/arguments[position(.)=$position]/setinevaluate" string="yes"/>
</admst:otherwise>
</admst:choose>
</admst:if>
</admst:for-each>
<admst:value-to select="$function/@probe"/>
<admst:value-to select="$function/@variable"/>
</admst:if>
<admst:choose>
<admst:when test="[(name='ddt' or name='\$ddt')or(name='idt' or name='\$idt')]">
<admst:value-to select="dependency" string="nonlinear"/>
Expand Down