diff --git a/src/main/jastadd/clauses/expressions.jadd b/src/main/jastadd/clauses/expressions.jadd index 9ca151c061bda63de53da1749fc57ae36f52e50f..964462ff302f77c80a8c72da3c217eb996257f07 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 c159d5637a88f50eeec52827ec87d272334d80a7..f41349646878bcfbf5416bebfce1713815aca585 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 63f1f2df5e630bf7f0dec6a8c621b7a6b730f10d..3d10649fe2b20f135659adef181a37d2e64a47d7 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>