more changes

diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
index f4973400a14ea5eff814d55eaa7cf5752c115997..0d449b8b0b82c1600e21f93db638d03f09356d54 100644 (file)
--- a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
@@ -386,21 +386,11 @@ public class TaskAnalysis {
     }
 
     private boolean existsInQueue(TriggerState ts) {
-       for(Iterator it_queue=q_main.iterator();it_queue.hasNext();) {
-           TriggerState ts_local=(TriggerState)it_queue.next();
-
-           if (ts_local.equals(ts))
-               return true;
-       }
-       return false;
+       throw new Error("Use hashcode/contains of set method to find...no linear search allowed");
     }
 
     private boolean existsInFSQueue(Queue q,FlagState fs) {
-       for (Iterator it_q=q.iterator();it_q.hasNext();) {
-           if(((FlagState)it_q.next()).isEqual(fs))
-               return true;
-       }
-       return false;
+       throw new Error("Use hashcode/contains of set method to find...no linear search allowed");
     }
 
     public void printAdjList(ClassDescriptor cd) {

diff --git a/Robust/src/Analysis/TaskStateAnalysis/TriggerState.java b/Robust/src/Analysis/TaskStateAnalysis/TriggerState.java
index 6cc7c46abb9aa59ea71246736450160b5287d8e4..9210dbfea4f582fc90adc9c1a783c965b7ebae2e 100644 (file)
--- a/Robust/src/Analysis/TaskStateAnalysis/TriggerState.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TriggerState.java
@@ -10,11 +10,11 @@ public class TriggerState
        ClassDescriptor cd;
        FlagState fs;
 
-       public TriggerState(ClassDescriptor cd, FlagState fs)
-       {
-               this.cd = cd;
-               this.fs = fs;
-       }
+    public TriggerState(ClassDescriptor cd, FlagState fs) {
+       throw new Error("Just use FlagState...roll classdescriptor into it");
+       this.cd = cd;
+       this.fs = fs;
+    }
 
        public ClassDescriptor getClassDescriptor()
        {