Skip to content
Snippets Groups Projects
Commit 9e3188b1 authored by Terry D. Norbraten's avatar Terry D. Norbraten
Browse files

Merge origin/master

parents 9b050577 37b610ad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 221 additions and 7 deletions
assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/Assemblies/dis7/SimpleServerDis7Assembly.xml
+ 2
− 2
View file @ 9e3188b1
...@@ -38,5 +38,5 @@ ...@@ -38,5 +38,5 @@
<PropertyChangeListenerConnection property="numberServed" listener="numServedStat" source="simpleServer" description=""/> <PropertyChangeListenerConnection property="numberServed" listener="numServedStat" source="simpleServer" description=""/>
<Output entity="arrivalProcessOpenDis7"/> <Output entity="arrivalProcessOpenDis7"/>
<Output entity="simpleServer"/> <Output entity="simpleServer"/>
<Schedule stopTime="100000.0" verbose="false" saveReplicationData="false"/> <Schedule stopTime="100.0" verbose="false" saveReplicationData="false"/>
</SimkitAssembly> </SimkitAssembly>
\ No newline at end of file
assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/EventGraphs/dis7/ArrivalProcessOpenDis7.xml
+ 7
− 1
View file @ 9e3188b1
...@@ -48,9 +48,15 @@ if ((N % everyTen) == 0) { ...@@ -48,9 +48,15 @@ if ((N % everyTen) == 0) {
firePropertyChange("R", oldR, R+1); firePropertyChange("R", oldR, R+1);
} else { } else {
disChannel.addEntity(entityStatePdu_1.getEntityID()); disChannel.addEntity(entityStatePdu_1.getEntityID());
Random random = new Random();
int randX = random.nextInt(10);
int randY = random.nextInt(10);
entityStatePdu_1.getEntityLocation().setX(randX);
entityStatePdu_1.getEntityLocation().setY(randY);
System.out.println("New entity created at: "+randX+" "+randY);
firePropertyChange("C", oldC, C+1); firePropertyChange("C", oldC, C+1);
}</Code> }</Code>
<Coordinate x="270.0" y="50.0"/> <Coordinate x="280.0" y="60.0"/>
</Event> </Event>
<Code></Code> <Code></Code>
</SimEntity> </SimEntity>
assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/EventGraphs/dis7/SimpleServer.xml
+ 1
− 1
View file @ 9e3188b1
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<StateTransition state="numberAvailableServers"> <StateTransition state="numberAvailableServers">
<Assignment value="totalNumberServers"/> <Assignment value="totalNumberServers"/>
</StateTransition> </StateTransition>
<Coordinate x="20.0" y="30.0"/> <Coordinate x="30.0" y="20.0"/>
</Event> </Event>
<Event name="Arrival"> <Event name="Arrival">
<StateTransition state="numberInQueue"> <StateTransition state="numberInQueue">
......
assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/build/src/dis7/ArrivalProcessOpenDis7.java
+ 6
− 0
View file @ 9e3188b1
...@@ -75,6 +75,12 @@ public class ArrivalProcessOpenDis7 extends SimkitOpenDis7Examples.run.OpenDisHe ...@@ -75,6 +75,12 @@ public class ArrivalProcessOpenDis7 extends SimkitOpenDis7Examples.run.OpenDisHe
firePropertyChange("R", oldR, R+1); firePropertyChange("R", oldR, R+1);
} else { } else {
disChannel.addEntity(entityStatePdu_1.getEntityID()); disChannel.addEntity(entityStatePdu_1.getEntityID());
Random random = new Random();
int randX = random.nextInt(10);
int randY = random.nextInt(10);
entityStatePdu_1.getEntityLocation().setX(randX);
entityStatePdu_1.getEntityLocation().setY(randY);
System.out.println("New entity created at: "+randX+" "+randY);
firePropertyChange("C", oldC, C+1); firePropertyChange("C", oldC, C+1);
} }
/* End Code insertion */ /* End Code insertion */
......
assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/build/src/dis7/SimpleServerDis7Assembly.java
+ 1
− 1
View file @ 9e3188b1
...@@ -4,7 +4,7 @@ public class SimpleServerDis7Assembly extends viskit.assembly.ViskitAssembly { ...@@ -4,7 +4,7 @@ public class SimpleServerDis7Assembly extends viskit.assembly.ViskitAssembly {
public SimpleServerDis7Assembly() { public SimpleServerDis7Assembly() {
super(); super();
setStopTime(100000.0); setStopTime(100.0);
setVerbose(false); setVerbose(false);
setNumberReplications(1); setNumberReplications(1);
setPrintReplicationReports(true); setPrintReplicationReports(true);
......
assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/viskitProject.xml
+ 6
− 2
View file @ 9e3188b1
...@@ -10,9 +10,13 @@ ...@@ -10,9 +10,13 @@
<DistDirectory name="dist" /> <DistDirectory name="dist" />
<LibDirectory name="lib" /> <LibDirectory name="lib" />
<Project name="BavlsikViskitOpenDis7" /> <Project name="BavlsikViskitOpenDis7" />
<extraClassPaths>
<path value="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/lib/Networked_Graphics_MV3500_examples.jar" />
</extraClassPaths>
<Cached> <Cached>
<EventGraphs xml="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/EventGraphs/dis7/SimpleServer.xml" /> <EventGraphs xml="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/EventGraphs/dis7/ArrivalProcessOpenDis7.xml" />
<EventGraphs class="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/build/classes/dis7/SimpleServer.class" digest="-679a97428288e5d644ede38d9ac1dfaa" xml="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/EventGraphs/dis7/SimpleServer.xml" /> <EventGraphs class="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/build/classes/dis7/ArrivalProcessOpenDis7.class" />
<EventGraphs digest="113303b4ce28074ab6ce2e9dc7064d99" />
</Cached> </Cached>
</ViskitProject> </ViskitProject>
assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject.zip 0 → 100644
+ 0
− 0
View file @ 9e3188b1
File added
assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/Assemblies/examples/TestAssembly.xml 0 → 100644
+ 42
− 0
View file @ 9e3188b1
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<SimkitAssembly name="TestAssembly" version="1.0" package="examples" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/assembly.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SimEntity name="arrivalProcess" type="examples.ArrivalProcess" description="">
<FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
<TerminalParameter name="" value="Exponential" type="java.lang.String"/>
<TerminalParameter name="" value="1.6" type="double"/>
</FactoryParameter>
<Coordinate x="120.0" y="190.0"/>
</SimEntity>
<SimEntity name="twoTypeServer" type="examples.TwoTypeServer" description="">
<TerminalParameter name="numberServersA" value="1" type="int"/>
<TerminalParameter name="numberServersB" value="2" type="int"/>
<FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
<TerminalParameter name="" value="Exponential" type="java.lang.String"/>
<TerminalParameter name="" value="0.9" type="double"/>
</FactoryParameter>
<FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
<TerminalParameter name="" value="Exponential" type="java.lang.String"/>
<TerminalParameter name="" value="1.2" type="double"/>
</FactoryParameter>
<Coordinate x="360.0" y="190.0"/>
</SimEntity>
<PropertyChangeListener name="numAvailServerAStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
<TerminalParameter name="p[0] : " value="numberAvailableServersA" type="java.lang.String"/>
<Coordinate x="360.0" y="290.0"/>
</PropertyChangeListener>
<PropertyChangeListener name="queueStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
<TerminalParameter name="p[0] : " value="queue" type="java.lang.String"/>
<Coordinate x="510.0" y="190.0"/>
</PropertyChangeListener>
<PropertyChangeListener name="numAvailServerBStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
<TerminalParameter name="p[0] : " value="numberAvailableServersB" type="java.lang.String"/>
<Coordinate x="360.0" y="80.0"/>
</PropertyChangeListener>
<PropertyChangeListenerConnection property="numberAvailableServersA" listener="numAvailServerAStat" source="twoTypeServer" description=""/>
<PropertyChangeListenerConnection property="queue" listener="queueStat" source="twoTypeServer" description=""/>
<PropertyChangeListenerConnection property="numberAvailableServersB" listener="numAvailServerBStat" source="twoTypeServer" description=""/>
<Adapter name="adptr" eventHeard="Arrival" eventSent="Arrival" from="arrivalProcess" to="twoTypeServer" description=""/>
<Output entity="arrivalProcess"/>
<Output entity="twoTypeServer"/>
<Schedule stopTime="100.0" verbose="false" saveReplicationData="false"/>
</SimkitAssembly>
assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcess.xml 0 → 100644
+ 27
− 0
View file @ 9e3188b1
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<SimEntity name="ArrivalProcess" package="examples" version="1.0" author="advan" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameter name="interarrivalTime" type="simkit.random.RandomVariate">
<Comment></Comment>
</Parameter>
<StateVariable name="numberArrivals" type="int">
<Comment></Comment>
</StateVariable>
<Event name="Run" description="This event is fired first to facilitate initialization of all simulation state variables">
<Schedule delay="interarrivalTime.generate()" event="Arrival" priority="DEFAULT">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="30.0" y="60.0"/>
</Event>
<Event name="Arrival">
<Comment></Comment>
<StateTransition state="numberArrivals">
<Assignment value="numberArrivals + 1"/>
</StateTransition>
<Schedule delay="interarrivalTime.generate()" event="Arrival" priority="DEFAULT">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="230.0" y="60.0"/>
</Event>
</SimEntity>
assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcessTwo.xml 0 → 100644
+ 27
− 0
View file @ 9e3188b1
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<SimEntity name="ArrivalProcess" package="examples" version="1.0" author="advan" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameter name="interarrivalTime" type="simkit.random.RandomVariate">
<Comment></Comment>
</Parameter>
<StateVariable name="numberArrivals" type="int">
<Comment></Comment>
</StateVariable>
<Event name="Run" description="This event is fired first to facilitate initialization of all simulation state variables">
<Schedule delay="interarrivalTime.generate()" event="Arrival" priority="DEFAULT">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="30.0" y="60.0"/>
</Event>
<Event name="Arrival">
<Comment></Comment>
<StateTransition state="numberArrivals">
<Assignment value="numberArrivals + 1"/>
</StateTransition>
<Schedule delay="interarrivalTime.generate()" event="Arrival" priority="DEFAULT">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="230.0" y="60.0"/>
</Event>
</SimEntity>
assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/TwoTypeServer.xml 0 → 100644
+ 102
− 0
View file @ 9e3188b1
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<SimEntity name="TwoTypeServer" package="examples" version="1.0" author="advan" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameter name="numberServersA" type="int">
<Comment></Comment>
</Parameter>
<Parameter name="numberServersB" type="int">
<Comment></Comment>
</Parameter>
<Parameter name="serviceTimeA" type="simkit.random.RandomVariate">
<Comment></Comment>
</Parameter>
<Parameter name="serviceTimeB" type="simkit.random.RandomVariate">
<Comment></Comment>
</Parameter>
<StateVariable name="numberAvailableServersA" type="int">
<Comment></Comment>
</StateVariable>
<StateVariable name="numberAvailableServersB" type="int">
<Comment></Comment>
</StateVariable>
<StateVariable name="queue" type="int">
<Comment></Comment>
</StateVariable>
<Event name="Run" description="This event is fired first to facilitate initialization of all simulation state variables">
<Comment></Comment>
<StateTransition state="numberAvailableServersA">
<Assignment value="getNumberServersA()"/>
</StateTransition>
<StateTransition state="numberAvailableServersB">
<Assignment value="getNumberServersB()"/>
</StateTransition>
<StateTransition state="queue">
<Assignment value="0"/>
</StateTransition>
<Code></Code>
<Coordinate x="40.0" y="60.0"/>
</Event>
<Event name="Arrival">
<Comment></Comment>
<StateTransition state="queue">
<Assignment value="queue + 1"/>
</StateTransition>
<Schedule delay="0.0" event="StartServiceA" condition="getNumberAvailableServersA() &gt; 0" priority="DEFAULT">
<Comment></Comment>
</Schedule>
<Schedule delay="0.0" event="StartServiceB" condition="getNumberAvailableServersA() == 0 &amp;&amp; getNumberAvailableServersB() &gt; 0" priority="DEFAULT">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="40.0" y="180.0"/>
</Event>
<Event name="StartServiceA">
<Comment></Comment>
<StateTransition state="numberAvailableServersA">
<Assignment value="numberAvailableServersA - 1"/>
</StateTransition>
<StateTransition state="queue">
<Assignment value="queue - 1"/>
</StateTransition>
<Schedule delay="serviceTimeA.generate()" event="EndServiceA" priority="DEFAULT">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="180.0" y="100.0"/>
</Event>
<Event name="StartServiceB">
<Comment></Comment>
<StateTransition state="numberAvailableServersB">
<Assignment value="numberAvailableServersB - 1"/>
</StateTransition>
<StateTransition state="queue">
<Assignment value="queue - 1"/>
</StateTransition>
<Schedule delay="serviceTimeB.generate()" event="EndServiceB" priority="DEFAULT">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="180.0" y="260.0"/>
</Event>
<Event name="EndServiceA">
<Comment></Comment>
<StateTransition state="numberAvailableServersA">
<Assignment value="numberAvailableServersA + 1"/>
</StateTransition>
<Schedule delay="0.0" event="StartServiceA" condition="queue &gt; 0" priority="HIGH">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="350.0" y="100.0"/>
</Event>
<Event name="EndServiceB">
<Comment></Comment>
<StateTransition state="numberAvailableServersB">
<Assignment value="numberAvailableServersB + 1"/>
</StateTransition>
<Schedule delay="0.0" event="StartServiceB" condition="queue &gt; 0" priority="HIGH">
<Comment></Comment>
</Schedule>
<Code></Code>
<Coordinate x="350.0" y="260.0"/>
</Event>
</SimEntity>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment