Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions src/test/resources/MultiRunSimulation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<ComponentType name="DisplayList">
<Parameter name="timeScale" dimension="time"/>
<Children name="lines" type="Line"/>
<Text name="title"/>

<Text name="title"/>
<Text name="display"/>
</ComponentType>



<ComponentType name="Display">
<Text name="title"/>
<Text name="title"/>
<Parameter name="xmin" dimension="none"/>
<Parameter name="xmax" dimension="none"/>
<Parameter name="ymin" dimension="none"/>
Expand Down Expand Up @@ -45,7 +45,7 @@
<Dynamics>
<StateVariable name="t" dimension="time"/>
</Dynamics>

<Simulation>
<Run component="target" variable="t" increment="step" total="length"/>
</Simulation>
Expand All @@ -56,8 +56,8 @@
<ComponentType name="SimulationSet">
<Children name="simulations" type="Simulation"/>
<Children name="displays" type="Display"/>


</ComponentType>

</Lems>
</Lems>
38 changes: 19 additions & 19 deletions src/test/resources/bounce-conditional.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Lems>

<Target component="sim"/>
<Target component="sim"/>

<Dimension name="length" l="1" />
<Dimension name="time" t="1" />
<Dimension name="speed" l="1" t="-1"/>
<Dimension name="acceleration" l="1" t="-2"/>

<Unit symbol="s" dimension="time"/>
<Unit symbol="m" dimension="length"/>
<Unit symbol="m_per_s" dimension="speed"/>
Expand All @@ -20,18 +20,18 @@
<Parameter name="t1" dimension="time"/>
<Parameter name="t2" dimension="time"/>
<Exposure name="height" dimension="time"/>

<Constant name="AccG" dimension="acceleration" value="9.8m_per_s2"/>

<Dynamics>
<StateVariable name="height" exposure="height" dimension="length"/>
<StateVariable name="vel" dimension="speed"/>

<OnStart>
<StateAssignment variable="height" value="y0"/>
<StateAssignment variable="vel" value="0"/>
</OnStart>

<ConditionalDerivedVariable name="effacc" dimension="acceleration">
<Case condition="t .lt. t1" value="-1 * AccG"/>
<Case condition="t .lt. t2" value="-0.1 * AccG"/>
Expand All @@ -48,25 +48,25 @@
</OnCondition>
</Dynamics>
</ComponentType>







<ball id="ball" fbounce="0.9" y0="5m" t1="5s" t2="10s"/>


<Include file="SingleSimulation.xml" />



<Simulation id="sim" length="20s" step="0.01s" target="ball">
<Display id="disp1" title="Net1" xmin="0" xmax="30" ymin="-1" ymax="6" timeScale="1s">
<Line id="g0" timeScale="1s" quantity="height" scale="1m" color="#0000f0"/>
</Display>

</Display>



</Simulation>

</Lems>
</Lems>