From c924d10a91d90b52e12f2416dea14570cc7421df Mon Sep 17 00:00:00 2001
From: SebastianEbert <sebastian.ebert@tu-dresden.de>
Date: Thu, 3 Feb 2022 11:17:08 +0100
Subject: [PATCH] fixed printing bug
---
src/main/jastadd/clauses/expressions.jadd | 5 ++++-
src/main/java/de/tudresden/inf/st/pnml/Main.java | 12 ++++++------
src/main/nets/inputSignalNet.pnml | 2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/jastadd/clauses/expressions.jadd b/src/main/jastadd/clauses/expressions.jadd
index 9ca151c..964462f 100644
--- a/src/main/jastadd/clauses/expressions.jadd
+++ b/src/main/jastadd/clauses/expressions.jadd
@@ -9,7 +9,10 @@ aspect SignalExpressions {
eq Root.printExp() {
String result = "";
- result += getExp().printExp();
+
+ if(getExp() != null){
+ result+=getExp().printExp();
+ }
return result;
}
diff --git a/src/main/java/de/tudresden/inf/st/pnml/Main.java b/src/main/java/de/tudresden/inf/st/pnml/Main.java
index c159d56..f413496 100644
--- a/src/main/java/de/tudresden/inf/st/pnml/Main.java
+++ b/src/main/java/de/tudresden/inf/st/pnml/Main.java
@@ -19,13 +19,13 @@ public class Main {
String inputPath = (args.length > 0) ? args[0] : null;
- // if(inputPath == null){
- // logger.error("No model found on given input path.");
- // return;
- // }
+ if(inputPath == null){
+ logger.error("No model found on given input path.");
+ return;
+ }
- List<PetriNet> petriNets = PnmlParser.parsePnml("src/main/nets/inputSignalNet.pnml");
- // List<PetriNet> petriNets = PnmlParser.parsePnml(inputPath);
+ // List<PetriNet> petriNets = PnmlParser.parsePnml("src/main/nets/jointTestNet1.pnml");
+ List<PetriNet> petriNets = PnmlParser.parsePnml(inputPath);
List<List<PetriNet>> disconnectedPetriNets = new ArrayList<>();
// petriNets.forEach(pn -> disconnectedPetriNets.add(GlobalToLocalNetsPostProcessor.disconnectNets(pn)));
diff --git a/src/main/nets/inputSignalNet.pnml b/src/main/nets/inputSignalNet.pnml
index 63f1f2d..3d10649 100644
--- a/src/main/nets/inputSignalNet.pnml
+++ b/src/main/nets/inputSignalNet.pnml
@@ -54,7 +54,7 @@
<transition id="t1">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
- <!-- <location>channel</location>
+ <location>channel</location>
<subnet>channel</subnet>-->
<location>node-1</location>
<subnet>subnet-1</subnet>
--
GitLab