Browse Source

AcceptanceStreettDD: StreettPair -> StreettPairDD

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10449 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Joachim Klein 11 years ago
parent
commit
e59d93a530
  1. 14
      prism/src/acceptance/AcceptanceStreettDD.java

14
prism/src/acceptance/AcceptanceStreettDD.java

@ -46,7 +46,7 @@ import jdd.JDDVars;
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class AcceptanceStreettDD public class AcceptanceStreettDD
extends ArrayList<AcceptanceStreettDD.StreettPair>
extends ArrayList<AcceptanceStreettDD.StreettPairDD>
implements AcceptanceOmegaDD implements AcceptanceOmegaDD
{ {
@ -54,7 +54,7 @@ public class AcceptanceStreettDD
* A pair in a Streett acceptance condition, i.e., with * A pair in a Streett acceptance condition, i.e., with
* (G F "R") -> (G F "G") * (G F "R") -> (G F "G")
**/ **/
public static class StreettPair {
public static class StreettPairDD {
/** State set R */ /** State set R */
private JDDNode R; private JDDNode R;
@ -65,7 +65,7 @@ public class AcceptanceStreettDD
* Constructor with R and G state sets. * Constructor with R and G state sets.
* Becomes owner of the references of R and G. * Becomes owner of the references of R and G.
*/ */
public StreettPair(JDDNode R, JDDNode G)
public StreettPairDD(JDDNode R, JDDNode G)
{ {
this.R = R; this.R = R;
this.G = G; this.G = G;
@ -145,7 +145,7 @@ public class AcceptanceStreettDD
newG = JDD.SetVectorElement(newG, ddRowVars, i, 1.0); newG = JDD.SetVectorElement(newG, ddRowVars, i, 1.0);
} }
StreettPair newPair = new StreettPair(newR, newG);
StreettPairDD newPair = new StreettPairDD(newR, newG);
this.add(newPair); this.add(newPair);
} }
} }
@ -153,7 +153,7 @@ public class AcceptanceStreettDD
@Override @Override
public boolean isBSCCAccepting(JDDNode bscc_states) public boolean isBSCCAccepting(JDDNode bscc_states)
{ {
for (StreettPair pair : this) {
for (StreettPairDD pair : this) {
if (!pair.isBSCCAccepting(bscc_states)) { if (!pair.isBSCCAccepting(bscc_states)) {
return false; return false;
} }
@ -164,7 +164,7 @@ public class AcceptanceStreettDD
@Override @Override
public void clear() public void clear()
{ {
for (StreettPair pair : this) {
for (StreettPairDD pair : this) {
pair.clear(); pair.clear();
} }
super.clear(); super.clear();
@ -173,7 +173,7 @@ public class AcceptanceStreettDD
@Override @Override
public String toString() { public String toString() {
String result = ""; String result = "";
for (StreettPair pair : this) {
for (StreettPairDD pair : this) {
result += pair.toString(); result += pair.toString();
} }
return result; return result;

Loading…
Cancel
Save