Skip to content

Sequential as default behaviour when there is no rt annotation. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrielsr wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −29
Open

Sequential as default behaviour when there is no rt annotation. #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 21 additions & 29 deletions src/main/java/br/unb/cic/goda/rtgoretoprism/generator/goda/producer/PARAMProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,18 @@
import br.unb.cic.goda.rtgoretoprism.generator.CodeGenerationException;
import br.unb.cic.goda.rtgoretoprism.generator.goda.parser.CostParser;
import br.unb.cic.goda.rtgoretoprism.generator.goda.writer.ManageWriter;
import br.unb.cic.goda.rtgoretoprism.generator.goda.writer.ParamWriter;
import br.unb.cic.goda.rtgoretoprism.generator.kl.AgentDefinition;
import br.unb.cic.goda.rtgoretoprism.model.kl.Const;
import br.unb.cic.goda.rtgoretoprism.model.kl.GoalContainer;
import br.unb.cic.goda.rtgoretoprism.model.kl.PlanContainer;
import br.unb.cic.goda.rtgoretoprism.model.kl.RTContainer;
import br.unb.cic.goda.rtgoretoprism.paramformula.SymbolicParamGenerator;
import br.unb.cic.goda.rtgoretoprism.paramwrapper.ParamWrapper;

public class PARAMProducer {

private String sourceFolder;
private String targetFolder;
private String toolsFolder;
//private String toolsFolder;
private Set<Actor> allActors;
private Set<Goal> allGoals;
private AgentDefinition ad;
Expand Down Expand Up @@ -58,7 +56,7 @@ public PARAMProducer(Set<Actor> allActors, Set<Goal> allGoals, boolean isParam,

this.sourceFolder = in;
this.targetFolder = out;
this.toolsFolder = tools;
//this.toolsFolder = tools;
this.allActors = allActors;
this.allGoals = allGoals;
this.isParam = isParam;
Expand All @@ -68,7 +66,7 @@ public PARAMProducer(AgentDefinition ad, Set<Actor> selectedActors, Set<Goal> se
String targetFolder, String toolsFolder) {
this.sourceFolder = sourceFolder;
this.targetFolder = targetFolder;
this.toolsFolder = toolsFolder;
//this.toolsFolder = toolsFolder;
this.allActors = selectedActors;
this.allGoals = selectedGoals;
this.ad = ad;
Expand Down Expand Up @@ -258,18 +256,17 @@ private String composeNodeForm(RTContainer rootNode, boolean reliability) throws

if (reliability) {
// Create DTMC model (param)
ParamWriter writer = new ParamWriter(sourceFolder, nodeId);
String model = writer.writeModel();
//ParamWriter writer = new ParamWriter(sourceFolder, nodeId);
//String model = writer.writeModel();

// Call to param (reliability)
ParamWrapper paramWrapper = new ParamWrapper(toolsFolder, nodeId);
nodeForm = paramWrapper.getFormula(model);
if(nodeForm.length()> 0) {
nodeForm = nodeForm.replaceFirst("1\\*", "");
} else {
nodeForm = nodeId;
System.err.println("Formula for node " + nodeId + " was not resolved. Using nodeId");
}
//nodeForm = paramWrapper.getFormula(model);
//if(nodeForm.length()> 0) {
// nodeForm = nodeForm.replaceFirst("1\\*", "");
//} else {
// nodeForm = nodeId;
// System.err.println("Formula for node " + nodeId + " was not resolved. Using nodeId");
//}


this.varReliabilityInformation.put(nodeId, "//R_" + nodeId + " = reliability of node " + nodeId + "\n");
Expand All @@ -292,17 +289,17 @@ private String composeNodeForm(RTContainer rootNode, boolean reliability) throws

private String getNodeForm(Const decType, String rtAnnot, String nodeId, boolean reliability, RTContainer rootNode)
throws Exception {

if (rtAnnot == null) {
return nodeId;
}


StringBuilder formula = new StringBuilder();
SymbolicParamGenerator symbolic = new SymbolicParamGenerator();

if (rtAnnot.contains(";")) { // Sequential
String[] ids = getChildrenId(rootNode);

String[] ids = getChildrenId(rootNode);

if (ids == null) {
return nodeId;
}

if (rtAnnot == null || rtAnnot.contains(";")) { // Sequential

if (reliability) {
// Reliability formula
if (decType.equals(Const.AND) || decType.equals(Const.ME)) { // Sequential AND
Expand All @@ -321,7 +318,6 @@ private String getNodeForm(Const decType, String rtAnnot, String nodeId, boolean

return formula.toString();
} else if (rtAnnot.contains("#")) { // Parallel
String[] ids = getChildrenId(rootNode);

if (reliability) {
// Reliability formula
Expand All @@ -341,14 +337,12 @@ private String getNodeForm(Const decType, String rtAnnot, String nodeId, boolean

return formula.toString();
} else if (rtAnnot.contains("DM")) {
String[] ids = getChildrenId(rootNode);
if (reliability) {
formula = symbolic.getDMReliability(ids, this.ctxInformation);
} else {
formula = symbolic.getDMCost(ids, ctxInformation, this.isParam);
}
} else if (rtAnnot.contains("@")) {
String[] ids = getChildrenId(rootNode);
int retryNum = Integer.parseInt(rtAnnot.substring(rtAnnot.indexOf("@") + 1));

if (reliability) {
Expand All @@ -358,8 +352,6 @@ private String getNodeForm(Const decType, String rtAnnot, String nodeId, boolean
}
return formula.toString();
} else if (rtAnnot.contains("try")) {
String[] ids = getChildrenId(rootNode);

if(rtAnnot.contains("?skip:")) { //try(a)?b:skip
ids = new String[] {ids[0], "skip", ids[1]};
}else if(rtAnnot.contains(":skip")) {//try(a)?skip:b
Expand Down