diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ChannelMember.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ChannelMember.java index 9cf0280..370c3f7 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ChannelMember.java +++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ChannelMember.java @@ -41,11 +41,11 @@ @Override public String toString() { if (stateTransition.getNextStateExpression() == null) { - return resourcePath.getLeafResourceName() + "(" + return resourcePath.toString() + "(" + stateTransition.getCurStateExpression() + "," + stateTransition.getMessageExpression() + ")"; } - return resourcePath.getLeafResourceName() + "(" + return resourcePath.toString() + "(" + stateTransition.getCurStateExpression() + "," + stateTransition.getMessageExpression() + ")" + " = " + stateTransition.getNextStateExpression(); diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java index 4482a27..d699e14 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java +++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java @@ -986,7 +986,7 @@ for (ResourceHierarchy resource: resourceHierarchies.values()) { String initializer = resource.getInitText(); if (initializer != null) { - init += initializer; + init += resource.toString() + " := " + initializer + "\n"; } } if (init.length() > 0) { diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java index 85994f2..9fe7c44 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java +++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java @@ -156,14 +156,14 @@ public String toString() { if (symbol.equals(DataConstraintModel.dotParam)) { - return children.get(0).toString() + symbol.toString() + "{" + children.get(1).toString() + "}"; + return children.get(0).toString() + symbol.toString() + children.get(1).toString(); } return super.toString(); } public String toImplementation(String[] sideEffects) { if (symbol.equals(DataConstraintModel.dotParam)) { - return children.get(0).toImplementation(sideEffects) + symbol.toImplementation() + "{" + children.get(1).toImplementation(sideEffects) + "}"; + return children.get(0).toImplementation(sideEffects) + "." + symbol.toImplementation() + "(" + children.get(1).toImplementation(sideEffects) + ")"; } return super.toImplementation(sideEffects); } diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java b/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java index e93c937..46bf393 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java +++ b/AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataTransferChannel.java @@ -21,6 +21,7 @@ import models.dataConstraintModel.Channel; import models.dataConstraintModel.ChannelMember; import models.dataConstraintModel.ResourcePath; +import models.dataConstraintModel.Selector; public class DataTransferChannel extends Channel { protected Set inputChannelMembers = null; @@ -612,7 +613,21 @@ @Override public String toString() { - String channelSource = "channel " + getChannelName() + " {\n"; + String channelSource = ""; + if (isNative()) { + channelSource += "native "; + } + channelSource += "channel " + getChannelName(); + if (getSelectors().size() > 0) { + channelSource += "("; + String delimitor = ""; + for (Selector selector: getSelectors()) { + channelSource += delimitor + selector.getExpression().toString(); + delimitor = ", "; + } + channelSource += ")"; + } + channelSource += " {\n"; for (ChannelMember inputMember: inputChannelMembers) { channelSource += "\t in " + inputMember + "\n"; }