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

[Terry N.] cascade constructors

parent e6d3f160
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,8 @@ import simkit.random.RandomVariate; ...@@ -20,7 +20,8 @@ import simkit.random.RandomVariate;
*/ */
public class ArrivalProcessOpenDis7 extends SimEntityBase { public class ArrivalProcessOpenDis7 extends SimEntityBase {
private final DisChannel disChannel = new DisChannel(); /** Not a sim parameter */
private final DisChannel disChannel;
/** /**
* Generates interarrival times * Generates interarrival times
...@@ -31,16 +32,6 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase { ...@@ -31,16 +32,6 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
* State variable that counts the number of Arrival events * State variable that counts the number of Arrival events
*/ */
protected int numberArrivals; protected int numberArrivals;
/** Initialize channel setup for OpenDis7 and report a test PDU */
private void initializeDisChannel()
{
disChannel.setUpNetworkInterface();
disChannel.printlnTRACE ("disChannel.getNetworkAddress()=" + disChannel.getNetworkAddress() +
", getNetworkPort()=" + disChannel.getNetworkPort());
disChannel.sendCommentPdu(VariableRecordType.OTHER, "ArrivalProcessOpenDis7 initialized");
}
/** /**
* Instantiate an ArrivalProcess with the given interarrivalTimeGenerator * Instantiate an ArrivalProcess with the given interarrivalTimeGenerator
...@@ -49,8 +40,8 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase { ...@@ -49,8 +40,8 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
* times * times
*/ */
public ArrivalProcessOpenDis7(RandomVariate interarrivalTimeGenerator) { public ArrivalProcessOpenDis7(RandomVariate interarrivalTimeGenerator) {
this();
this.interarrivalTimeGenerator = interarrivalTimeGenerator; this.interarrivalTimeGenerator = interarrivalTimeGenerator;
initializeDisChannel();
} }
/** /**
...@@ -59,7 +50,7 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase { ...@@ -59,7 +50,7 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
* explicit call to its setter method. * explicit call to its setter method.
*/ */
public ArrivalProcessOpenDis7() { public ArrivalProcessOpenDis7() {
initializeDisChannel(); disChannel = new DisChannel();
} }
/** /**
...@@ -69,6 +60,7 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase { ...@@ -69,6 +60,7 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
public void reset() { public void reset() {
super.reset(); super.reset();
numberArrivals = 0; numberArrivals = 0;
initializeDisChannel();
} }
/** /**
...@@ -129,4 +121,14 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase { ...@@ -129,4 +121,14 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
public DisChannel getDisChannel() { public DisChannel getDisChannel() {
return disChannel; return disChannel;
} }
/** Initialize channel setup for OpenDis7 and report a test PDU */
private void initializeDisChannel()
{
disChannel.setUpNetworkInterface();
disChannel.printlnTRACE ("disChannel.getNetworkAddress()=" + disChannel.getNetworkAddress() +
", getNetworkPort()=" + disChannel.getNetworkPort());
disChannel.sendCommentPdu(VariableRecordType.OTHER, getClass().getName() + " initialized");
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment