Fix tabbing.... Please fix your editors so they do tabbing correctly!!! (Spaces...

[IRC.git] / Robust / src / Analysis / Scheduling / ScheduleEdge.java

diff --git a/Robust/src/Analysis/Scheduling/ScheduleEdge.java b/Robust/src/Analysis/Scheduling/ScheduleEdge.java
index 1d2ec6a129d40df715b8907970dd1965c7553971..2d4a5cfc27eb0171f5f177754bd81df2673bf009 100644 (file)
--- a/Robust/src/Analysis/Scheduling/ScheduleEdge.java
+++ b/Robust/src/Analysis/Scheduling/ScheduleEdge.java
@@ -27,8 +27,8 @@ public class ScheduleEdge extends Edge {
   private ClassNode targetCNode;
 
   private double probability;
-  private int transTime;
-  private int listExeTime;
+  private long transTime;
+  private long listExeTime;
 
   private FEdge fedge;
   private int newRate;
@@ -38,7 +38,11 @@ public class ScheduleEdge extends Edge {
   /** Class Constructor
    *
    */
-  public ScheduleEdge(ScheduleNode target, String label, FlagState fstate, int type, int gid) {
+  public ScheduleEdge(ScheduleNode target,
+                      String label,
+                      FlagState fstate,
+                      int type,
+                      int gid) {
     super(target);
     this.uid = ScheduleEdge.nodeID++;
     this.gid = gid;
@@ -77,7 +81,7 @@ public class ScheduleEdge extends Edge {
     if(ScheduleEdge.NEWEDGE == this.type) {
       completeLabel += ":" + Integer.toString(this.newRate);
     }
-    completeLabel += ":(" + Double.toString(this.probability) + "%)" + ":[" + Integer.toString(this.transTime) + "]";
+    completeLabel += ":(" + Double.toString(this.probability) + "%)" + ":[" + Long.toString(this.transTime) + "]";
     return completeLabel;
   }
 
@@ -171,7 +175,7 @@ public class ScheduleEdge extends Edge {
   public int hashCode() {
     int hashcode = gid^uid^label.hashCode()^target.hashCode()^source.hashCode()^fstate.hashCode()^
                    sourceCNode.hashCode()^targetCNode.hashCode()^newRate^(int)probability^
-                   type^transTime^listExeTime;
+                   type^(int)transTime^(int)listExeTime;
     if(targetFState != null) {
       hashcode ^= targetFState.hashCode();
     }
@@ -189,25 +193,25 @@ public class ScheduleEdge extends Edge {
     this.newRate = nr;
   }
 
-  public int getTransTime() {
+  public long getTransTime() {
     return this.transTime;
   }
 
-  public void setTransTime(int transTime) {
+  public void setTransTime(long transTime) {
     this.transTime = transTime;
   }
 
-  public int getListExeTime() {
+  public long getListExeTime() {
     if(listExeTime == -1) {
       // calculate the lisExeTime
       listExeTime = ((ScheduleNode) this.getTarget()).getExeTime() + this.getTransTime() * this.getNewRate();
       Iterator it_edges = this.getTarget().edges();
-      int temp = 0;
+      long temp = 0;
       if(it_edges.hasNext()) {
        temp = ((ScheduleEdge)it_edges.next()).getListExeTime();
       }
       while(it_edges.hasNext()) {
-       int tetime = ((ScheduleEdge)it_edges.next()).getListExeTime();
+       long tetime = ((ScheduleEdge)it_edges.next()).getListExeTime();
        if(temp < tetime) {
          temp = tetime;
        }