diff --git a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/ArrivalProcess.xml b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/ArrivalProcess.xml old mode 100755 new mode 100644 diff --git a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/TransferLineComponent.xml b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/TransferLineComponent.xml index 63bce207d2bcb60e15209ffd48e2487df9d6cafc..c9e8ddec9b611c19ffb4524e41bda0e529db23c9 100644 --- a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/TransferLineComponent.xml +++ b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/TransferLineComponent.xml @@ -1,91 +1,68 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<SimEntity extend="SimEntityBase" name="TransferLineComponent" package="examples" version="0.0.2" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<SimEntity name="TransferLineComponent" package="examples" version="0.0.2" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <Comment>TODO: Fix me, I'm currently broken!! tdn 8/29/24</Comment> <Parameter name="totalNumberServers" type="int[]"/> <Parameter name="serviceTime" type="simkit.random.RandomVariate[]"/> <StateVariable name="numberAvailableServers" type="int[totalNumberServers.length]"/> <StateVariable name="numberInQueue" type="int[totalNumberServers.length]"/> <Event name="Run"> <LocalVariable name="j" type="int" value="0"> - <Comment/> + <Comment></Comment> </LocalVariable> - <LocalVariable name="_idxvar_0" type="int" value="0"> - <Comment>used internally</Comment> - </LocalVariable> - <LocalVariable name="_idxvar_1" type="int" value="0"> - <Comment>used internally</Comment> - </LocalVariable> - <StateTransition index="_idxvar_0" state="numberAvailableServers"> - <Assignment value="totalNumberServers[_idxvar_0]"/> + <StateTransition state="numberAvailableServers" index="j> + <Assignment value="totalNumberServers[j]"/> </StateTransition> - <StateTransition index="_idxvar_1" state="numberInQueue"> + <StateTransition state="numberInQueue" index="_idxvar_1"> <Assignment value="0"/> </StateTransition> - <Schedule delay="0.0" event="InitializeWorkcenter"> + <Schedule delay="0.0" event="InitializeWorkcenter" priority="DEFAULT"> <EdgeParameter value="0"/> </Schedule> - <Coordinate x="0" y="0"/> + <Coordinate x="0.0" y="0.0"/> </Event> <Event name="InitializeWorkcenter"> <Argument name="i" type="int"/> - <LocalVariable name="_idxvar_26" type="int" value="i"> - <Comment>used internally</Comment> - </LocalVariable> - <LocalVariable name="_idxvar_27" type="int" value="i"> - <Comment>used internally</Comment> - </LocalVariable> - <StateTransition index="_idxvar_26" state="numberInQueue"> + <StateTransition state="numberInQueue" index="_idxvar_26"> <Assignment value="0"/> </StateTransition> - <StateTransition index="_idxvar_27" state="numberAvailableServers"> + <StateTransition state="numberAvailableServers" index="_idxvar_27"> <Assignment value="totalNumberServers[i]"/> </StateTransition> - <Schedule condition="i < totalNumberServers.length - 1" event="InitializeWorkcenter"> + <Schedule event="InitializeWorkcenter" condition="i < totalNumberServers.length - 1" priority="DEFAULT"> <EdgeParameter value="i+1"/> </Schedule> - <Coordinate x="120" y="0"/> + <Coordinate x="120.0" y="0.0"/> </Event> <Event name="Arrival"> <Argument name="i" type="int"/> - <LocalVariable name="_idxvar_47" type="int" value="i"> - <Comment>used internally</Comment> - </LocalVariable> - <StateTransition index="_idxvar_47" state="numberInQueue"> + <StateTransition state="numberInQueue" index="_idxvar_47"> <Assignment value="numberInQueue[i] + 1"/> </StateTransition> - <Schedule condition="getNumberAvailableServers(i) > 0" event="StartService"> + <Schedule event="StartService" condition="getNumberAvailableServers(i) > 0" priority="DEFAULT"> <EdgeParameter value="i"/> </Schedule> - <Coordinate x="0" y="180"/> + <Coordinate x="0.0" y="180.0"/> </Event> <Event name="StartService"> <Argument name="i" type="int"/> - <LocalVariable name="_idxvar_48" type="int" value="i"> - <Comment>used internally</Comment> - </LocalVariable> - <LocalVariable name="_idxvar_49" type="int" value="i"> - <Comment>used internally</Comment> - </LocalVariable> - <StateTransition index="_idxvar_48" state="numberInQueue"> + <StateTransition state="numberInQueue" index="_idxvar_48"> <Assignment value="numberInQueue[i] + 1"/> </StateTransition> - <StateTransition index="_idxvar_49" state="numberAvailableServers"> + <StateTransition state="numberAvailableServers" index="_idxvar_49"> <Assignment value="numberAvailableServers[i] - 1"/> </StateTransition> - <Schedule delay="serviceTime[i].generate()" event="EndService"> + <Schedule delay="serviceTime[i].generate()" event="EndService" priority="DEFAULT"> <EdgeParameter value="i"/> </Schedule> - <Coordinate x="160" y="100"/> + <Coordinate x="160.0" y="100.0"/> </Event> <Event name="EndService"> <Argument name="i" type="int"/> - <LocalVariable name="_idxvar_50" type="int" value="i"> - <Comment>used internally</Comment> - </LocalVariable> - <StateTransition index="_idxvar_50" state="numberAvailableServers"> + <StateTransition state="numberAvailableServers" index="_idxvar_50"> <Assignment value="numberAvailableServers[i]+1"/> </StateTransition> - <Schedule condition="getNumberInQueue(i) > 0" event="StartService"/> - <Schedule condition="i < totalNumberServers.length - 1" event="Arrival"/> - <Coordinate x="330" y="200"/> + <Schedule event="StartService" condition="getNumberInQueue(i) > 0" priority="DEFAULT"/> + <Schedule event="Arrival" condition="i < totalNumberServers.length - 1" priority="DEFAULT"/> + <Coordinate x="330.0" y="200.0"/> </Event> -</SimEntity> \ No newline at end of file +</SimEntity> diff --git a/viskit/lib/viskit.jar b/viskit/lib/viskit.jar index fa2bd59262e5771603440b823ff8f2d664e1c123..2cc557c93000b6ac9fde515e021b58c639abdf3f 100644 Binary files a/viskit/lib/viskit.jar and b/viskit/lib/viskit.jar differ