Skip to content

Commit

Permalink
renamed the Composition Association to Ordering Association
Browse files Browse the repository at this point in the history
  • Loading branch information
@akollegger
akollegger committed Sep 30, 2024
1 parent 2ffca66 commit c30b2dd
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 81 deletions.
143 changes: 77 additions & 66 deletions gram-railroad.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,89 +200,100 @@ <h1><code>Pattern</code></h1>
</div>
<h1><code>PatternElement</code></h1>
<div>
<svg class="railroad-diagram" width="505" height="102" viewBox="0 0 505 102">
<svg class="railroad-diagram" width="525" height="102" viewBox="0 0 525 102">
<g transform="translate(.5 .5)">
<path d="M 20 31 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
<g>
<path d="M40 41h0"></path>
<path d="M464 41h0"></path>
<path d="M484 41h0"></path>
<path d="M40 41h20"></path>
<g>
<path d="M60 41h0"></path>
<path d="M444 41h0"></path>
<path d="M464 41h0"></path>
<g>
<path d="M60 41h0"></path>
<path d="M308 41h0"></path>
<path d="M328 41h0"></path>
<path d="M60 41a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path>
<g>
<path d="M80 21h208"></path>
<path d="M80 21h228"></path>
</g>
<path d="M288 21a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path>
<path d="M308 21a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path>
<path d="M60 41h20"></path>
<g>
<path d="M80 41h0"></path>
<path d="M288 41h0"></path>
<path d="M80 41h20"></path>
<path d="M308 41h0"></path>
<path d="M80 41h10"></path>
<g>
<path d="M100 41h0"></path>
<path d="M268 41h0"></path>
<path d="M100 41h10"></path>
<path d="M90 41h0"></path>
<path d="M298 41h0"></path>
<path d="M90 41h20"></path>
<g>
<path d="M110 41h0"></path>
<path d="M210 41h0"></path>
<rect x="110" y="30" width="100" height="22"></rect>
<text x="160" y="45">Annotation</text>
<path d="M278 41h0"></path>
<path d="M110 41h10"></path>
<g>
<path d="M120 41h0"></path>
<path d="M220 41h0"></path>
<rect x="120" y="30" width="100" height="22"></rect>
<text x="170" y="45">Annotation</text>
</g>
<path d="M210 41h10"></path>
<path d="M220 41h10"></path>
<path d="M230 41h10"></path>
<g>
<path d="M230 41h0"></path>
<path d="M258 41h0"></path>
<rect x="230" y="30" width="28" height="22"></rect>
<text x="244" y="45">&#95;</text>
</g>
<path d="M258 41h10"></path>
<path d="M240 41h0"></path>
<path d="M268 41h0"></path>
<rect x="240" y="30" width="28" height="22"></rect>
<text x="254" y="45">&#95;</text>
</g>
<path d="M268 41h20"></path>
<path d="M268 41h10"></path>
</g>
<path d="M288 41h20"></path>
<path d="M278 41h20"></path>
</g>
<path d="M298 41h10"></path>
<path d="M90 41a10 10 0 0 0 -10 10v0a10 10 0 0 0 10 10"></path>
<g>
<path d="M308 41h0"></path>
<path d="M444 41h0"></path>
<path d="M90 61h208"></path>
</g>
<path d="M298 61a10 10 0 0 0 10 -10v0a10 10 0 0 0 -10 -10"></path>
</g>
<path d="M308 41h20"></path>
</g>
<g>
<path d="M328 41h0"></path>
<path d="M424 41h0"></path>
<path d="M328 41h10"></path>
<path d="M464 41h0"></path>
<path d="M328 41h20"></path>
<g>
<path d="M348 41h0"></path>
<path d="M444 41h0"></path>
<path d="M348 41h10"></path>
<g>
<path d="M338 41h0"></path>
<path d="M414 41h0"></path>
<rect x="338" y="30" width="76" height="22"></rect>
<text x="376" y="45">Subject</text>
<path d="M358 41h0"></path>
<path d="M434 41h0"></path>
<rect x="358" y="30" width="76" height="22"></rect>
<text x="396" y="45">Subject</text>
</g>
<path d="M414 41h10"></path>
<path d="M434 41h10"></path>
</g>
<path d="M424 41h20"></path>
<path d="M308 41a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
<path d="M444 41h20"></path>
<path d="M328 41a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
<g>
<path d="M328 71h12"></path>
<path d="M412 71h12"></path>
<path d="M340 71h10"></path>
<path d="M348 71h12"></path>
<path d="M432 71h12"></path>
<path d="M360 71h10"></path>
<g>
<path d="M350 71h0"></path>
<path d="M402 71h0"></path>
<rect x="350" y="60" width="52" height="22"></rect>
<text x="376" y="75">Path</text>
<path d="M370 71h0"></path>
<path d="M422 71h0"></path>
<rect x="370" y="60" width="52" height="22"></rect>
<text x="396" y="75">Path</text>
</g>
<path d="M402 71h10"></path>
<path d="M422 71h10"></path>
</g>
<path d="M424 71a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
<path d="M444 71a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
</g>
</g>
<path d="M444 41h20"></path>
<path d="M464 41h20"></path>
</g>
<path d="M 464 41 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
<path d="M 484 41 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
</g>
</svg>

Expand Down Expand Up @@ -404,32 +415,32 @@ <h1><code>Association</code></h1>
<path d="M404 31h20"></path>
<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
<g>
<path d="M60 61h12"></path>
<path d="M392 61h12"></path>
<path d="M72 61h10"></path>
<path d="M60 61h24"></path>
<path d="M380 61h24"></path>
<path d="M84 61h10"></path>
<g>
<path d="M82 61h0"></path>
<path d="M190 61h0"></path>
<rect x="82" y="50" width="108" height="22"></rect>
<text x="136" y="65">Composition</text>
<path d="M94 61h0"></path>
<path d="M178 61h0"></path>
<rect x="94" y="50" width="84" height="22"></rect>
<text x="136" y="65">Ordering</text>
</g>
<path d="M190 61h10"></path>
<path d="M200 61h10"></path>
<path d="M178 61h10"></path>
<path d="M188 61h10"></path>
<g>
<path d="M210 61h0"></path>
<path d="M238 61h0"></path>
<rect x="210" y="50" width="28" height="22"></rect>
<text x="224" y="65">&#95;</text>
<path d="M198 61h0"></path>
<path d="M226 61h0"></path>
<rect x="198" y="50" width="28" height="22"></rect>
<text x="212" y="65">&#95;</text>
</g>
<path d="M238 61h10"></path>
<path d="M248 61h10"></path>
<path d="M226 61h10"></path>
<path d="M236 61h10"></path>
<g>
<path d="M258 61h0"></path>
<path d="M382 61h0"></path>
<rect x="258" y="50" width="124" height="22"></rect>
<text x="320" y="65">PairedMembers</text>
<path d="M246 61h0"></path>
<path d="M370 61h0"></path>
<rect x="246" y="50" width="124" height="22"></rect>
<text x="308" y="65">PairedMembers</text>
</g>
<path d="M382 61h10"></path>
<path d="M370 61h10"></path>
</g>
<path d="M404 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
</g>
Expand Down Expand Up @@ -721,7 +732,7 @@ <h1><code>Membership</code></h1>
</svg>

</div>
<h1><code>Composition</code></h1>
<h1><code>Ordering</code></h1>
<div>
<svg class="railroad-diagram" width="193" height="62" viewBox="0 0 193 62">
<g transform="translate(.5 .5)">
Expand Down
6 changes: 3 additions & 3 deletions gram.ne
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Gram -> Record:? (Pattern _):+

Pattern -> PatternElement (_ "," _ PatternElement):*

PatternElement -> (Annotation _):? (Subject | Path)
PatternElement -> (Annotation _):* (Subject | Path)

Subject -> "[" _ Attributes _ Association:? "]"

Association ->
Membership _ IndividualMembers
| Composition _ PairedMembers
| Ordering _ PairedMembers

IndividualMembers -> AssociationMember (_ "," _ AssociationMember):*

Expand All @@ -25,7 +25,7 @@ Reference -> Identity

Membership -> "|"

Composition -> "->"
Ordering -> "->"

Containment -> "^" _ Symbol _ "^"

Expand Down
62 changes: 51 additions & 11 deletions patterns.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,16 +348,16 @@ <h1><code>Path</code></h1>
</div>
<h1><code>Subject</code></h1>
<div>
<svg class="railroad-diagram" width="369" height="62" viewBox="0 0 369 62">
<svg class="railroad-diagram" width="609" height="92" viewBox="0 0 609 92">
<g transform="translate(.5 .5)">
<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
<g>
<path d="M40 31h0"></path>
<path d="M328 31h0"></path>
<path d="M568 31h0"></path>
<path d="M40 31h20"></path>
<g>
<path d="M60 31h0"></path>
<path d="M308 31h0"></path>
<path d="M548 31h0"></path>
<path d="M60 31h10"></path>
<g>
<path d="M70 31h0"></path>
Expand All @@ -374,18 +374,58 @@ <h1><code>Subject</code></h1>
<text x="184" y="35">Attributes</text>
</g>
<path d="M234 31h10"></path>
<path d="M244 31h10"></path>
<g>
<path d="M254 31h0"></path>
<path d="M298 31h0"></path>
<rect x="254" y="20" width="44" height="22" rx="10" ry="10"></rect>
<text x="276" y="35">"&#93;"</text>
<path d="M244 31h0"></path>
<path d="M356 31h0"></path>
<path d="M244 31h20"></path>
<g>
<path d="M264 31h4"></path>
<path d="M332 31h4"></path>
<path d="M268 31h10"></path>
<g>
<path d="M278 31h0"></path>
<path d="M322 31h0"></path>
<rect x="278" y="20" width="44" height="22" rx="10" ry="10"></rect>
<text x="300" y="35">"|"</text>
</g>
<path d="M298 31h10"></path>
<path d="M322 31h10"></path>
</g>
<path d="M308 31h20"></path>
<path d="M336 31h20"></path>
<path d="M244 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
<g>
<path d="M264 61h0"></path>
<path d="M336 61h0"></path>
<path d="M264 61h10"></path>
<g>
<path d="M274 61h0"></path>
<path d="M326 61h0"></path>
<rect x="274" y="50" width="52" height="22" rx="10" ry="10"></rect>
<text x="300" y="65">"->"</text>
</g>
<path d="M 328 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
<path d="M326 61h10"></path>
</g>
<path d="M336 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
</g>
<path d="M356 31h10"></path>
<g>
<path d="M366 31h0"></path>
<path d="M474 31h0"></path>
<rect x="366" y="20" width="108" height="22"></rect>
<text x="420" y="35">Association</text>
</g>
<path d="M474 31h10"></path>
<path d="M484 31h10"></path>
<g>
<path d="M494 31h0"></path>
<path d="M538 31h0"></path>
<rect x="494" y="20" width="44" height="22" rx="10" ry="10"></rect>
<text x="516" y="35">"&#93;"</text>
</g>
<path d="M538 31h10"></path>
</g>
<path d="M548 31h20"></path>
</g>
<path d="M 568 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
</g>
</svg>

Expand Down
2 changes: 1 addition & 1 deletion patterns.ne
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Arrow -> "-[" Attributes "]->"

Path -> Node | Relationship

Subject -> "[" Attributes "]"
Subject -> "[" Attributes ("|" | "->") Association "]"

0 comments on commit c30b2dd

Please sign in to comment.