Skip to content

Commit

Permalink
Merge branch 'signs'
Browse files Browse the repository at this point in the history
  • Loading branch information
ClimbingAl committed Nov 14, 2023
2 parents 554329f + 3af6c82 commit e9b4e19
Show file tree
Hide file tree
Showing 20 changed files with 126 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/activity/activity.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This `activity` pattern is a very common one where two or more `individual` obje
--8<-- "activityTypesSupertypes.mermaid"

## Spacetime Diagram
The following diagram illustrates the activity of two states, each state being a `temporal_part_of` an `individual` X and Z respectively. The constituent states in this `activity` all share the same temporal bounds. This examples will be implemented below to illustrate the general entity-relationship and data patterns resulting from it.
The following diagram illustrates the activity of two states, each state being a `temporal_part_of` an `individual` X and Z respectively. The constituent states in this `activity` all share the same temporal bounds. This example will be implemented below to illustrate the general entity-relationship and data patterns resulting from it.

![An activity between a state of X and a state of Z](../extras/source-images/activityXZ.svg)

Expand Down
2 changes: 1 addition & 1 deletion docs/activity/activityEagle.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The Apollo-11 Mission involved a lot of activities, many of which are well docum
Online tool used to create the Apollo-11 Activity diagram is the [Apollo Protocol Activity Editor](https://apollo-protocol.github.io/4d-activity-editor/). The source data file originally exported from the Activity Editor is available [here](../extras/activity-editor/activity_diagram_state_of_apollo11_mission.ttl), in TURTLE format, and the same data read in to an instance of a [MagmaCoreService.java](https://github.com/gchq/MagmaCore/blob/main/core/src/main/java/uk/gov/gchq/magmacore/service/MagmaCoreService.java) and re-exported is available [here](../extras/example-files/activityEaglePattern.ttl). The rendering of each of those TURTLE files differs only in the ordering of the `individual` objects in the data files (the Activity Editor allows re-arranging the order of the `individual` objects in the UI using the "Sort individuals" button, the colour scheme can also be adjusted in "Settings").

## Spacetime Diagram
The following diagram illustrates the LM-5 lunar ascent activity, involving three participants being the LM-5 Ascent Module, Buzz Aldrin (as Lunar Module Pilot) and Neil Armstrong (as Apollo-11 Commander)(1). Each participant state being a `temporal_part_of` an `individual` that represents them as whole-life objects. The constituent states in this `activity` all share the same temporal bounds. This examples will be implemented below to illustrate the general entity-relationship and data patterns resulting from it.
The following diagram illustrates the LM-5 lunar ascent activity, involving three participants being the LM-5 Ascent Module, Buzz Aldrin (as Lunar Module Pilot) and Neil Armstrong (as Apollo-11 Commander)(1). Each participant state being a `temporal_part_of` an `individual` that represents them as whole-life objects. The constituent states in this `activity` all share the same temporal bounds. This example will be implemented below to illustrate the general entity-relationship and data patterns resulting from it.
{ .annotate }

1. The activity illustrated on this space-time diagram is taken directly from the Activity Editor diagram above. It can be identified in the data but is the 6th activity from the left (coloured purple).
Expand Down
2 changes: 1 addition & 1 deletion docs/association/association.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This `association` pattern is a very common one where two or more `individual` o
--8<-- "associationTypesSupertypes.mermaid"

## Spacetime Diagram
The following diagram illustrates the association of two states, each state being a `temporal_part_of` an `individual` X and Y respectively. The constituent states in this `association` all share the same temporal bounds. This examples will be implemented below to illustrate the general entity-relationship and data patterns resulting from it.
The following diagram illustrates the association of two states, each state being a `temporal_part_of` an `individual` X and Y respectively. The constituent states in this `association` all share the same temporal bounds. This example will be implemented below to illustrate the general entity-relationship and data patterns resulting from it.

![An association between a state of X and a state of Y](../extras/source-images/associationXY.svg)

Expand Down
2 changes: 1 addition & 1 deletion docs/association/associationEagleCrew.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ This `association` pattern involves one `functional_object` (in this example, th
--8<-- "associationEagleTypesSupertypes.mermaid"

## Spacetime Diagram
The following diagram illustrates the association of two states, each state being a `temporal_part_of` an `individual` X and Y respectively. The constituent states in this `association` all share the same temporal bounds. This examples will be implemented below to illustrate the general entity-relationship and data patterns resulting from it.
The following diagram illustrates the association of two states, each state being a `temporal_part_of` an `individual` X and Y respectively. The constituent states in this `association` all share the same temporal bounds. This example will be implemented below to illustrate the general entity-relationship and data patterns resulting from it.

![An association between *Eagle* and its crew during descent](../extras/source-images/associationBuzzInEagle.svg)

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/extras/source-images/LMSystem1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/extras/source-images/LMSystem2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/extras/source-images/LMSystem3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e9b4e19

Please sign in to comment.