Browse Source

Updated with realistic results from server

Yentl Van Tendeloo 7 years ago
parent
commit
fca8141de0
5 changed files with 59 additions and 15 deletions
  1. 1 2
      model/model.py
  2. 6 2
      model/results_mvi_latency
  3. 6 2
      model/results_mvs_latency
  4. 45 8
      model/results_real
  5. 1 1
      wrappers/modelverse_SCCD.py

+ 1 - 2
model/model.py

@@ -17,8 +17,6 @@ PROFILE = False
 import json
 import json
 import random
 import random
 
 
-random.seed(1)
-
 COMPILER_PATH = "interface/HUTN"
 COMPILER_PATH = "interface/HUTN"
 
 
 sys.path.append(COMPILER_PATH)
 sys.path.append(COMPILER_PATH)
@@ -645,6 +643,7 @@ class System(CoupledDEVS):
         self.connectPorts(self.mvk2mvi.output_port, self.mvi.from_mvk)
         self.connectPorts(self.mvk2mvi.output_port, self.mvi.from_mvk)
 
 
 def simulate(supplied_args):
 def simulate(supplied_args):
+    random.seed(1)
     taskname = "test_task"
     taskname = "test_task"
 
 
     operations = json.loads(open("model/operations", 'r').read())
     operations = json.loads(open("model/operations", 'r').read())

+ 6 - 2
model/results_mvi_latency

@@ -1,2 +1,6 @@
-0.00 289.1 706.5
-0.01 290.0 700.1
+0.0 292.109931617 687.586576939
+0.00085 296.482015311 710.436285973
+0.006 304.150488218 705.886978149
+0.01 310.165107566 702.304213047
+0.05 363.198107076 796.335119963
+0.5 509.838712965 900.826931953

+ 6 - 2
model/results_mvs_latency

@@ -1,2 +1,6 @@
-{'mvk2mvs_latency': 0.0, 'mvs2mvk_latency': 0.0} 701.855383873 292.109978817
-{'mvk2mvs_latency': 0.5, 'mvs2mvk_latency': 0.5} 680.295352936 292.109978817
+0.0 287.089157728 682.32207799
+0.00085 74247.9788747 1345.15017915
+0.006 781500.860442 2527.91798186
+0.01 1223318.65876 2419.65163016
+0.05 6208491.94807 2557.9531641
+0.5 62065229.7857 2572.83656693

+ 45 - 8
model/results_real

@@ -1,8 +1,45 @@
-330.1
-335.2
-320.5
-331.4
-334.8
-310.8
-340.6
-320.6
+280.637567043
+296.603248835
+292.454334974
+285.996268988
+293.921952963
+283.71339798
+293.266798973
+283.485968113
+295.018666983
+283.898438931
+285.388226986
+293.035602093
+294.636198997
+294.183022022
+285.786120892
+298.210355997
+294.114370108
+294.55457902
+281.625012875
+281.878963947
+287.908139944
+294.755314112
+294.155758142
+284.547976971
+294.172923088
+296.046543837
+293.35966301
+287.99435091
+281.050395966
+270.317679882
+277.531784058
+293.629886866
+288.316046
+284.567144871
+282.679445028
+294.466975927
+284.337308884
+293.572304964
+274.568242788
+296.396967888
+287.289237976
+294.616616011
+283.87115407
+282.592723131
+274.511307955

+ 1 - 1
wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
 
-Date:   Fri Jan  5 08:43:03 2018
+Date:   Mon Jan  8 08:10:57 2018
 
 
 Model author: Yentl Van Tendeloo
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
 Model name:   MvK Server