Previous changes to random number initialisation were causing debug log to be empty in GUi version (data written to output stream before it was assigned to a file)

Fixed bug causing wrong interpretation of mate-finding rule for SMS in batch mode; Fixed access violation if batch was run from GUI and SMS heat-maps were saved

Removed reference to random number functions of Agner Fog

Added missing trait names for SMS traits. Corrected bug in GUI genetics form when checking architecture file.

RangeShifter_v2.0_UserManual_v32a

Uploaded latest version of the manual I received from Steve.

"

This reverts commit 8a39735, reversing
changes made to 6792c16.

…ngeShifter2""

This reverts commit b3fcb67.

The facility to change the input SMS costs map is provided in batch mode only as part of the dynamic landscape feature; the costs may be changed simultaneously with other landscape changes or independently of them. For the GUI, there remains no option to change the cost map during the course of a simulation.

Pull changes from master

Merge R package code into RS code

Updated version v32b of draft user manual. Updated batch documentation to include use of 1/b as a proxy for carrying capacity in stage-structured models.

Corrected the function ParseParameterFile() to prevent occupancy output being selected if the landscape is artificial or if the number of replicates is 1

…folders

Replaced all occurrences of CLUSTER by LINUX_CLUSTER and single occurrence of #if !VCL by #if BATCH

This reverts commit 6a4aed8.

This reverts commit 5671f7f.

…S_random_seed

Removal of bug in RSrandom.cpp when Poisson function is called with a large mean. Removal of some unnecessary macro statements.

Correction to InitialisationFile.xlsx

Removed numerous instances of {} in stracture declarations, which prevent compiling in Embarcadero.
Also corrected an ancient logic error in Population::survival1(). It did not affect the functioning of the model, but under some circumstances could result in dead individuals remaining in the population when they should be removed.

Should not affect the standard version

An Individual's data held by the smsData pointer were not initialised correctly. This could lead to a floating-point error when there was no individual variation in SMS parameters but there was inidividual variation in settlement parameters.

…m 28 Nov 2020

…m 28 Nov 2020

Landscape generator was wrongly setting habitat K for a random continuous landscape.
Also, various changes have been made (especially castings from double to float) to reduce the number of warning messages produced by VS and Linus compilers.

Artificial landscape generator modified to prevent skewed distribution of cell values in fractal continuous landscapes - new recursive function implemented.
Computations of density etc. altered to avoid integer overflow if cell size is very large (e.g. 50000m) - all calculations now performed as float or double.

If an initial species distribution had been loaded, and then the user returned to the landscape form to load a different distribution, an access violation occurred. resolved by clearing the vector.

Error occurred when generating fractal continuous landscapes - all cells were created as suitable when proportion was less than one

Code amended to ensure that correct density-dependent settlement parameters are applied given whether or not settlement is stage- and/or sex-dependent

…152d9ce70'

git-subtree-dir: src/Common/RScore
git-subtree-mainline: 09f2602
git-subtree-split: 1d910c4

…struct

…694772309'

git-subtree-dir: src/Common/RScore
git-subtree-mainline: 5d8485d
git-subtree-split: 9ca419f

…21588c0a8'

git-subtree-dir: src/Common/RScore
git-subtree-mainline: 1bb150e
git-subtree-split: c13a147

git-subtree-dir: RScore
git-subtree-mainline: 9e2bccb
git-subtree-split: 9ca419f

…694772309'

git-subtree-dir: src/Common/RScore
git-subtree-mainline: bc7a84d
git-subtree-split: 9ca419f

Import changes from release not yet on master

…60a0b938a'

git-subtree-dir: src/Common/RScore
git-subtree-mainline: fcdc055
git-subtree-split: a1116ae

…d3c996ad7'

git-subtree-dir: src/Common/RScore
git-subtree-mainline: 01cac38
git-subtree-split: fc7038e