Tidied up example code. Added more unit tests.

nmcl · nmcl · commit b60ff166a97a · 2013-06-01T15:08:15.000+01:00
diff --git a/src/examples/java/org/javasim/examples/basic/Arrivals.java b/src/examples/java/org/javasim/examples/basic/Arrivals.java
@@ -29,7 +29,6 @@
 
 public class Arrivals extends SimulationProcess
 {
-
     public Arrivals(double mean)
     {
         InterArrivalTime = new ExponentialStream(mean);
@@ -58,5 +57,4 @@ public void run ()
     }
 
     private ExponentialStream InterArrivalTime;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/basic/Breaks.java b/src/examples/java/org/javasim/examples/basic/Breaks.java
@@ -29,7 +29,6 @@
 
 public class Breaks extends SimulationProcess
 {
-
     public Breaks()
     {
         RepairTime = new UniformStream(10, 100);
@@ -83,5 +82,4 @@ public void run ()
     private UniformStream OperativeTime;
 
     private boolean interrupted_service;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/basic/Job.java b/src/examples/java/org/javasim/examples/basic/Job.java
@@ -26,7 +26,6 @@
 
 public class Job
 {
-
     public Job()
     {
         boolean empty = false;
@@ -63,5 +62,4 @@ public void finished ()
     private double ResponseTime;
 
     private double ArrivalTime;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/basic/Machine.java b/src/examples/java/org/javasim/examples/basic/Machine.java
@@ -29,7 +29,6 @@
 
 public class Machine extends SimulationProcess
 {
-
     public Machine(double mean)
     {
         STime = new ExponentialStream(mean);
@@ -128,5 +127,4 @@ public double serviceTime ()
     private boolean working;
 
     private Job J;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/basic/MachineShop.java b/src/examples/java/org/javasim/examples/basic/MachineShop.java
@@ -27,7 +27,6 @@
 
 public class MachineShop extends SimulationProcess
 {
-
     public MachineShop(boolean isBreaks)
     {
         useBreaks = isBreaks;
@@ -112,5 +111,4 @@ public void await ()
     public static double MachineFailedTime = 0.0;
 
     private boolean useBreaks;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/basic/Main.java b/src/examples/java/org/javasim/examples/basic/Main.java
@@ -22,7 +22,6 @@
 
 public class Main
 {
-
     public static void main (String[] args)
     {
         boolean isBreaks = false;
@@ -44,5 +43,4 @@ public static void main (String[] args)
 
         System.exit(0);
     }
-
 }
diff --git a/src/examples/java/org/javasim/examples/basic/Queue.java b/src/examples/java/org/javasim/examples/basic/Queue.java
@@ -24,7 +24,6 @@
 
 public class Queue
 {
-
     public Queue()
     {
         head = null;
@@ -86,14 +85,12 @@ public void enqueue (Job toadd)
     private List head;
 
     private long length;
-
-};
+}
 
 /* This is the queue on which Jobs are placed before they are used. */
 
 class List
 {
-
     public List()
     {
         work = null;
@@ -103,5 +100,4 @@ public List()
     public Job work;
 
     public List next;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/interrupt/Arrivals.java b/src/examples/java/org/javasim/examples/interrupt/Arrivals.java
@@ -29,7 +29,6 @@
 
 public class Arrivals extends SimulationProcess
 {
-
     public Arrivals(double mean)
     {
         InterArrivalTime = new ExponentialStream(mean);
@@ -58,5 +57,4 @@ public void run ()
     }
 
     private ExponentialStream InterArrivalTime;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/interrupt/Job.java b/src/examples/java/org/javasim/examples/interrupt/Job.java
@@ -22,13 +22,11 @@
 
 public class Job
 {
-
     public Job(boolean isSignal)
     {
         if (isSignal)
             MachineShop.SignalQ.enqueue(this);
         else
             MachineShop.JobQ.enqueue(this);
     }
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/interrupt/MachineShop.java b/src/examples/java/org/javasim/examples/interrupt/MachineShop.java
@@ -28,7 +28,6 @@
 
 public class MachineShop extends SimulationEntity
 {
-
     public MachineShop()
     {
     }
@@ -91,5 +90,4 @@ public void await ()
     public static double TotalResponseTime = 0.0;
 
     public static double MachineActiveTime = 0.0;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/interrupt/Main.java b/src/examples/java/org/javasim/examples/interrupt/Main.java
@@ -22,7 +22,6 @@
 
 public class Main
 {
-
     public static void main (String[] args)
     {
         MachineShop m = new MachineShop();
@@ -31,5 +30,4 @@ public static void main (String[] args)
 
         System.exit(0);
     }
-
 }
diff --git a/src/examples/java/org/javasim/examples/interrupt/Processor.java b/src/examples/java/org/javasim/examples/interrupt/Processor.java
@@ -29,7 +29,6 @@
 
 public class Processor extends SimulationEntity
 {
-
     public Processor(double mean)
     {
         sTime = new ExponentialStream(mean);
@@ -81,5 +80,4 @@ public void run ()
     }
 
     private ExponentialStream sTime;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/interrupt/Queue.java b/src/examples/java/org/javasim/examples/interrupt/Queue.java
@@ -24,7 +24,6 @@
 
 public class Queue
 {
-
     public Queue()
     {
         head = null;
@@ -86,14 +85,12 @@ public void enqueue (Job toadd)
     private List head;
 
     private long length;
-
-};
+}
 
 /* This is the queue on which Jobs are placed before they are used. */
 
 class List
 {
-
     public List()
     {
         work = null;
@@ -103,5 +100,4 @@ public List()
     public Job work;
 
     public List next;
-
-};
+}
diff --git a/src/examples/java/org/javasim/examples/interrupt/Signaller.java b/src/examples/java/org/javasim/examples/interrupt/Signaller.java
@@ -29,7 +29,6 @@
 
 public class Signaller extends SimulationEntity
 {
-
     public Signaller(double mean)
     {
         sTime = new ExponentialStream(mean);
@@ -58,5 +57,4 @@ public void run ()
     }
 
     private ExponentialStream sTime;
-
-};
+}
diff --git a/src/test/java/org/javasim/tests/internal/SimulationProcessUnitTest.java b/src/test/java/org/javasim/tests/internal/SimulationProcessUnitTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 1990-2008, Mark Little, University of Newcastle upon Tyne
+ * and others contributors as indicated 
+ * by the @authors tag. All rights reserved. 
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 1990-2008,
+ */
+
+package org.javasim.tests.internal;
+
+import org.javasim.RestartException;
+import org.javasim.SimulationException;
+import org.javasim.SimulationProcess;
+import org.javasim.streams.ExponentialStream;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+class Dummy extends SimulationProcess
+{
+    public Dummy (double mean)
+    {
+        InterArrivalTime = new ExponentialStream(mean);
+    }
+
+    public void run ()
+    {
+    }
+
+    private ExponentialStream InterArrivalTime;
+}
+
+public class SimulationProcessUnitTest
+{
+    @Test
+    public void test () throws Exception
+    {
+        Dummy proc = new Dummy(10.0);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@`
`29`	`29`
`30`	`30`	`public class Arrivals extends SimulationProcess`
`31`	`31`	`{`
`32`		`-`
`33`	`32`	`public Arrivals(double mean)`
`34`	`33`	`{`
`35`	`34`	`InterArrivalTime = new ExponentialStream(mean);`
`@@ -58,5 +57,4 @@ public void run ()`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`private ExponentialStream InterArrivalTime;`
`61`		`-`
`62`		`-};`
	`60`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`
`27`	`27`	`public class Job`
`28`	`28`	`{`
`29`		`-`
`30`	`29`	`public Job()`
`31`	`30`	`{`
`32`	`31`	`boolean empty = false;`
`@@ -63,5 +62,4 @@ public void finished ()`
`63`	`62`	`private double ResponseTime;`
`64`	`63`
`65`	`64`	`private double ArrivalTime;`
`66`		`-`
`67`		`-};`
	`65`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`
`28`	`28`	`public class MachineShop extends SimulationProcess`
`29`	`29`	`{`
`30`		`-`
`31`	`30`	`public MachineShop(boolean isBreaks)`
`32`	`31`	`{`
`33`	`32`	`useBreaks = isBreaks;`
`@@ -112,5 +111,4 @@ public void await ()`
`112`	`111`	`public static double MachineFailedTime = 0.0;`
`113`	`112`
`114`	`113`	`private boolean useBreaks;`
`115`		`-`
`116`		`-};`
	`114`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`
`23`	`23`	`public class Main`
`24`	`24`	`{`
`25`		`-`
`26`	`25`	`public static void main (String[] args)`
`27`	`26`	`{`
`28`	`27`	`boolean isBreaks = false;`
`@@ -44,5 +43,4 @@ public static void main (String[] args)`
`44`	`43`
`45`	`44`	`System.exit(0);`
`46`	`45`	`}`
`47`		`-`
`48`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`
`25`	`25`	`public class Queue`
`26`	`26`	`{`
`27`		`-`
`28`	`27`	`public Queue()`
`29`	`28`	`{`
`30`	`29`	`head = null;`
`@@ -86,14 +85,12 @@ public void enqueue (Job toadd)`
`86`	`85`	`private List head;`
`87`	`86`
`88`	`87`	`private long length;`
`89`		`-`
`90`		`-};`
	`88`	`+}`
`91`	`89`
`92`	`90`	`/* This is the queue on which Jobs are placed before they are used. */`
`93`	`91`
`94`	`92`	`class List`
`95`	`93`	`{`
`96`		`-`
`97`	`94`	`public List()`
`98`	`95`	`{`
`99`	`96`	`work = null;`
`@@ -103,5 +100,4 @@ public List()`
`103`	`100`	`public Job work;`
`104`	`101`
`105`	`102`	`public List next;`
`106`		`-`
`107`		`-};`
	`103`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,11 @@`
`22`	`22`
`23`	`23`	`public class Job`
`24`	`24`	`{`
`25`		`-`
`26`	`25`	`public Job(boolean isSignal)`
`27`	`26`	`{`
`28`	`27`	`if (isSignal)`
`29`	`28`	`MachineShop.SignalQ.enqueue(this);`
`30`	`29`	`else`
`31`	`30`	`MachineShop.JobQ.enqueue(this);`
`32`	`31`	`}`
`33`		`-`
`34`		`-};`
	`32`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`
`29`	`29`	`public class MachineShop extends SimulationEntity`
`30`	`30`	`{`
`31`		`-`
`32`	`31`	`public MachineShop()`
`33`	`32`	`{`
`34`	`33`	`}`
`@@ -91,5 +90,4 @@ public void await ()`
`91`	`90`	`public static double TotalResponseTime = 0.0;`
`92`	`91`
`93`	`92`	`public static double MachineActiveTime = 0.0;`
`94`		`-`
`95`		`-};`
	`93`	`+}`