From: bdemsky Date: Mon, 21 May 2007 22:03:32 +0000 (+0000) Subject: check in parameters X-Git-Tag: preEdgeChange~577 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=729cc18023d4796a1fd73f59cd9b9cca70f99017;p=IRC.git check in parameters --- diff --git a/Robust/src/Analysis/TaskStateAnalysis/TEdge.java b/Robust/src/Analysis/TaskStateAnalysis/TEdge.java index 869272cc..96bdabe6 100644 --- a/Robust/src/Analysis/TaskStateAnalysis/TEdge.java +++ b/Robust/src/Analysis/TaskStateAnalysis/TEdge.java @@ -9,16 +9,15 @@ import Util.Edge; public class TEdge extends Edge{ - private String target; - - public TEdge(TaskNode target){ - super(target); - } + + public TEdge(TaskNode target){ + super(target); + } public int hashCode(){ - return target.hashCode()^target.toString().hashCode(); + return target.hashCode(); } diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java index 42c07e57..0ac4a68a 100644 --- a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java +++ b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java @@ -259,7 +259,9 @@ private void analyseTasks(FlagState fs) { private boolean isTaskTrigger_flag(FlagExpressionNode fen,FlagState fs) { - if (fen instanceof FlagNode) + if (fen==null) + return true; + else if (fen instanceof FlagNode) return fs.get(((FlagNode)fen).getFlag()); else switch (((FlagOpNode)fen).getOp().getOp()) {