Minor changes to EDF output

2 files changed, 29 insertions, 34 deletions

diff --git a/run.py b/run.py
index 5fcdb83..1ebaa0e 100755
--- a/run.py
+++ b/run.py
@@ -20,7 +20,8 @@ def oneCPU():
     trace.print_records()
 
 def myEDF():
-    test = sta.EDF(g6_list,0)
+    test = sta.EDF(g6_list,20000000)
+    #test = sta.EDF(g6_list)
     test.run_test()
 
 def myTrace():
@@ -59,36 +60,24 @@ def sampleTrace():
 
 path = '/home/mollison/sta/traces/'
 
-full_list = [
-path + 'st-g6-0.bin',
-path + 'st-g6-1.bin',
-path + 'st-g6-2.bin',
-path + 'st-g6-3.bin',
-path + 'st-x19-0.bin',
-path + 'st-x19-1.bin',
-path + 'st-x19-2.bin',
-path + 'st-x19-3.bin',
-path + 'st0.fg',
-path + 'st1.fg']
-
-short_list = [
-path + 'st-x19-2.bin']
-
 g6_list = [
 path + 'st-g6-0.bin',
 path + 'st-g6-1.bin',
 path + 'st-g6-2.bin',
 path + 'st-g6-3.bin']
 
+g5_list = [
+path + 'st-g5-0.bin',
+path + 'st-g5-1.bin',
+path + 'st-g5-2.bin',
+path + 'st-g5-3.bin']
+
 x19_list = [
 path + 'st-x19-0.bin',
 path + 'st-x19-1.bin',
 path + 'st-x19-2.bin',
 path + 'st-x19-3.bin']
 
-simple_list = [
-path + 'st0.fg',
-path + 'st1.fg']
 
 
 ##############
diff --git a/sta.py b/sta.py
index f3d5408..8332c1e 100755
--- a/sta.py
+++ b/sta.py
@@ -157,7 +157,7 @@ class EDF:
             if record['type'] == 3:
                 if not self.check_duplicate_release(record):
                     self.runnables.append(record)
-                    debug("{0} became runnable"
+                    print("{0} became runnable"
                           .format(Trace.getStr(record)))
 
             #Switch Tos
@@ -166,18 +166,20 @@ class EDF:
                 self.runnings.append(release_record)
                 check_tuple = self.check_deadline(release_record)
                 if check_tuple[0] == True:
-                    debug("{0} became running (VALID)"
+                    print("{0} became running (VALID)"
                           .format(Trace.getStr(release_record)))
                     self.corrects += 1
                 else:
-                    debug('='*50)
-                    debug("{0} became running (INVALID)"
+                    print('='*50)
+                    print("{0} became running (INVALID)"
                           .format(Trace.getStr(release_record)))
-                    debug('Deadline of {0} greater than deadline of {1} in the following record:'
+                    print('Deadline of {0} greater than deadline of {1} in the following record:'
                           .format(release_record['deadline'],
                                   check_tuple[1]['deadline']))
-                    debug(check_tuple[1])
-                    debug('='*50)
+                    print(check_tuple[1])
+                    self.print_runnables()
+                    self.print_runnings()
+                    print('='*50)
                     self.errors += 1
 
             #Switch Aways
@@ -185,7 +187,7 @@ class EDF:
                 release_record = EDF.pop_job(record, self.runnings)
                 if release_record:
                     self.runnables.append(release_record)
-                    debug('{0} went from running to runnable'
+                    print('{0} went from running to runnable'
                           .format(Trace.getStr(release_record)))
 
             #Completions
@@ -193,7 +195,7 @@ class EDF:
                release_record = EDF.pop_job(record,self.runnings)
                if not release_record:
                    release_record = EDF.pop_job(record,self.runnables)
-               debug('{0} completed'
+               print('{0} completed'
                      .format(Trace.getStr(release_record)))
 
         print('Corrects: {0}'.format(self.corrects))
@@ -247,13 +249,17 @@ class EDF:
                 return True
         return False
 
+    def print_runnables(self):
+        """Print the runnable jobs"""
+        print("Runnable jobs:")
+        for record in self.runnables:
+            print('{0}, {1}'.format(Trace.getStr(record),record['deadline']))
 
-####################################
-#             Debug                #
-####################################
-
-def debug(string):
-    print(string)
+    def print_runnings(self):
+        """Print the runnable jobs"""
+        print("Running jobs:")
+        for record in self.runnings:
+            print('{0}, {1}'.format(Trace.getStr(record),record['deadline']))
 
 
 ####################################