From e78e3f806c14b98d0df522d4b4e837c4b9933165 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Mon, 25 Nov 2024 12:22:16 -0600 Subject: [PATCH] FOLLOW_ARRIVALS.Start and End can overlap under some conditions --- doc/src/code_tables.m4 | 4 +++- doc/src/tables/follow_arrivals.m4 | 16 +++++++++++++--- include/global_constants.m4 | 5 +++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/doc/src/code_tables.m4 b/doc/src/code_tables.m4 index a178a68..e8640cb 100644 --- a/doc/src/code_tables.m4 +++ b/doc/src/code_tables.m4 @@ -334,7 +334,9 @@ FA_CERTAINTIES (Follow Arrival Certainties) Special Values `````````````` -None. +The value ``sdb_fa_identity_certain`` indicates that the observer(s) +are certain of the identity of an arriving individual. + Column Descriptions ``````````````````` diff --git a/doc/src/tables/follow_arrivals.m4 b/doc/src/tables/follow_arrivals.m4 index c6f2450..6cf35da 100644 --- a/doc/src/tables/follow_arrivals.m4 +++ b/doc/src/tables/follow_arrivals.m4 @@ -36,11 +36,21 @@ time is again observed, a situation which may occur multiple times, there is a FOLLOW_ARRIVALS row for each time period during which an individual is under observation. -The |FOLLOW_ARRIVALS.Start| time must be before the +The |FOLLOW_ARRIVALS.Start| time cannot be after the |FOLLOW_ARRIVALS.End| time. -When there is more than one FOLLOW_ARRIVALS row for a given individual, -a given |FOLLOW_ARRIVALS.AnimID|, the |FOLLOW_ARRIVALS.Start| and +The system will generate a warning when |FOLLOW_ARRIVALS.Start| is +equal to |FOLLOW_ARRIVALS.End|. + +When there is more than one FOLLOW_ARRIVALS row for a given individual +(for a given |FOLLOW_ARRIVALS.AnimID|), for a given follow (for a +given FOLLOW_ARRIVALS.\ |FOLLOW_ARRIVALS.FID|), and either of the +row's FOLLOW_ARRIVALS.\ |FOLLOW_ARRIVALS.Certainty| value is +``sdb_fa_identity_certain``, then the |FOLLOW_ARRIVALS.Start| and |FOLLOW_ARRIVALS.End| values cannot overlap, endpoints included. +The system will generate a warning when there is more than one +FOLLOW_ARRIVALS row for a given individual, for a given follow, and +the |FOLLOW_ARRIVALS.Start| of one row overlaps, endpoints +included, with the |FOLLOW_ARRIVALS.End| of the other row. The ``sdb_male_swelling`` |CYCLE_STATES|.\ |CYCLE_STATES.Code| is the only value that can be used in the |FOLLOW_ARRIVALS.Cycle| column diff --git a/include/global_constants.m4 b/include/global_constants.m4 index a4e6a21..9ce640b 100644 --- a/include/global_constants.m4 +++ b/include/global_constants.m4 @@ -99,5 +99,10 @@ define(`sdb_male_swelling', `n/a') dnl The Cycles value for adolescent females define(`sdb_adolescent_swelling', `U') +dnl +dnl The Certainty value for when certain of the identity of an arriving +dnl individual. +define(`sdb_fa_identity_certain', `1') + divert(`0')dnl Output with m4 again ]}])dnl End of ifdef over the whole file. -- 2.34.1