From ef86e9f09a8e34ac0e7a1c7d83e9113de27d470e Mon Sep 17 00:00:00 2001
From: Jason Quinlan <j.quinlan@cs.uc.ie>
Date: Mon, 18 Apr 2022 07:57:06 +0100
Subject: [PATCH] updates to evaluate

---
 evaluate/config/settings.py | 26 ++++++++++++++++----------
 evaluate/test_goDASH.py     | 11 ++++++++---
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/evaluate/config/settings.py b/evaluate/config/settings.py
index 83c637a..c57a09a 100644
--- a/evaluate/config/settings.py
+++ b/evaluate/config/settings.py
@@ -32,18 +32,24 @@
 
 
     # **** These are other config settings, which typically are not changed ****
-    "codec":"\"h264\"",
-    "initBuffer":2,
-    "maxBuffer":60,
-    "maxHeight":3000,
-    "streamDuration":10,
-    "printHeader":"\"{\"Algorithm\":\"on\",\"Seg_Dur\":\"on\",\"Codec\":\"on\",\"Width\":\"on\",\"Height\":\"on\",\"FPS\":\"on\",\"Play_Pos\":\"on\",\"RTT\":\"on\",\"Seg_Repl\":\"off\",\"Protocol\":\"on\",\"TTFB\":\"on\",\"TTLB\":\"on\",\"P.1203\":\"on\",\"Clae\":\"on\",\"Duanmu\":\"on\",\"Yin\":\"on\",\"Yu\":\"on\"}\"",
-    "expRatio":0.2,
-    "quic":"\"off\"",
-    "useTestbed":"\"off\"",
-    "QoE":"\"on\""
+    '"codec"':"\"h264\"",
+    '"initBuffer"':2,
+    '"maxBuffer"':60,
+    '"maxHeight"':3000,
+    '"streamDuration"':10,
+    '"storeDash"' : "\"off\"",
+    '"getHeaders"' : "\"off\"",
+    '"printHeader"':'"{\\"Algorithm\\":\\"on\\",\\"Seg_Dur\\":\\"on\\",\\"Codec\\":\\"on\\",\\"Width\\":\\"on\\",\\"Height\\":\\"on\\",\\"FPS\\":\\"on\\",\\"Play_Pos\\":\\"on\\",\\"RTT\\":\\"on\\",\\"Seg_Repl\\":\\"off\\",\\"Protocol\\":\\"on\\",\\"TTFB\\":\\"on\\",\\"TTLB\\":\\"on\\",\\"P.1203\\":\\"on\\",\\"Clae\\":\\"on\\",\\"Duanmu\\":\\"on\\",\\"Yin\\":\\"on\\",\\"Yu\\":\\"on\\"}"',
+    '"expRatio"':0.2,
+    '"quic"':"\"off\"",
+    '"useTestbed"':"\"off\"",
+    '"QoE"':"\"on\""
 }
 
+#  '"printHeader"':{"Algorithm":"on","Seg_Dur":"on","Codec":"on","Width":"on","Height":"on",
+        # "FPS":"on","Play_Pos":"on","RTT":"on","Seg_Repl":"off","Protocol":"on","TTFB":"on",
+        # "TTLB":"on","P.1203":"on","Clae":"on","Duanmu":"on","Yin":"on","Yu":"on"},
+
 # print output of godash to the terminal screen
 terminalPrint=False
 terminalPrintval=bool_to_val(terminalPrint)
diff --git a/evaluate/test_goDASH.py b/evaluate/test_goDASH.py
index db7416a..9700791 100644
--- a/evaluate/test_goDASH.py
+++ b/evaluate/test_goDASH.py
@@ -86,6 +86,8 @@ def eval_goDASH():
             fo.write('{\n')
             for k, v in dict.items():
 
+                print(k, v)
+
                 # write the key to the config file
                 fo.write('\t\t' + str(k) + ' : ')
 
@@ -121,12 +123,15 @@ def eval_goDASH():
                     if v != '"off"':
                         getHeaders = True
                     # write the value
-                    fo.write(str(v+","))
+                    fo.write(str(godash_run_dict[k])+",")
 
                 # set the kind of default values - these are changed as per the settings file
                 else:
-                    # write the value
-                    fo.write(str(v)+",")
+                    # if "printHeader" in k:
+                    #     fo.write(str(v)+ ",")
+                    # else:
+                        # write the value
+                    fo.write(str(godash_run_dict[k])+",")
                 # write a return carriage
                 fo.write('\n')
             fo.write('}')