diff --git a/AlgebraicDataflowArchitectureModel/src/algorithm/DerivingStorageResources.java b/AlgebraicDataflowArchitectureModel/src/algorithm/DerivingStorageResources.java index 062e93b..c3de0e1 100644 --- a/AlgebraicDataflowArchitectureModel/src/algorithm/DerivingStorageResources.java +++ b/AlgebraicDataflowArchitectureModel/src/algorithm/DerivingStorageResources.java @@ -6,18 +6,22 @@ import models.dataConstraintModel.ChannelGenerator; import models.dataConstraintModel.ChannelMember; import models.dataConstraintModel.DataConstraintModel; +import models.dataConstraintModel.IdentifierTemplate; import models.dataFlowModel.DataFlowModel; public class DerivingStorageResources { public void run(DataFlowModel model) { DataConstraintModel dcmodel = (DataConstraintModel) model; + for(IdentifierTemplate resource:dcmodel.getIdentifierTemplates()) { + resource.setResourceStateType(new Type("PULL","pull")); + } for (ChannelGenerator generator : dcmodel.getChannelGenerators()) { for (ChannelMember member : generator.getChannelMembers()) { Expression curexp = member.getStateTransition().getCurStateExpression(); Expression nextexp = member.getStateTransition().getNextStateExpression(); for (Position cuspos : curexp.getVariables().keySet()) { for (Position nextpos : nextexp.getVariables().keySet()) { - if (curexp.getVariables().get(cuspos) == nextexp.getVariables().get(nextpos)) { + if (curexp.getVariables().get(cuspos).getName().equals(nextexp.getVariables().get(nextpos).getName())) { member.getIdentifierTemplate().setResourceStateType(new Type("PUSH", "push")); } }