Closed pfrater closed 7 years ago
Could we simplify the suitability helper functions a bit, I don't think we need three separate function to do roughly the same thing.
Sure, but the suitability line for the surveydistribution likelihood component is different as it doesn't contain a prey name at the beginning of the line. I reduced the number of helper functions down to only 2 for this reason (see pull request coming your way).
Are you still waiting on something for this pull request? (Sorry I may have re-submitted incorrectly such that notifications were not sent).
You can close this pull request and ignore it. I will make a new one with the changes we discussed.
I changed get.gadget.growth to have an option to specify a recruitment length parameter, and, if specified, uses the simple vonB function that is used when setting up init.normalparam or rec.normalparam, for example. If left unspecified then it will default to the old (regular) vonB function. Feel free to reject if you don't like the approach.
I also added helper functions to setup suitability in gadget_update whenever a suitability is needed (i.e. one for fleet, one for predators, and one for surveydistribution likelihood).
Lastly, added newexponentiall50 to
suitability
so that params can be read when this is specified.