From e8b57ea849519faf7426a0afd25dabcd848ceb7d Mon Sep 17 00:00:00 2001
From: SebastianEbert <sebastian.ebert@tu-dresden.de>
Date: Fri, 29 Jul 2022 17:13:12 +0200
Subject: [PATCH] refactoring
---
.gitlab-ci.yml | 30 ---------------
src/main/jastadd/base/io/IoPN.jadd | 59 +-----------------------------
2 files changed, 1 insertion(+), 88 deletions(-)
delete mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index df50bd3..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-variables:
- GIT_SUBMODULE_STRATEGY: recursive
-
-stages:
- - build
- # - deploy
-
-before_script:
- - export GRADLE_USER_HOME=`pwd`/.gradle
-
-cache:
- paths:
- - .gradle/wrapper
- - .gradle/caches
-
-build:
- image: openjdk:11
- stage: build
- script:
- - ./gradlew --console=plain --no-daemon assemble jar
- artifacts:
- paths:
- - build/libs/*.jar
-
-#publish_dev:
- # image: openjdk:11
- # stage: deploy
- # script:
- # - "./gradlew setDevVersionForCI"
- # - "./gradlew publish"
diff --git a/src/main/jastadd/base/io/IoPN.jadd b/src/main/jastadd/base/io/IoPN.jadd
index 7c76a00..ca67333 100644
--- a/src/main/jastadd/base/io/IoPN.jadd
+++ b/src/main/jastadd/base/io/IoPN.jadd
@@ -6,16 +6,10 @@ aspect IoPnExtension{
eq Marking.getPetriNet().marking() = this;
- inh BalloonMarking OutputSignalPlace.balloonMarking();
-
- eq PetriNetDoc.getChild().balloonMarking() = null;
-
- eq BalloonMarking.getPetriNet().balloonMarking() = this;
+ eq OutputSignalPlace.getOutputSignalBinding().containingPlace() = this;
inh Place OutputSignalBinding.containingPlace();
- eq OutputSignalPlace.getOutputSignalBinding().containingPlace() = this;
-
eq Page.getObject().containingPlace() = null;
syn lazy JastAddList<InputSignalBinding> InputSignalTransition.getStaticInputSignalBindingList() {
@@ -39,57 +33,6 @@ aspect IoPnExtension{
return PnmlSignalParser.getInitialOutputSignalValueBySignalID(this.getToolspecificList(), id);
}
- // updates automatically based on dependencies to the corresponding place
- syn String OutputSignalBinding.outputSignalValue(){
-
- OutputSignalPlace osp = this.containingPlace().asOutputSignalPlace();
- BalloonMarking marking = osp.balloonMarking();
- BalloonMarkedPlace markedPlace = marking.resolveBalloonPlaceById(this.getPlaceID());
-
- JastAddList<EqualityOutputMapping> eomList = this.getEqualityOMListNoTransform();
- JastAddList<ThresholdOutputMapping> tomList = this.getThresholdOMListNoTransform();
- JastAddList<RangeOutputMapping> romList = this.getRangeOMListNoTransform();
-
- // eom
- int result = -1;
- for (EqualityOutputMapping eom : eomList) {
- if ((eom.getValue() == markedPlace.getNumBalloonMarking()) && result == -1) {
- result = eom.getResult();
- break;
- }
- }
-
- // tom
- // if (result > -1) {
- for (ThresholdOutputMapping tom : tomList) {
- if (tom.getValue() <= markedPlace.getNumBalloonMarking()) {
- result = tom.getResult();
- break;
- }
- }
- // }
-
- // rom
- // if (result > -1) {
- for (RangeOutputMapping rom : romList) {
- if ((rom.getLowerBound() <= markedPlace.getNumBalloonMarking()) && (rom.getUpperBound() >= markedPlace.getNumBalloonMarking())) {
- result = rom.getResult();
- break;
- }
- }
- // }
-
- // 0 (disabled Signal) is default
- if (result == -1) {
- result = 0;
- }
-
- String output = String.valueOf(result) + "-" + this.getOutputSignalID();
-
- return output;
- }
-
-
syn String OutputSignalBinding.getOutputSignalValueForDefaultMarking(){
OutputSignalPlace osp = this.containingPlace().asOutputSignalPlace();
--
GitLab