From 17bb80ef95297538d9401eb20fc3b860609336cb Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 14 May 2023 20:18:19 -0700
Subject: [PATCH] renames for correctness/clarity
---
.../run/RunSimpleServerOpenDis7.java | 9 +++++----
...RunTwoCranesBerthLog.txt => RunTwoCraneBerthsLog.txt} | 0
...BerthOpenDis7.java => RunTwoCraneBerthsOpenDis7.java} | 8 +++++---
...hOpenDis7Log.txt => RunTwoCraneBerthsOpenDis7Log.txt} | 0
...log => RunTwoCraneBerthsOpenDis7PduCaptureLog.dislog} | 0
5 files changed, 10 insertions(+), 7 deletions(-)
rename examples/src/SimkitOpenDis7Examples/run/{RunTwoCranesBerthLog.txt => RunTwoCraneBerthsLog.txt} (100%)
rename examples/src/SimkitOpenDis7Examples/run/{RunTwoCranesBerthOpenDis7.java => RunTwoCraneBerthsOpenDis7.java} (95%)
rename examples/src/SimkitOpenDis7Examples/run/{RunTwoCranesBerthOpenDis7Log.txt => RunTwoCraneBerthsOpenDis7Log.txt} (100%)
rename examples/src/SimkitOpenDis7Examples/run/{RunTwoCranesBerthOpenDis7PduCaptureLog.dislog => RunTwoCraneBerthsOpenDis7PduCaptureLog.dislog} (100%)
diff --git a/examples/src/SimkitOpenDis7Examples/run/RunSimpleServerOpenDis7.java b/examples/src/SimkitOpenDis7Examples/run/RunSimpleServerOpenDis7.java
index 5ac49ed437..067cf51b7f 100644
--- a/examples/src/SimkitOpenDis7Examples/run/RunSimpleServerOpenDis7.java
+++ b/examples/src/SimkitOpenDis7Examples/run/RunSimpleServerOpenDis7.java
@@ -1,7 +1,7 @@
package SimkitOpenDis7Examples.run;
import SimkitOpenDis7Examples.ArrivalProcessOpenDis7;
-import SimkitOpenDis7Examples.SimpleServer;
+import SimkitOpenDis7Examples.SimpleServerOpenDis7;
import simkit.Schedule;
import simkit.random.RandomVariate;
import simkit.random.RandomVariateFactory;
@@ -45,8 +45,9 @@ public class RunSimpleServerOpenDis7
* @see RunSimpleServer
* @param args the command line arguments
*/
- public static void main(String args[]) {
- String rvName = "Uniform";
+ public static void main(String args[])
+ {
+ String rvName = "Uniform"; // TODO is enumeration available?
double lower = 0.9;
double upper = 2.2;
RandomVariate interarrivalTimeGenerator = RandomVariateFactory.getInstance(rvName, lower, upper);
@@ -58,7 +59,7 @@ public class RunSimpleServerOpenDis7
RandomVariate serviceTimeGenerator = RandomVariateFactory.getInstance(rvName, alpha, beta);
int numServ = 2;
- SimpleServer server = new SimpleServer(numServ, serviceTimeGenerator);
+ SimpleServerOpenDis7 server = new SimpleServer(numServ, serviceTimeGenerator);
arrival.addSimEventListener(server);
SimplePropertyDumper simplePropertyDumper = new SimplePropertyDumper();
diff --git a/examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthLog.txt b/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsLog.txt
similarity index 100%
rename from examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthLog.txt
rename to examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsLog.txt
diff --git a/examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthOpenDis7.java b/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7.java
similarity index 95%
rename from examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthOpenDis7.java
rename to examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7.java
index 918a9515df..e579782fc3 100644
--- a/examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthOpenDis7.java
+++ b/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7.java
@@ -29,10 +29,10 @@ Average delay in queue: 0.4857
*
* @author abuss@nps.edu
*/
-public class RunTwoCranesBerthOpenDis7
+public class RunTwoCraneBerthsOpenDis7
{
/** Default constructor */
- public RunTwoCranesBerthOpenDis7()
+ public RunTwoCraneBerthsOpenDis7()
{
// default constructor
}
@@ -40,7 +40,8 @@ public class RunTwoCranesBerthOpenDis7
* Run a simple program and compute statistical measurement of results.
* @param args the command line arguments
*/
- public static void main(String[] args) {
+ public static void main(String[] args)
+ {
RandomVariate interarrivalTimeGenerator =
RandomVariateFactory.getInstance("Exponential", 0.7);
RandomVariate unloadingTimeGenerator =
@@ -49,6 +50,7 @@ public class RunTwoCranesBerthOpenDis7
new ShipArrivalProcess(interarrivalTimeGenerator,
unloadingTimeGenerator);
+ // can start debugging here
TwoCraneBerthsOpenDis7 twoCraneBerthsOpenDis7 = new TwoCraneBerthsOpenDis7();
shipArrivalProcess.addSimEventListener(twoCraneBerthsOpenDis7);
diff --git a/examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthOpenDis7Log.txt b/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7Log.txt
similarity index 100%
rename from examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthOpenDis7Log.txt
rename to examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7Log.txt
diff --git a/examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthOpenDis7PduCaptureLog.dislog b/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7PduCaptureLog.dislog
similarity index 100%
rename from examples/src/SimkitOpenDis7Examples/run/RunTwoCranesBerthOpenDis7PduCaptureLog.dislog
rename to examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7PduCaptureLog.dislog
--
GitLab