refactoring

.gitlab-ci.yml

-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"

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();