Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/jpf-core

[jpf-core.git] / main.jpf

diff --git a/main.jpf b/main.jpf
index da1b57f3ac68479baa46b1c0727dd0e2456cf583..cfef551bc29338a9abf72d472ea41f4975d12145 100644 (file)
--- a/main.jpf
+++ b/main.jpf
@@ -3,7 +3,9 @@ target = main
 # This is the listener that can detect variable write-after-write conflicts
 #listener=gov.nasa.jpf.listener.VariableConflictTracker
 #listener=gov.nasa.jpf.listener.StateReducer
-listener=gov.nasa.jpf.listener.VariableConflictTracker,gov.nasa.jpf.listener.StateReducer
+#listener=gov.nasa.jpf.listener.StateReducerOld
+#listener=gov.nasa.jpf.listener.VariableConflictTracker,gov.nasa.jpf.listener.StateReducer
+listener=gov.nasa.jpf.listener.ConflictTracker
 
 # Potentially conflicting variables
 # Alarms
@@ -26,22 +28,27 @@ variables=currentLock
 #variables=valve,valveLatestValue
 # Cameras
 #variables=image,alarmState
+# Location
+#variables=locationMode
                        
 # Potentially conflicting apps (we default to App1 and App2 for now)
 apps=App1,App2
 
+# Writer classes with manual input to detect direct-direct interactions
+manualClasses=appTouch,AeonKeyFob,Button,NfcTouch,ThreeAxis
+
 # Tracking the location.mode variable conflict
 #track_location_var_conflict=true
 
 # Debug mode for StateReducer
-debug_state_transition=true
-activate_state_reduction=true
+#debug_state_transition=true
+#activate_state_reduction=true
 
 # Timeout in minutes (default is 0 which means no timeout)
 timeout=30
 
 search.class = gov.nasa.jpf.search.heuristic.RandomHeuristic
-search.heuristic.beam_search=true
+#search.heuristic.beam_search=true
 #search.class = gov.nasa.jpf.search.heuristic.UserHeuristic
 #search.class = gov.nasa.jpf.search.heuristic.BFSHeuristic
 #search.class = gov.nasa.jpf.search.heuristic.DFSHeuristic