s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

2 ref/deref bugfixes from Joachim Klein. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9512 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 11 years ago
parent
cc8d3883f6
commit
835d4a9a45
1 changed files with 6 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      prism/src/prism/LTLModelChecker.java

7
prism/src/prism/LTLModelChecker.java
View File

@ -773,14 +773,15 @@ public class LTLModelChecker extends PrismComponent
} }
JDD.Ref(model.getTrans01()); JDD.Ref(model.getTrans01());
candidateStates = JDD.Apply(JDD.TIMES, model.getTrans01(), acceptanceVector_L_not);
JDD.Ref(acceptanceVector_L_not); JDD.Ref(acceptanceVector_L_not);
candidateStates = JDD.Apply(JDD.TIMES, model.getTrans01(), acceptanceVector_L_not);
acceptanceVector_L_not = JDD.PermuteVariables(acceptanceVector_L_not, draDDRowVars, draDDColVars); acceptanceVector_L_not = JDD.PermuteVariables(acceptanceVector_L_not, draDDRowVars, draDDColVars);
candidateStates = JDD.Apply(JDD.TIMES, candidateStates, acceptanceVector_L_not); candidateStates = JDD.Apply(JDD.TIMES, candidateStates, acceptanceVector_L_not);
candidateStates = JDD.ThereExists(candidateStates, model.getAllDDColVars()); candidateStates = JDD.ThereExists(candidateStates, model.getAllDDColVars());
candidateStates = JDD.ThereExists(candidateStates, model.getAllDDNondetVars()); candidateStates = JDD.ThereExists(candidateStates, model.getAllDDNondetVars());
// find all maximal end components // find all maximal end components
List<JDDNode> allecs = findMECStates(model, candidateStates, acceptanceVector_K); List<JDDNode> allecs = findMECStates(model, candidateStates, acceptanceVector_K);
JDD.Deref(acceptanceVector_K);
JDD.Deref(candidateStates); JDD.Deref(candidateStates);
for (i = 0; i < dra.getNumAcceptancePairs(); i++) { for (i = 0; i < dra.getNumAcceptancePairs(); i++) {
@ -796,9 +797,12 @@ public class LTLModelChecker extends PrismComponent
if (candidateStates.equals(ec)) { if (candidateStates.equals(ec)) {
//mainLog.println(" ------------- ec is not modified ------------- "); //mainLog.println(" ------------- ec is not modified ------------- ");
ecs = new Vector<JDDNode>(); ecs = new Vector<JDDNode>();
// store copy of ec in ecs
JDD.Ref(ec);
ecs.add(ec); ecs.add(ec);
} else if (candidateStates.equals(JDD.ZERO)) { } else if (candidateStates.equals(JDD.ZERO)) {
//mainLog.println(" ------------- ec is ZERO ------------- "); //mainLog.println(" ------------- ec is ZERO ------------- ");
JDD.Deref(candidateStates);
continue; continue;
} else { // recompute maximal end components } else { // recompute maximal end components
//mainLog.println(" ------------- ec is recomputed ------------- "); //mainLog.println(" ------------- ec is recomputed ------------- ");
@ -811,6 +815,7 @@ public class LTLModelChecker extends PrismComponent
candidateStates = JDD.ThereExists(newcandidateStates, model.getAllDDNondetVars()); candidateStates = JDD.ThereExists(newcandidateStates, model.getAllDDNondetVars());
ecs = findMECStates(model, candidateStates, acceptanceVector_K); ecs = findMECStates(model, candidateStates, acceptanceVector_K);
} }
JDD.Deref(candidateStates);
// find ECs in acceptingStates that are accepting under K_i // find ECs in acceptingStates that are accepting under K_i
acceptingStates = JDD.Constant(0); acceptingStates = JDD.Constant(0);

Write Preview
Loading…
Cancel
Save