From 8cc96d565a843a131931de8fc5a85b3fc225bb37 Mon Sep 17 00:00:00 2001
From: Yentl Van Tendeloo <Yentl.VanTendeloo@uantwerpen.be>
Date: Thu, 4 Aug 2016 17:40:32 +0200
Subject: [PATCH] Cleanup

---
 .gitignore         |   1 +
 test/activity-log  | 741 ---------------------------------------------
 test/devstrace.vcd | 512 -------------------------------
 3 files changed, 1 insertion(+), 1253 deletions(-)
 delete mode 100644 test/activity-log
 delete mode 100644 test/devstrace.vcd

diff --git a/.gitignore b/.gitignore
index 87540b9..215b39d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 *.dms
 *.pyc
 *build*
+test/output/*
diff --git a/test/activity-log b/test/activity-log
deleted file mode 100644
index 75b9ed7..0000000
--- a/test/activity-log
+++ /dev/null
@@ -1,741 +0,0 @@
-2 0
-2 0
-2 0
-2 0
-2 0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-81.5 0.000102500974035 5.95315102419e-06 7.65162742942e-05
-238.5 0.0001028657749 5.59415248846e-06 7.20182001985e-05
-378.5 0.000106811523438 5.86250955744e-06 7.56710998772e-05
-546.5 0.000102061580345 6.19427593434e-06 7.12076822917e-05
-726.0 0.000112041046745 5.93693632829e-06 7.41654320767e-05
-867.0 0.00010317839109 5.50930316632e-06 7.43902646578e-05
-1083.0 0.000101365000996 5.84914984293e-06 6.85595518706e-05
-1389.0 0.000100553420282 6.05275554042e-06 6.78939204062e-05
-1692.0 0.000100950937013 6.06275893546e-06 6.8682271081e-05
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-74.5 0.000113141616719 6.17168093688e-06 7.56698966826e-05
-210.5 0.000101013881404 5.74918297248e-06 7.4136547926e-05
-349.5 0.0001045796179 6.13581749701e-06 7.32667984501e-05
-589.5 0.000104393592248 6.02428729718e-06 6.58761537992e-05
-784.0 0.000137247145176 6.03869557381e-06 4.38801944256e-05
-862.0 0.000135439893474 6.43211862315e-06 4.24929287123e-05
-948.5 0.000130014655031 6.69926772883e-06 4.23089957532e-05
-1015.0 0.000124087700477 6.69406010554e-06 4.59230863131e-05
-1236.0 9.88104404547e-05 6.00692553398e-06 6.46737905649e-05
-1686.5 0.000101012959639 6.29219756901e-06 6.33082977713e-05
-inf 0.0 0.0 0.0
-57.0 0.000150900138052 0.0 3.21321320115e-05
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-152.0 0.000191749710786 9.53595889242e-06 0.000136069561306
-463.0 0.000191104487053 9.25558917927e-06 0.000133018073796
-807.0 0.000189539548513 9.29574708681e-06 0.000132929956591
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-150.5 0.00019376856148 9.08446074324e-06 0.000137980990236
-460.0 0.000187588187883 8.96768749885e-06 0.000132952096327
-802.5 0.000192140038722 9.41785869546e-06 0.000133948365089
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-152.0 0.00019040468492 8.97912602676e-06 0.000137120485306
-463.0 0.000189131910696 8.82373665864e-06 0.000132044156392
-807.0 0.000189497664168 9.30799020303e-06 0.000132230165842
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-147.0 0.000191999130509 9.25453341737e-06 0.000138486323713
-453.0 0.000187472727314 9.464018e-06 0.000130878304535
-797.0 0.000189664557173 9.44137573242e-06 0.000130749393154
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-148.5 0.000196373422539 9.35451751606e-06 0.000135490789959
-454.5 0.00019311526465 9.49889894516e-06 0.000131842446706
-792.5 0.000195638624915 9.49909812526e-06 0.000133472796622
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-152.5 0.000193619337238 8.89418555088e-06 0.00013650831629
-465.5 0.000191851197002 9.18245761194e-06 0.000131064857649
-809.5 0.000193078771274 9.18853510303e-06 0.000132652979131
-144.5 0.000191446819107 9.54664289745e-06 0.000136310254001
-443.5 0.000191719400844 9.82608609987e-06 0.000132691898778
-775.5 0.000190095498528 9.82888987367e-06 0.00013648825632
-1112.0 0.000204614873202 9.90786642398e-06 0.00014492175864
-1443.5 0.000194536430248 9.494587995e-06 0.000137397517329
-1778.0 0.000202189257115 9.50657291177e-06 0.000140145972923
-inf 0.0 0.0 0.0
-142.5 0.000198868701332 9.55096462317e-06 0.000139473195662
-437.5 0.000188828296349 1.02215125913e-05 0.000133406529661
-766.0 0.000194827941331 9.78058034723e-06 0.000132024288177
-1100.0 0.00024184697791 9.61822799489e-06 0.000140514554857
-1428.5 0.000196572273008 9.61225403369e-06 0.000136613845825
-1758.0 0.000209794104474 9.24809173968e-06 0.00014022386299
-144.5 0.00019263643707 9.62749072012e-06 0.000137531221119
-444.0 0.000187068600808 9.78592903383e-06 0.00012909904603
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-167.5 0.000165331541602 8.73679545388e-06 0.000112813266356
-498.0 0.000174662086861 5.56407530615e-06 0.000118495496504
-858.0 0.000173413814022 8.32347095315e-06 0.000120184748306
-808.5 0.000179900961407 9.19245057187e-06 0.000120723853677
-1114.5 0.000191368139129 7.20445289973e-06 0.000130917371636
-1460.5 0.000183731714884 9.44010416667e-06 0.00012086613973
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-148.5 0.000190479586823 8.64167004723e-06 0.000135078173294
-454.5 0.000186097432697 8.99708460248e-06 0.000129322021727
-792.5 0.000191143014755 9.35446192353e-06 0.000128318068063
-757.5 0.000190913472389 9.03204953957e-06 0.000130663213042
-1058.0 0.000202746545115 9.64364697856e-06 0.000135667093339
-1387.5 0.000194701219357 9.62896811586e-06 0.000131810633706
-1727.5 0.000223126656339 9.97900602681e-06 0.000135043596573
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-144.0 0.000190608203411 9.30329163869e-06 0.000134344730112
-444.0 0.000185750233821 9.43052463042e-06 0.000129455939317
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-147.5 0.000186079639499 9.15446523893e-06 0.000133973461086
-450.0 0.000187248568381 8.92916033345e-06 0.000128482234093
-782.5 0.000191873228046 9.0565479977e-06 0.000132253808035
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-153.5 0.000180878934332 8.07905041822e-06 0.000131348445283
-472.0 0.000177231701938 8.75935410008e-06 0.000122078259786
-827.5 0.000183977167125 1.28470693673e-05 0.00013046189556
-786.5 0.000197049367388 8.57350020903e-06 0.000129600831099
-1099.0 0.000197067582534 8.86975621885e-06 0.000131785503926
-1443.0 0.0001948400097 9.40436157732e-06 0.000133683668316
-1794.0 0.000204281245961 8.29416162827e-06 0.000134014382082
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-154.5 0.000184528264413 9.26668975731e-06 0.000131702731728
-474.5 0.00018201421755 8.13792479362e-06 0.000124797360054
-703.5 0.000245835837417 9.82584915762e-06 7.35061375175e-05
-832.0 0.000245648164016 7.97418447641e-06 7.14998978835e-05
-961.5 0.000242144562477 9.93041105049e-06 7.35567521679e-05
-1183.0 0.000200200232731 8.50638006903e-06 0.000137569798026
-1510.5 0.000194841815579 8.56698782912e-06 0.000134475769535
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-152.5 0.000189380958432 8.84493843454e-06 0.000134661158577
-460.0 0.000189156686106 8.61921618062e-06 0.000128334568393
-805.5 0.000181863314211 9.23825061227e-06 0.000126832426377
-763.0 0.000197737603574 8.72241484152e-06 0.000133484601974
-1074.0 0.000203134823431 9.1893541301e-06 0.000129792587889
-1421.5 0.000187472599309 9.65821387645e-06 0.00012845527835
-1775.0 0.000200864831371 9.0133508987e-06 0.000135909876174
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-153.5 0.000182327307785 8.74072022081e-06 0.000130071702143
-467.5 0.000180015682803 9.48326609959e-06 0.000128517269717
-818.0 0.000181528141624 1.28670742637e-05 0.000126048138267
-779.0 0.000197423214944 8.92727580292e-06 0.000128641033804
-1092.0 0.000201406302275 9.82078505151e-06 0.000133360609596
-1436.5 0.000196874958195 8.77249730776e-06 0.000131387579931
-1789.5 0.000203120743424 9.43815952872e-06 0.000136765566739
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-153.5 0.000185161926071 8.70033661783e-06 0.000132677997751
-467.0 0.000181886553764 8.84681940079e-06 0.000127840787172
-815.5 0.000190525535563 9.49184205235e-06 0.000129524529455
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-150.0 0.000196075439453 9.36110814412e-06 0.000138252576192
-457.0 0.000192628544607 9.20113484571e-06 0.000132212972945
-794.0 0.000194292598301 9.15394888984e-06 0.000132026937273
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-146.5 0.000193150783968 9.28693257094e-06 0.000137982514938
-450.0 0.000194102335887 9.28389798304e-06 0.000132599454017
-663.5 0.00025431666754 9.30887407961e-06 7.75303460855e-05
-777.5 0.000253722978675 9.48905944824e-06 7.49981921652e-05
-894.5 0.000263043812343 8.98176882447e-06 7.57089182108e-05
-1014.5 0.000258307811642 8.99882355997e-06 7.55570151589e-05
-1230.5 0.000202247950808 9.29219163116e-06 0.000138151683991
-1545.5 0.00020738978371 9.21162691983e-06 0.000139706560811
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-151.0 0.000181429433507 8.38649193972e-06 0.00012685131553
-456.0 0.000191724145567 7.98082970954e-06 0.000128645401496
-788.0 0.000200795993376 8.98154933801e-06 0.000131528698996
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-149.0 0.000197436985554 9.07590725278e-06 0.000135036922941
-456.0 0.000186170958265 9.32246823854e-06 0.000129852113844
-674.0 0.000248579184214 9.61422920227e-06 7.08599885305e-05
-792.0 0.00025474203044 9.60867980431e-06 7.08945866289e-05
-908.5 0.000255195503561 9.24534267849e-06 7.39668169592e-05
-1027.0 0.000254855553309 9.66389973958e-06 7.204413414e-05
-1238.0 0.000210632551585 9.08753729814e-06 0.000138863822482
-1549.0 0.000207013636827 9.17613506317e-06 0.000138025730848
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-144.5 0.000200485275691 9.71163845392e-06 0.000137198755073
-444.5 0.000188384408736 9.30829063489e-06 0.000129642210589
-778.5 0.000195024394188 9.48665522728e-06 0.000131865509418
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-147.0 0.00019494205916 8.79715900032e-06 0.000134751099308
-450.5 0.000189908396322 9.40420376226e-06 0.000130726506535
-668.5 0.000250959784035 9.88371003934e-06 7.25044467585e-05
-788.5 0.000259303639078 9.28406022553e-06 7.40992717254e-05
-911.5 0.000239364860594 9.09871833269e-06 6.59070273702e-05
-1038.0 0.000258432280633 9.22333809637e-06 7.36482681767e-05
-1252.0 0.000210871821956 9.20185917302e-06 0.000141174385422
-1564.5 0.000211989768198 9.18171487493e-06 0.000138648945223
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-144.5 0.000195387737974 9.08878022824e-06 0.000136782141293
-443.5 0.000195663723745 9.41020385347e-06 0.000131285306319
-776.5 0.000197785909102 9.46060950015e-06 0.000130560551705
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-149.0 0.000187344999121 8.79588543169e-06 0.000133957638837
-457.5 0.000185334944052 8.99712493801e-06 0.000128142138634
-805.5 0.000184172344461 8.98528162301e-06 0.00012521528755
-1149.0 0.000200398506657 8.7276581795e-06 0.000157877706712
-1466.5 0.000191444983849 8.81121708797e-06 0.000152314259456
-1783.0 0.000203008001501 8.94998575186e-06 0.000156525667612
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-147.0 0.000193050118531 9.2448020468e-06 0.000139563262057
-417.0 0.000177219631226 9.19752973851e-06 0.000237246839012
-715.5 0.000187481910075 9.4837612576e-06 0.000145778357134
-1044.5 0.000232062044672 1.09936593022e-05 0.000157478189624
-1373.0 0.000186852727618 1.02281570435e-05 0.000146989822388
-1700.5 0.000205133782058 1.03770709429e-05 0.00015848191058
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-144.0 0.000194965137376 9.45809814665e-06 0.000133927497599
-441.0 0.000192583775988 9.06769746269e-06 0.000131085028056
-773.0 0.000197876765075 9.24238279545e-06 0.000130949073664
-737.0 0.000194202769886 9.62010630361e-06 0.000132794980403
-1035.5 0.000195589862836 9.32592287708e-06 0.000135575843394
-1364.5 0.000195500486522 9.48589885613e-06 0.000136029823369
-1699.5 0.000204918185255 9.32194500147e-06 0.000137833987965
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-146.5 0.00019367888519 9.51802771246e-06 0.000138664408349
-447.5 0.000189112228097 9.57840854682e-06 0.000133512089553
-780.0 0.000194132328033 9.51129398989e-06 0.000133205665631
-744.5 0.000199754614579 9.56016674376e-06 0.000136420601293
-1039.0 0.000206562249284 9.37439893421e-06 0.000137097741428
-1361.0 0.000197611836826 9.19804853552e-06 0.000136721134186
-1689.0 0.000214893606645 9.66274285618e-06 0.0001403930821
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-146.5 0.000193943342658 9.48222423983e-06 0.000138086670495
-448.0 0.000190992509165 9.37446471184e-06 0.00013060492854
-781.5 0.000198639407545 9.63291200269e-06 0.000131639111944
-743.0 0.000203924519675 9.67809132167e-06 0.000149425438472
-1036.0 0.000201935861625 9.85463460286e-06 0.000144994336795
-1362.0 0.000199489510817 9.5629278635e-06 0.000145890809208
-1694.0 0.000214286570279 9.72043043413e-06 0.00014879418619
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-149.5 0.000198252623695 9.42191950055e-06 0.000136524538531
-456.0 0.000190588319378 9.25808195855e-06 0.000129821194205
-794.0 0.000199524737195 9.18701867372e-06 0.000129743175612
-760.5 0.000201874264216 9.53755136264e-06 0.000142890315945
-1067.0 0.000206105364194 9.50150519797e-06 0.000146956563746
-1403.0 0.000200037228859 9.81624517064e-06 0.00014599703126
-1746.0 0.000209197940597 9.59491155234e-06 0.00015123134636
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-156.5 0.000175572812748 7.67357433185e-06 0.000122834318362
-472.5 0.000183333423818 8.11669520076e-06 0.000125959001738
-696.0 0.00026011094451 8.32602381706e-06 7.48354941607e-05
-822.5 0.000253940582275 9.37652587891e-06 7.32936859131e-05
-949.5 0.000244332838428 9.03403112131e-06 7.07622646361e-05
-1176.5 0.000189105547391 8.83395855243e-06 0.000129944727971
-1510.0 0.000194003707484 9.00134705661e-06 0.000132797754299
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-149.5 0.000194066344296 8.9841542834e-06 0.000134589281369
-457.5 0.000186541103038 9.02154844266e-06 0.000128089441486
-765.5 0.000196185797752 9.04953998068e-06 0.000131398937774
-1073.0 0.000199681595911 8.93767875961e-06 0.000135696386989
-1410.0 0.000198428191286 9.188438927e-06 0.000133617630218
-1758.0 0.000209872539227 9.21156279434e-06 0.000138523310599
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-1381.0 0.000200162728628 9.02652740479e-06 0.000132053693136
-1696.5 0.000211995894095 9.00300247792e-06 0.00013647338775
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-1381.5 0.00020024150709 9.27297775928e-06 0.000132804693178
-1694.5 0.000211540368887 9.24550569974e-06 0.000139130812425
-1380.5 0.00019864015356 9.03518702274e-06 0.000134646693201
-1693.5 0.000210371221607 9.09563233728e-06 0.000137924783456
-inf 0.0 0.0 0.0
-151.5 0.000190203732783 9.25189984514e-06 0.000131363129065
-465.5 0.00018196619474 9.31593088003e-06 0.000122516338642
-824.0 0.000179689149467 9.17181676748e-06 0.00012467406234
-776.0 0.000195452490368 9.12273252333e-06 0.00013065660322
-1080.0 0.000203559031853 9.20509680724e-06 0.000136193556663
-1413.0 0.000198467303131 9.08819295592e-06 0.000134328664359
-1755.5 0.000206114662378 9.44814653195e-06 0.000138210025799
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-147.5 0.000194498644037 9.39530841375e-06 0.000133327710426
-153.5 0.000196095009968 9.20901469377e-06 0.000132346386242
-467.5 0.000185762981759 9.60061854663e-06 0.000127195197845
-814.5 0.000191072995797 9.25485953569e-06 0.000128241071113
-1169.0 0.000203963546526 9.50835999988e-06 0.000136870713461
-1515.5 0.000198372271882 9.3023316199e-06 0.000133625265597
-inf 0.0 0.0 0.0
-1486.5 0.000203760172611 9.48650781128e-06 0.000134224078328
-1799.5 0.000215989004946 9.46966515404e-06 0.00013604368274
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-153.0 0.000191291952445 9.22508489073e-06 0.000131578227274
-467.5 0.000184360303377 9.34999424607e-06 0.000127055696659
-814.0 0.000190894668167 9.40400200921e-06 0.000129795718837
-777.5 0.000193504372028 8.92424021506e-06 0.000130453495064
-1079.0 0.0002034294839 9.78684892841e-06 0.000137092241275
-1405.5 0.00019645828335 9.55941697706e-06 0.000136501850931
-1739.5 0.000211449055657 9.7454522629e-06 0.000140271825582
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-152.5 0.000189097201238 8.81914232598e-06 0.000135528845865
-151.0 0.000190949597896 9.21306231164e-06 0.000135537804357
-462.0 0.000180646777153 9.65595245361e-06 0.000127884745598
-793.5 0.000197842239291 9.14540304734e-06 0.000133634656233
-1132.5 0.000201008924797 9.34173811727e-06 0.000136668646514
-1473.0 0.000200795300434 9.89643824583e-06 0.000136166638722
-1811.5 0.000200447359114 9.76723846712e-06 0.000136509402641
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-150.5 0.000192171711462 9.2206999313e-06 0.00013450689094
-461.5 0.000185649342997 9.19211319302e-06 0.000127969129806
-792.5 0.000199648641771 9.31300725406e-06 0.000137201851764
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-152.0 0.000197805856404 8.93442254317e-06 0.000133177167491
-462.5 0.000189165211626 9.38406502035e-06 0.000127154569897
-793.0 0.000200907851374 9.27891842155e-06 0.000135902748551
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-768.5 0.000194888195749 8.88614331262e-06 0.000134273302757
-1073.5 0.000201911018008 9.1484614781e-06 0.000136695589338
-1401.0 0.000201955963584 8.89862284941e-06 0.000137496695799
-1380.5 0.000198294885182 9.35493903017e-06 0.000147455113389
-1695.5 0.000207705800267 9.24430224831e-06 0.000148088910428
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-154.0 0.000181300299508 8.39651405037e-06 0.000126242637634
-467.0 0.000193994000273 8.67603709863e-06 0.000129339080187
-687.0 0.000249516768534 8.26648024262e-06 7.53324539935e-05
-805.5 0.000253774808801 8.74685204547e-06 7.58544258449e-05
-924.0 0.000243851395904 8.67101012683e-06 6.9583048586e-05
-1046.0 0.00025294061567 9.70480871982e-06 7.31378305154e-05
-1260.5 0.000210187334191 8.94496805893e-06 0.000139785511874
-1587.5 0.000186608916401 9.66041850769e-06 0.00012873091684
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-151.5 0.000190458675422 9.38015802465e-06 0.000133982585995
-464.0 0.000191708529218 9.3146140531e-06 0.000127021570383
-796.0 0.000196051179317 9.67965488545e-06 0.000135351342765
-776.0 0.000194745347989 9.31490336033e-06 0.000130662854934
-1086.5 0.000198480851224 9.00310408733e-06 0.000133640713826
-1415.5 0.000203363311678 8.9923892401e-06 0.000135313444785
-1753.0 0.000208585035233 9.29832458496e-06 0.000134816481954
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-151.5 0.000199360422569 9.13387084558e-06 0.00013278970624
-464.0 0.000189626439018 9.20873251021e-06 0.000126638767882
-682.5 0.000252143196438 9.16356625764e-06 7.38040260647e-05
-803.0 0.000256328355698 9.63324592227e-06 7.23051646399e-05
-929.0 0.000247115180606 9.15451655312e-06 7.14858373006e-05
-1054.5 0.000257724761963 9.0446472168e-06 7.15599060059e-05
-1270.5 0.000210186557583 9.73167170919e-06 0.000139239556626
-1591.0 0.000203113356036 9.79871806984e-06 0.000136118449137
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-2 0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-234.5 0.000126669910162 7.38487569e-06 9.62031675554e-05
-716.0 0.000137387017007 7.49377586581e-06 9.673664927e-05
-1220.5 0.000143685850125 7.29607146921e-06 9.94844344056e-05
-1724.5 0.000147454878863 7.26765599744e-06 0.000102257873659
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-239.0 0.000126253112091 7.52614631812e-06 9.46831004889e-05
-720.0 0.00014772198417 7.50673703911e-06 9.83466786787e-05
-1059.5 0.000168904280051 7.50835125263e-06 5.34974611723e-05
-1387.5 0.000148538395019 7.42459245462e-06 0.000102055564103
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-2 0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-239.5 0.000123176793714 7.08536215764e-06 9.41857913342e-05
-723.0 0.000144140642197 7.26052972137e-06 9.78722924092e-05
-1226.0 0.000140723114308 7.21883589697e-06 9.9017813399e-05
-1734.0 0.000146881164796 7.37038960897e-06 0.000101308746031
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-231.0 0.00013032052424 7.40129710276e-06 9.57472499831e-05
-695.0 0.000147495146985 7.45748757293e-06 9.98288265114e-05
-1022.5 0.000178861870337 7.49946271301e-06 5.3846016132e-05
-1337.5 0.000158902468865 7.46179870467e-06 0.000103753169918
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
-inf 0.0 0.0 0.0
diff --git a/test/devstrace.vcd b/test/devstrace.vcd
deleted file mode 100644
index 62a95f8..0000000
--- a/test/devstrace.vcd
+++ /dev/null
@@ -1,512 +0,0 @@
-$date
-	2016-04-25
-$end
-$version
-	PyDEVS VCD export
-$end
-$comment
-	Generated from DEVS-code
-$end
-$timescale 1ns $end
-$scope Binary.CoupledGenerator.Generator Binary.CoupledGenerator.Generator $end
-$var wire 1 0 outport $end
-$var wire 1 1 inport $end
-$upscope $end
-$scope Binary.CoupledProcessor_2.Processor0 Binary.CoupledProcessor_2.Processor0 $end
-$var wire 1 2 inport $end
-$var wire 1 3 outport $end
-$upscope $end
-$scope Binary.CoupledProcessor_2.Processor1 Binary.CoupledProcessor_2.Processor1 $end
-$var wire 1 4 inport $end
-$var wire 1 5 outport $end
-$upscope $end
-$scope Binary.CoupledProcessor_3.Processor0 Binary.CoupledProcessor_3.Processor0 $end
-$var wire 1 6 inport $end
-$var wire 1 7 outport $end
-$upscope $end
-$scope Binary.CoupledProcessor_3.Processor1 Binary.CoupledProcessor_3.Processor1 $end
-$var wire 1 8 inport $end
-$var wire 1 9 outport $end
-$upscope $end
-$scope Binary.CoupledProcessor_3.Processor2 Binary.CoupledProcessor_3.Processor2 $end
-$var wire 1 10 inport $end
-$var wire 1 11 outport $end
-$upscope $end
-$enddefinitions $end
-$dumpvars 
-bz 0
-bz 1
-bz 2
-bz 3
-bz 4
-bz 5
-bz 6
-bz 7
-bz 8
-bz 9
-bz 10
-bz 11
-$end
-b1 0
-#10
-b1 2
-b1 3
-b1 4
-b1 0
-#20
-b1 2
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#30
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#40
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#50
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#60
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#70
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#80
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#90
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#100
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#110
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#120
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#130
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#140
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#150
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#160
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#170
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#180
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#190
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#200
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#210
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#220
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#230
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#240
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#250
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#260
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#270
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#280
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#290
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#300
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#310
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#320
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#330
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#340
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#350
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#360
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#370
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#380
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#390
-b1 2
-b1 11
-b1 5
-b1 6
-b1 7
-b1 8
-b1 3
-b1 4
-b1 9
-b1 10
-b1 0
-#400
-b1 2