Skip to content

Commit cb0cd3f

Browse files
committed
ST6RI-520 Edited comments in SpatialFrames and SpatialItems.
1 parent 73822ea commit cb0cd3f

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

sysml.library/Domain Libraries/Geometry/SpatialItems.sysml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ package SpatialItems {
1414
private import ControlFunctions::forAll;
1515

1616
/**
17-
* A SpatialItem is an Item with a three dimensional spatial extent that also acts as a SpatialFrame of reference.
17+
* A SpatialItem is an Item with a three-dimensional spatial extent that also acts as a SpatialFrame of reference.
1818
*/
1919
item def SpatialItem :> SpatialFrame {
2020
item :>> self : SpatialItem;
2121

2222
/**
23-
* A local Clock to be used as the corresponding time reference within this SpatialItem
24-
* and any componentItems. By default this is the global defaultClock.
23+
* A local Clock to be used as the corresponding time reference within this SpatialItem.
24+
* By default this is the global defaultClock.
2525
*/
2626
item localClock : Clock[1] default Time::defaultClock;
2727

2828
/**
29-
* The VectorMeasurementReference to be used as the measurement reference for position and displacement
30-
* vector values relative to this SpatialItem.
29+
* The three-dimensional VectorMeasurementReference to be used as the measurement reference for position
30+
* and displacement vector values relative to this SpatialItem.
3131
*/
3232
attribute coordinateFrame : VectorMeasurementReference[1] default Cartesian3dSpatialCoordinateSystem() {
3333
attribute :>> dimensions = 3;
@@ -36,7 +36,7 @@ package SpatialItems {
3636
/**
3737
* The Point at the origin of the coordinateFrame of this SpatialItem.
3838
*/
39-
item originPoint : Point :> spaceShots;
39+
item originPoint : Point[1] :> spaceShots;
4040

4141
/**
4242
* The CurrentPositionOf the originPoint must always be a zero vector.
@@ -47,12 +47,14 @@ package SpatialItems {
4747
}
4848

4949
/**
50-
* A CompoundSpatialItem is a SpatialItem that is a union of a collection of component SpatialItems.
50+
* A CompoundSpatialItem is a SpatialItem that is a spacial union of a collection of component SpatialItems.
5151
*/
5252
item def CompoundSpatialItem :> SpatialItem {
5353

5454
/**
55-
* The composite SpatialItems that together make up this CompoundSpatialItem.
55+
* The composite SpatialItems that together make up this CompoundSpatialItem.
56+
* The coordinateFrames of the compositeItems are nested in the coordinateFrame of the CompoundSpatialItem,
57+
* and, by default, they have the same localClock as the CompoundSpacialItem.
5658
*/
5759
item componentItems : SpatialItem[0..*] ordered :> subitems {
5860
item nestedLocalClock :>> localClock default localClock;

sysml.library/Kernel Library/SpatialFrames.kerml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ package SpatialFrames {
2727

2828
/**
2929
* The PositionOf a Point relative to a SpatialFrame, at a specific time relative to a given
30-
* clock, as a positionVector that is a ThreeVectorValue.
30+
* Clock, as a positionVector that is a ThreeVectorValue.
3131
*/
3232
abstract function PositionOf {
3333
in point : Point[1];
@@ -46,7 +46,7 @@ package SpatialFrames {
4646

4747
/**
4848
* The result positionVector is equal to the PositionOf the Point spaceShot of the
49-
* frame that encloses the given point, at the current time.
49+
* frame that encloses the given point, at the given time.
5050
*/
5151
inv spacePositionConstraint {
5252
(frame.spaceShots as Point)->forAll{in p : Point;
@@ -70,8 +70,8 @@ package SpatialFrames {
7070

7171
/**
7272
* The DisplacementOf two Points relative to a SpatialFrame, at a specific time relative to a
73-
* given clock, is the displacementVector computed as the difference between the PositionOf the
74-
* first point and PositionOf the second point, relative to that SpatialFrame, at that time.
73+
* given Clock, is the displacementVector computed as the difference between the PositionOf the
74+
* first Point and PositionOf the second Point, relative to that SpatialFrame, at that time.
7575
*/
7676
function DisplacementOf {
7777
in point1 : Point[1];
@@ -94,8 +94,8 @@ package SpatialFrames {
9494
}
9595

9696
/**
97-
* The CurrentDisplacementOf two points relative to a SpatialFrame and Clock is the DisplacementOf
98-
* the Points realtive to the SpacialFrame at the currentTime of the Clock.
97+
* The CurrentDisplacementOf two Points relative to a SpatialFrame and Clock is the DisplacementOf
98+
* the Points relative to the SpacialFrame at the currentTime of the Clock.
9999
*/
100100
function CurrentDisplacementOf {
101101
in point1 : Point[1];
@@ -134,7 +134,7 @@ package SpatialFrames {
134134
}
135135

136136
/**
137-
* The DisplacementOf two points relative to a CartesianSpatialFrame is a CartesianThreeVectorValue.
137+
* The DisplacementOf two Points relative to a CartesianSpatialFrame is a CartesianThreeVectorValue.
138138
*/
139139
function CartesianDisplacementOf :> DisplacementOf {
140140
in point1 : Point[1];
@@ -146,7 +146,7 @@ package SpatialFrames {
146146
}
147147

148148
/**
149-
* The CurrentDisplacementOf two points relative to a CartesianSpatialFrame is a CartesianThreeVectorValue.
149+
* The CurrentDisplacementOf two Points relative to a CartesianSpatialFrame is a CartesianThreeVectorValue.
150150
*/
151151
function CartesianCurrentDisplacementOf :> CurrentDisplacementOf {
152152
in point1 : Point[1];

0 commit comments

Comments
 (0)