Commit a7c6cc82 authored by Jonathan Shahen's avatar Jonathan Shahen

Correcting small error where I accidentally added rules from one CanBlock to another

parent d7a2d4ac
......@@ -162,7 +162,8 @@ public class ConvertToNuSMV extends ConvertTo {
tmp.addTimeslot(rts._time);
}
ArrayList<Rule> allRules = m.canAssign.getRules();
ArrayList<Rule> allRules = new ArrayList<>(m.canAssign.numberOfRules() + m.canRevoke.numberOfRules());
allRules.addAll(m.canAssign.getRules());
allRules.addAll(m.canRevoke.getRules());
for (Rule r : allRules) {
......@@ -196,7 +197,8 @@ public class ConvertToNuSMV extends ConvertTo {
tmp.addTimeslot(rts._time);
}
ArrayList<Rule> allRules = m.canEnable.getRules();
ArrayList<Rule> allRules = new ArrayList<>(m.canEnable.numberOfRules() + m.canDisable.numberOfRules());
allRules.addAll(m.canEnable.getRules());
allRules.addAll(m.canDisable.getRules());
for (Rule r : allRules) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment