Merge branch 'master' of https://github.com/nmcl/JavaSim

nmcl · nmcl · commit 05ce66e76ba8 · 2020-08-02T16:49:26.000+01:00
diff --git a/README.md b/README.md
@@ -9,12 +9,10 @@ The system also comes with complete examples and tests which illustrate many of
 
 Over the years C++SIM and JavaSim have been used by many commercial and academic organisations.
 
-Prior to 2007 both C++SIM and JavaSim were freely available in source and binary from Newcastle University, under the University's own licence. However, in late 2007 Newcastle University decided that everything could be released into open source under LGPL.
+Prior to 2007 both C++SIM and JavaSim were freely available in source and binary from Newcastle University, under the University's own licence. However, in late 2007 Newcastle University decided that everything could be released into open source under LGPL. In 2015 the code was moved from Codehaus to github. All JIRAs from there were also recreated as github issues.
 
 You can find details of the releases in the https://github.com/nmcl/JavaSim/releases section as well as binary downloads for some releases.
 
-In 2015 the code was moved from Codehaus to github. All JIRAs from there were also recreated as github issues.
-
 ----
 
 To build:
@@ -29,4 +27,4 @@ Run tests and create installation:
 
 mvn install
 
-Run examples check the README in that directory.
+To run the examples check the README in that directory.
diff --git a/docs/manual.adoc b/docs/manual.adoc
@@ -12,7 +12,7 @@ These requirements were realised in the following design decisions:
 
 - the discrete-event process based simulation facilities provided by SIMULA and its simulation classes and libraries have a considerable experience and user community which have found them to be successful for a wide variety of simulations. In later versions of the system additional simulation classes were added which provide extra functionality.
 
-- inheritance was to be used throughout the design to even a greater extent than is already provided in SIMULA. This enables JavaSim to be more flexible and extensible, allowing new functionality to be added without affecting the overall system structure. For example, our I/O facilities, random number generators and probability distribution functions are entirely object-oriented, relying on inheritance to specialise their behaviour.
+- inheritance was to be used throughout the design to an even greater extent than is already provided in SIMULA. This enables JavaSim to be more flexible and extensible, allowing new functionality to be added without affecting the overall system structure. For example, our I/O facilities, random number generators and probability distribution functions are entirely object-oriented, relying on inheritance to specialise their behaviour.
 
 NOTE: It is not necessary for the reader to know anything about the SIMULA programming language or its simulation classes, but such knowledge would aid in the understanding of the concepts and classes presented within.
 
@@ -36,7 +36,7 @@ Thus, the first step towards building a simulation model of a system is to deter
 
 === Terminology
 
-The system components chosen for the simulation are termed simulation entities. Associated with each _entity_ in the simulation are zero or more _attributes_ that describe the state of the entity and which may vary during the course of the simulation. The interaction of entities and the changes they cause in the system state are termed _events_.
+The system components chosen for the simulation are termed _simulation entities_. Associated with each _entity_ in the simulation are zero or more _attributes_ that describe the state of the entity and which may vary during the course of the simulation. The interaction of entities and the changes they cause in the system state are termed _events_.
 
 The collection of these component attributes at any given time _t_ defines the system state at _t_. In general, the system state can take any of a variety of values, and a given simulation run results in one realisation of a set of these values (the _operation path_) over the _observation period_.
 
diff --git a/examples/README.md b/examples/README.md
@@ -1,4 +1,4 @@
-To build the examples:
+To build the examples first ensure that the main source tree has been built using 'mvn install'. Then here:
 
 mvn compile
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-To build the examples:`
	`1`	`+To build the examples first ensure that the main source tree has been built using 'mvn install'. Then here:`
`2`	`2`
`3`	`3`	`mvn compile`
`4`	`4`