Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
-->

<div align="center">

Material Flow Plugin for the PFDL
===========================

Expand Down Expand Up @@ -151,11 +151,11 @@ The example below builds upon the two _Locations_ which were defined through `go

```
TransportOrderStep loadGoodsPallet
Location: goodsPallet
Location goodsPallet
End

TransportOrderStep unloadGoodsPallet
Location: warehousePos1
Location warehousePos1
End

Task transportGoodsPallet
Expand Down Expand Up @@ -203,7 +203,7 @@ Task transportGoodsPallet
From loadGoodsPallet
To unloadGoodsPallet

Constraints: {"TransportStart" : "05 14 * * *", "TransportFinished" : "45 14 * * *"}
Constraints {"TransportStart" : "05 14 * * *", "TransportFinished" : "45 14 * * *"}
End

```
Expand Down Expand Up @@ -236,15 +236,15 @@ Location goodsPallet2
End

TransportOrderStep loadGoodsPallet
Location: goodsPallet
Location goodsPallet
End

TransportOrderStep loadgoodsPallet2
Location: goodsPallet2
Location goodsPallet2
End

TransportOrderStep unloadGoodsPallet
Location: warehousePos1
Location warehousePos1
End

Task transportGoodsPallet
Expand Down Expand Up @@ -278,7 +278,7 @@ Location parkingPos
End

MoveOrderStep moveToParkingPos
Location: parkingPos
Location parkingPos
End

Task transportGoodsPallet
Expand Down Expand Up @@ -309,7 +309,7 @@ As for the Move Order, an Action Order can only appear in a _Task_ if there was

```
ActionOrderStep loadAdditionalGood
Parameters: {"load": "pallet2"}
Parameters {"load": "pallet2"}
End

Task transportGoodsPallet
Expand All @@ -333,13 +333,13 @@ A _TransportOrderStep_ (TOS) is mainly described by a _Location_ (representation
```
TransportOrderStep {name}
# required
Location: {Instance_Location}
Location {Instance_Location}

# optional
Parameters: {json_object, expression}
StartedBy: {Rule(...), expression}
FinishedBy: {Rule(...), expression}
OnDone: {Task} # follow up task
Parameters {json_object, expression}
StartedBy {Rule(...), expression}
FinishedBy {Rule(...), expression}
OnDone {Task} # follow up task
End
```

Expand All @@ -351,13 +351,13 @@ Event mrLoaded
End

TransportOrderStep loadGoodsPallet
Location: goodsPallet
FinishedBy: mrLoaded.value
Location goodsPallet
FinishedBy mrLoaded.value
End

TransportOrderStep unloadGoodsPallet
Location: warehousePos1
Parameters: {"palletNumber" : 2}
Location warehousePos1
Parameters {"palletNumber" : 2}
End

Task transportgoodsPallet2
Expand All @@ -381,24 +381,24 @@ The _MoveOrderStep_ and _ActionOrderStep_ are defined similarly to the _Transpor
```
MoveOrderStep {name}
# required
Location: {Instance_Location}
Location {Instance_Location}

# optional
StartedBy: {Rule(...), expression}
FinishedBy: {Rule(...), expression}
OnDone: {Task} # follow up task
StartedBy {Rule(...), expression}
FinishedBy {Rule(...), expression}
OnDone {Task} # follow up task
End
```

```
ActionOrderStep {name}
# required
Parameters: {json_object, expression}
Parameters {json_object, expression}

# optional
StartedBy: {Rule(...), expression}
FinishedBy: {Rule(...), expression}
OnDone: {Task} # follow up task
StartedBy {Rule(...), expression}
FinishedBy {Rule(...), expression}
OnDone {Task} # follow up task
End
```

Expand Down Expand Up @@ -471,12 +471,12 @@ If you use the MF-Plugin for research, please include the following reference in
```plain
@INPROCEEDINGS{10710795,
author={Gödeke, Jana and Horstrup, Maximilian and Detzner, Peter},
booktitle={2024 IEEE 29th International Conference on Emerging Technologies and Factory Automation (ETFA)},
title={Towards a Unified Flow Description Language for CPPSs: An Example with Material Flows},
booktitle={2024 IEEE 29th International Conference on Emerging Technologies and Factory Automation (ETFA)},
title={Towards a Unified Flow Description Language for CPPSs: An Example with Material Flows},
year={2024},
volume={},
number={},
pages={1-8},
keywords={Concurrent computing;Production systems;DSL;Synchronization;Manufacturing automation;Domain specific languages;Convergence;Logistics;Cyber-Physical Production System;Domain-Specific Language},
doi={10.1109/ETFA61755.2024.10710795}}
```
```
2 changes: 1 addition & 1 deletion grammar/PFDLLexer.g4
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ STARTED_BY: 'StartedBy';
FINISHED_BY: 'FinishedBy';
LOCATION: 'Location';
EVENT: 'Event';
TIME: 'Time'
TIME: 'Time';