Skip to content

Commit bc45533

Browse files
RIC-1073: TokenRing sample and cleanup of other samples
1 parent acdd4dd commit bc45533

33 files changed

Lines changed: 259 additions & 24 deletions

File tree

art-samples/DependencyInjection/top.art

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ capsule SlowPinger {
5050
`
5151
int count = 0;
5252
`
53-
subscribe behavior unwired port timing : Timing;
53+
behavior port timing : Timing;
5454
service behavior port p : PROTO;
5555
statemachine {
5656
state State1 {

art-samples/DependencyInjection/top.tcjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
let tc = TCF.define(TCF.CPP_TRANSFORM);
22
tc.topCapsule = 'Top';
3-
tc.targetFolder = 'dependency_injection';
3+
tc.targetFolder = 'DependencyInjection_target';
44
tc.commonPreface = `
55
#include <iostream>
66
`;

art-samples/DiningPhils/DiningPhils_v1/Fork.art renamed to art-samples/DiningPhilosophers/DiningPhils_v1/Fork.art

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ capsule Fork{
1414
`
1515
service behavior port leftP~: ForkProt;
1616
service behavior port rightP~: ForkProt;
17-
behavior port logP: Log;
17+
behavior port logP: Log;
1818
statemachine {
1919
state Down, Up;
2020
initial -> Down `

art-samples/DiningPhils/DiningPhils_v1/ForkProt.art renamed to art-samples/DiningPhilosophers/DiningPhils_v1/ForkProt.art

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
protocol ForkProt{
2-
1+
protocol ForkProt {
32
in ack();
43
out down();
54
in nack();
File renamed without changes.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
This version of Dining Philosophers uses
2+
3+
- fixed capsule parts with wired ports
4+
- enumeration types (PickUpStrategy)
5+
- random number generation
6+
- use of TargetRTS function `RTActor::getName()` to determine name of the capsule part that contains a capsule instance
7+
8+
Credit to [Queen's University](https://research.cs.queensu.ca/home/dingel/cisc844_F23/sampleModels/sampleModels.html) for the implementation.
9+
File renamed without changes.
File renamed without changes.
File renamed without changes.

art-samples/DiningPhils/DiningPhils_v2/ForkArgs.art renamed to art-samples/DiningPhilosophers/DiningPhils_v2/ForkArgs.art

File renamed without changes.

0 commit comments

Comments
 (0)