From 98b513b1881a41d303f60ae43d7b92e25c1799d2 Mon Sep 17 00:00:00 2001
From: git <tdnorbra@nps.edu>
Date: Thu, 3 Oct 2024 12:41:33 -0700
Subject: [PATCH] [Terry N.] DIS demo proj. moved to assignments space
---
.../dis7/ArrivalProcessOpenDis7Assembly.xml | 29 ----------
.../dis7/SimpleServerDis7Assembly.xml | 42 --------------
.../dis7/ArrivalProcessOpenDis7.xml | 56 -------------------
.../EventGraphs/dis7/SimpleServer.xml | 46 ---------------
4 files changed, 173 deletions(-)
delete mode 100644 examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
delete mode 100644 examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
delete mode 100644 examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/ArrivalProcessOpenDis7.xml
delete mode 100644 examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/SimpleServer.xml
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
deleted file mode 100644
index 597e3466d1..0000000000
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimkitAssembly name="ArrivalProcessOpenDis7Assembly" version="1.0" package="dis7" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/assembly.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SimEntity name="aPOpenDis7" type="dis7.ArrivalProcessOpenDis7" description="">
- <TerminalParameter name="address" value="" type="java.lang.String"/>
- <TerminalParameter name="port" value="-1" type="int"/>
- <FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
- <TerminalParameter name="" value="Exponential" type="String"/>
- <TerminalParameter name="" value="1.7" type="Object..."/>
- </FactoryParameter>
- <Coordinate x="220.0" y="210.0"/>
- </SimEntity>
- <PropertyChangeListener name="numArrivalsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="N" type="java.lang.String"/>
- <Coordinate x="220.0" y="330.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numEntityCreationsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="C" type="java.lang.String"/>
- <Coordinate x="220.0" y="80.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numEntityRemovalsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="R" type="java.lang.String"/>
- <Coordinate x="380.0" y="210.0"/>
- </PropertyChangeListener>
- <PropertyChangeListenerConnection property="N" listener="numArrivalsStat" source="aPOpenDis7" description=""/>
- <PropertyChangeListenerConnection property="C" listener="numEntityCreationsStat" source="aPOpenDis7" description=""/>
- <PropertyChangeListenerConnection property="R" listener="numEntityRemovalsStat" source="aPOpenDis7" description=""/>
- <Output entity="aPOpenDis7"/>
- <Schedule stopTime="100.0" verbose="false" saveReplicationData="false"/>
-</SimkitAssembly>
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
deleted file mode 100644
index 5aac321ee5..0000000000
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimkitAssembly name="SimpleServerDis7Assembly" version="1.0" package="dis7" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/assembly.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SimEntity name="arrivalProcessOpenDis7" type="SimkitOpenDis7Examples.ArrivalProcessOpenDis7" description="">
- <FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
- <TerminalParameter name="" value="Uniform" type="String"/>
- <TerminalParameter name="" value="0.9, 2.2" type="Object..."/>
- </FactoryParameter>
- <Coordinate x="90.0" y="200.0"/>
- </SimEntity>
- <SimEntity name="simpleServer" type="SimkitOpenDis7Examples.SimpleServer" description="">
- <TerminalParameter name="p[0] : " value="1" type="int"/>
- <FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
- <TerminalParameter name="" value="Gamma" type="String"/>
- <TerminalParameter name="" value="1.7, 1.8" type="Object..."/>
- </FactoryParameter>
- <Coordinate x="310.0" y="200.0"/>
- </SimEntity>
- <PropertyChangeListener name="numInQueueStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="true" countStatistics="false" description="">
- <TerminalParameter name="p[0] : " value="numberInQueue" type="java.lang.String"/>
- <Coordinate x="310.0" y="80.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numAvailServersStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="true" countStatistics="false" description="">
- <TerminalParameter name="p[0] : " value="numberAvailableServers" type="java.lang.String"/>
- <Coordinate x="510.0" y="200.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numArrivalsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="numberArrivals" type="java.lang.String"/>
- <Coordinate x="90.0" y="80.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numServedStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="numberServed" type="java.lang.String"/>
- <Coordinate x="310.0" y="350.0"/>
- </PropertyChangeListener>
- <SimEventListenerConnection listener="simpleServer" source="arrivalProcessOpenDis7"/>
- <PropertyChangeListenerConnection property="numberInQueue" listener="numInQueueStat" source="simpleServer" description=""/>
- <PropertyChangeListenerConnection property="numberAvailableServers" listener="numAvailServersStat" source="simpleServer" description=""/>
- <PropertyChangeListenerConnection property="numberArrivals" listener="numArrivalsStat" source="arrivalProcessOpenDis7" description=""/>
- <PropertyChangeListenerConnection property="numberServed" listener="numServedStat" source="simpleServer" description=""/>
- <Output entity="arrivalProcessOpenDis7"/>
- <Output entity="simpleServer"/>
- <Schedule stopTime="100000.0" verbose="false" saveReplicationData="false"/>
-</SimkitAssembly>
diff --git a/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/ArrivalProcessOpenDis7.xml b/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/ArrivalProcessOpenDis7.xml
deleted file mode 100644
index f1dd2c6371..0000000000
--- a/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/ArrivalProcessOpenDis7.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimEntity name="ArrivalProcessOpenDis7" package="dis7" version="1.0" author="terry" extend="SimkitOpenDis7Examples.run.OpenDisHelper" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Parameter name="address" type="java.lang.String">
- <Comment>An other than default network address</Comment>
- </Parameter>
- <Parameter name="port" type="int">
- <Comment>An other than default network port</Comment>
- </Parameter>
- <Parameter name="tA" type="simkit.random.RandomVariate">
- <Comment>Inter arrival time</Comment>
- </Parameter>
- <StateVariable name="N" type="int">
- <Comment>Number of arrivals</Comment>
- </StateVariable>
- <StateVariable name="C" type="int">
- <Comment>Number of entity creations</Comment>
- </StateVariable>
- <StateVariable name="R" type="int">
- <Comment>Number of entity removals</Comment>
- </StateVariable>
- <Event name="Run" description="This event is fired first to facilitate initialization of all simulation state variables">
- <Comment>Initialize all state variables</Comment>
- <StateTransition state="N">
- <Assignment value="0"/>
- </StateTransition>
- <StateTransition state="C">
- <Assignment value="1"/>
- </StateTransition>
- <StateTransition state="R">
- <Assignment value="0"/>
- </StateTransition>
- <Schedule delay="tA.generate()" event="Arrival" priority="DEFAULT"/>
- <Code></Code>
- <Coordinate x="50.0" y="70.0"/>
- </Event>
- <Event name="Arrival">
- <Comment>Tallys the number of arrivals and schedules future arrival events with time tA</Comment>
- <StateTransition state="N">
- <Assignment value="N + 1"/>
- </StateTransition>
- <Schedule delay="tA.generate()" event="Arrival" priority="DEFAULT"/>
- <Code>int everyTen = 10;
-int oldC = C;
-int oldR = R;
-
-if ((N % everyTen) == 0) {
- disChannel.removeEntity(entityStatePdu_1.getEntityID());
- firePropertyChange("R", oldR, R+1);
-} else {
- disChannel.addEntity(entityStatePdu_1.getEntityID());
- firePropertyChange("C", oldC, C+1);
-}</Code>
- <Coordinate x="260.0" y="70.0"/>
- </Event>
- <Code></Code>
-</SimEntity>
diff --git a/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/SimpleServer.xml b/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/SimpleServer.xml
deleted file mode 100644
index 3af2241915..0000000000
--- a/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/SimpleServer.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimEntity name="SimpleServer" package="dis7" version="0.1" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Parameter name="serviceTime" type="simkit.random.RandomVariate"/>
- <Parameter name="totalNumberServers" type="int"/>
- <StateVariable name="numberInQueue" type="int"/>
- <StateVariable name="numberAvailableServers" type="int"/>
- <Event name="Run">
- <StateTransition state="numberInQueue">
- <Assignment value="0"/>
- </StateTransition>
- <StateTransition state="numberAvailableServers">
- <Assignment value="totalNumberServers"/>
- </StateTransition>
- <Coordinate x="20.0" y="30.0"/>
- </Event>
- <Event name="Arrival">
- <StateTransition state="numberInQueue">
- <Assignment value="numberInQueue + 1"/>
- </StateTransition>
- <Schedule delay="0.0" event="StartService" condition="numberAvailableServers > 0" priority="DEFAULT">
- <Comment></Comment>
- <EdgeParameter value="numberAvailableServers"/>
- </Schedule>
- <Coordinate x="20.0" y="130.0"/>
- </Event>
- <Event name="StartService">
- <Comment></Comment>
- <Argument name="arg_0" type="int"/>
- <StateTransition state="numberInQueue">
- <Assignment value="numberInQueue - 1"/>
- </StateTransition>
- <StateTransition state="numberAvailableServers">
- <Assignment value="numberAvailableServers - 1"/>
- </StateTransition>
- <Schedule delay="serviceTime.generate()" event="EndService" priority="DEFAULT"/>
- <Code>System.out.println("numberAvailableServers"+arg_0);</Code>
- <Coordinate x="160.0" y="130.0"/>
- </Event>
- <Event name="EndService">
- <StateTransition state="numberAvailableServers">
- <Assignment value="numberAvailableServers + 1"/>
- </StateTransition>
- <Schedule delay="0.0" event="StartService" condition="numberInQueue > 0" priority="HIGH"/>
- <Coordinate x="330.0" y="130.0"/>
- </Event>
-</SimEntity>
--
GitLab