From 7f40eb94cf7b6618277e48b6f69491edce12f1bb Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Wed, 26 Apr 2023 06:28:51 -0700
Subject: [PATCH] move classes, attempt to fix Royer package
---
.../Royer2}/dockyard/ArrivalProcess.java | 2 +-
.../Royer2}/dockyard/PDUSpitter.java | 3 ++-
.../Royer2}/dockyard/Ship.java | 2 +-
.../Royer2}/dockyard/ShipArrivalProcess.java | 7 +++----
.../Royer2}/dockyard/StatsPackage.java | 3 +--
.../Royer2}/dockyard/TwoCranesBerth.java | 3 +--
.../Royer2}/dockyard/run/RunTwoCranesBerth.java | 14 +++++++-------
7 files changed, 16 insertions(+), 18 deletions(-)
rename assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/{ => MV3500Cohort2022MayJune/Royer2}/dockyard/ArrivalProcess.java (98%)
rename assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/{ => MV3500Cohort2022MayJune/Royer2}/dockyard/PDUSpitter.java (98%)
rename assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/{ => MV3500Cohort2022MayJune/Royer2}/dockyard/Ship.java (97%)
rename assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/{ => MV3500Cohort2022MayJune/Royer2}/dockyard/ShipArrivalProcess.java (94%)
rename assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/{ => MV3500Cohort2022MayJune/Royer2}/dockyard/StatsPackage.java (98%)
rename assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/{ => MV3500Cohort2022MayJune/Royer2}/dockyard/TwoCranesBerth.java (99%)
rename assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/{ => MV3500Cohort2022MayJune/Royer2}/dockyard/run/RunTwoCranesBerth.java (90%)
diff --git a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/ArrivalProcess.java b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/ArrivalProcess.java
similarity index 98%
rename from assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/ArrivalProcess.java
rename to assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/ArrivalProcess.java
index 176df67767..e1b706c2c9 100644
--- a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/ArrivalProcess.java
+++ b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/ArrivalProcess.java
@@ -1,4 +1,4 @@
-package dockyard;
+package MV3500Cohort2022MayJune.Royer2.dockyard;
import simkit.random.RandomVariate;
diff --git a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/PDUSpitter.java b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/PDUSpitter.java
similarity index 98%
rename from assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/PDUSpitter.java
rename to assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/PDUSpitter.java
index cb9cf4dc00..fd26a0f394 100644
--- a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/PDUSpitter.java
+++ b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/PDUSpitter.java
@@ -3,7 +3,8 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
-package dockyard;
+package MV3500Cohort2022MayJune.Royer2.dockyard;
+
import edu.nps.moves.dis7.enumerations.PlatformDomain;
import edu.nps.moves.dis7.enumerations.VariableRecordType;
import edu.nps.moves.dis7.pdus.*;
diff --git a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/Ship.java b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/Ship.java
similarity index 97%
rename from assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/Ship.java
rename to assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/Ship.java
index 7cb3d54e83..6a3fcf576d 100644
--- a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/Ship.java
+++ b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/Ship.java
@@ -1,4 +1,4 @@
-package dockyard;
+package MV3500Cohort2022MayJune.Royer2.dockyard;
/**
* Class representing a ship for Computer Assignment 5
diff --git a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/ShipArrivalProcess.java b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/ShipArrivalProcess.java
similarity index 94%
rename from assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/ShipArrivalProcess.java
rename to assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/ShipArrivalProcess.java
index 8fb0cfb403..12853e71b1 100644
--- a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/ShipArrivalProcess.java
+++ b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/ShipArrivalProcess.java
@@ -3,17 +3,16 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
-package dockyard;
+package MV3500Cohort2022MayJune.Royer2.dockyard;
+import simkit.examples.ArrivalProcess;
import simkit.random.RandomVariate;
-import dockyard.ArrivalProcess;
-import dockyard.Ship;
/**
* Dockyard project
* @author Nicholas Royer
*/
-public class ShipArrivalProcess extends dockyard.ArrivalProcess {
+public class ShipArrivalProcess extends ArrivalProcess {
protected RandomVariate unloadTimeGenerator = null;
diff --git a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/StatsPackage.java b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/StatsPackage.java
similarity index 98%
rename from assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/StatsPackage.java
rename to assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/StatsPackage.java
index d4be0e4fda..55866cfb5f 100644
--- a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/StatsPackage.java
+++ b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/StatsPackage.java
@@ -3,11 +3,10 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
-package dockyard;
+package MV3500Cohort2022MayJune.Royer2.dockyard;
import java.util.HashMap;
import java.util.Set;
-import simkit.stat.AbstractSimpleStats;
import simkit.stat.MultipleSimpleStatsTally;
import simkit.stat.MultipleSimpleStatsTimeVarying;
import simkit.stat.SimpleStatsTimeVarying;
diff --git a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/TwoCranesBerth.java b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/TwoCranesBerth.java
similarity index 99%
rename from assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/TwoCranesBerth.java
rename to assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/TwoCranesBerth.java
index 908a748a7b..8ef15d2e51 100644
--- a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/TwoCranesBerth.java
+++ b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/TwoCranesBerth.java
@@ -3,9 +3,8 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
-package dockyard;
+package MV3500Cohort2022MayJune.Royer2.dockyard;
-import java.util.Queue;
import java.util.SortedSet;
import java.util.TreeSet;
diff --git a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/run/RunTwoCranesBerth.java b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/run/RunTwoCranesBerth.java
similarity index 90%
rename from assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/run/RunTwoCranesBerth.java
rename to assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/run/RunTwoCranesBerth.java
index 39e4ee9391..417c7d6211 100644
--- a/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/dockyard/run/RunTwoCranesBerth.java
+++ b/assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/src/MV3500Cohort2022MayJune/Royer2/dockyard/run/RunTwoCranesBerth.java
@@ -1,9 +1,9 @@
-package dockyard.run;
+package MV3500Cohort2022MayJune.Royer2.dockyard.run;
-import dockyard.StatsPackage;
-import dockyard.PDUSpitter;
-import dockyard.ShipArrivalProcess;
-import dockyard.TwoCranesBerth;
+import StatsPackage;
+import PDUSpitter;
+import ShipArrivalProcess;
+import TwoCranesBerth;
/**
* Run the simulation
@@ -64,8 +64,8 @@ public class RunTwoCranesBerth {
simkit.Schedule.getSimTime(),
sap.getNumArrivals(),
- dockyard.getNumShipsUnloaded(),
- dockyard.getMaxNumShipsInQueue(),
+ getNumShipsUnloaded(),
+ getMaxNumShipsInQueue(),
stats.getMean("numShipsInQueue"),
stats.getMean("numFullBerths"),
stats.getMean("timeInSystem"),
--
GitLab