update predicate field encoding

diff --git a/src/edu/berkeley/fleet/two/FleetTwoFleet.java b/src/edu/berkeley/fleet/two/FleetTwoFleet.java
index 5482cbd..c6f90bc 100644 (file)
--- a/src/edu/berkeley/fleet/two/FleetTwoFleet.java
+++ b/src/edu/berkeley/fleet/two/FleetTwoFleet.java
@@ -95,14 +95,14 @@ public abstract class FleetTwoFleet extends Fleet {
             NOT_INTERRUPTIBLE          = new Mask(".................1...................");
             OS                         = new Mask(".......1.............................");
             P                          = new Mask(".vvvvvv..............................");
-            P_NOT_A                    = new Mask(".100001..............................");
-            P_A                        = new Mask(".100010..............................");
-            P_NOT_B                    = new Mask(".100100..............................");
-            P_B                        = new Mask(".101000..............................");
-            P_UNUSED                   = new Mask(".111111..............................");
-            P_OLC_ZERO                 = new Mask(".010000..............................");
-            P_OLC_NONZERO              = new Mask(".100000..............................");
-            P_ALWAYS                   = new Mask(".000000..............................");
+            P_NOT_A                    = new Mask(".011110..............................");
+            P_A                        = new Mask(".011101..............................");
+            P_NOT_B                    = new Mask(".011011..............................");
+            P_B                        = new Mask(".010111..............................");
+            P_UNUSED                   = new Mask(".000000..............................");
+            P_OLC_ZERO                 = new Mask(".101111..............................");
+            P_OLC_NONZERO              = new Mask(".011111..............................");
+            P_ALWAYS                   = new Mask(".111111..............................");
 
             SHIFT                      = new Mask("..........101111.1vvvvvvvvvvvvvvvvvvv");