diff --git a/tools.descartes.dql.connector.simQPN/testfiles/expectedPerformanceMetrics_ispass03-02.txt b/tools.descartes.dql.connector.simQPN/testfiles/expectedPerformanceMetrics_ispass03-02.txt
index 5368e1ede3789717b5d160b45299e9dd7cb6776b..523bc5723111f6a761b5414cac36f17de715410a 100644
--- a/tools.descartes.dql.connector.simQPN/testfiles/expectedPerformanceMetrics_ispass03-02.txt
+++ b/tools.descartes.dql.connector.simQPN/testfiles/expectedPerformanceMetrics_ispass03-02.txt
@@ -1,230 +1,217 @@
-
-WLS-Thread-Pool
-WLS-Thread-Pool
- t_ArrivalThroughput 0.9 true 0.016487291474505627
- t_DepartureThroughput 0.9 true 0.016487283119040793
- TokenOccupancy 0.9 true 0.9866402048613506
- t_TokenColorOccupancy 0.9 true 0.9866402048613506
- t_MinimumTokenPopulation 0.9 true 0.0
- t_MaximumTokenPopulation 0.9 true 10.0
- t_MeanTokenPopulation 0.9 true 6.475980129190478
- t_MaximumTokenResidenceTime 0.9 true 1754.4518463015556
- t_MeanTokenResidenceTime 0.9 true 392.78618705631817
- t_StandardDeviationTokenResidenceTime 0.9 true 174.07984646297328
- t_MinimumTokenResidenceTime 0.9 true 0.0
-
-Client
-Client
- Q0_TotalArrivalThroughput 0.9 true 0.016487291474505623
- Q0_TotalDepartureThroughput 0.9 true 0.016487278941308373
- Q0_QueueUtilization 0.9 true 1.0
- Q0_MeanTokenResidenceTime 0.9 true 998.8122067815939
- QueueUtilizationDueToThisPlace 0.9 true 1.0
- x1_DepartureThroughput 0.9 true 0.0075696291888686495
- x1_TokenColorOccupancy 0.9 true 0.9999524203084676
- x1_MinimumTokenPopulation 0.9 true 0.0
- x1_ArrivalThroughput 0.9 true 0.007569637544333483
- x1_MaximumTokenPopulation 0.9 true 10.0
- x1_MeanTokenPopulation 0.9 true 7.552758965936821
- x2_DepartureThroughput 0.9 true 0.008917649752439725
- x2_TokenColorOccupancy 0.9 true 0.999999873109595
- x2_MinimumTokenPopulation 0.9 true 0.0
- x2_ArrivalThroughput 0.9 true 0.008917653930172142
- x2_MaximumTokenPopulation 0.9 true 10.0
- x2_MeanTokenPopulation 0.9 true 8.914956648225791
- x1_MaximumTokenResidenceTime 0.9 true 14071.484824836254
- x1_StandardDeviationTokenResidenceTime 0.9 true 997.8099005303028
- x1_MinimumTokenResidenceTime 0.9 true 0.000235632061958313
- x2_MaximumTokenResidenceTime 0.9 true 14057.44845879078
- x2_StandardDeviationTokenResidenceTime 0.9 true 1000.8657397553312
- x2_MinimumTokenResidenceTime 0.9 true 0.0004798769950866699
- Depository_x1_ArrivalThroughput 0.9 true 0.0075696291888686495
- Depository_x1_DepartureThroughput 0.9 true 0.0075696291888686495
- Depository_x2_ArrivalThroughput 0.9 true 0.008917649752439725
- Depository_x2_DepartureThroughput 0.9 true 0.008917653930172142
- Depository_TokenOccupancy 0.9 true 0.005439797389930032
- Depository_x1_TokenColorOccupancy 0.9 true 0.0025112196147228207
- Depository_x1_MinimumTokenPopulation 0.9 true 0.0
- Depository_x1_MaximumTokenPopulation 0.9 true 4.0
- Depository_x1_MeanTokenPopulation 0.9 true 0.0028774853263555844
- Depository_x2_TokenColorOccupancy 0.9 true 0.004038678282255731
- Depository_x2_MinimumTokenPopulation 0.9 true 0.0
- Depository_x2_MaximumTokenPopulation 0.9 true 7.0
- Depository_x2_MeanTokenPopulation 0.9 true 0.0053870297009991144
- Depository_x1_MaximumTokenResidenceTime 0.9 true 669.77161860466
- Depository_x1_MeanTokenResidenceTime 0.9 true 0.3801355726363726
- Depository_x1_StandardDeviationTokenResidenceTime 0.9 true 6.836715731857385
- Depository_x1_MinimumTokenResidenceTime 0.9 true 0.0
- Depository_x2_MaximumTokenResidenceTime 0.9 true 695.8686946928501
- Depository_x2_MeanTokenResidenceTime 0.9 true 0.6040859785747623
- Depository_x2_StandardDeviationTokenResidenceTime 0.9 true 8.93785036525848
- Depository_x2_MinimumTokenResidenceTime 0.9 true 0.0
-
-WLS-CPU
-WLS-CPU
- Q1_TotalArrivalThroughput 0.9 true 0.01648728311904079
- Q1_TotalDepartureThroughput 0.9 true 0.016487299829970457
- Q1_QueueUtilization 0.9 true 0.7614036912157851
- Q1_MeanTokenResidenceTime 0.9 true 138.24633103034193
- QueueUtilizationDueToThisPlace 0.9 true 0.7614036912157851
- x1_DepartureThroughput 0.9 true 0.0075696417220659
- x1_TokenColorOccupancy 0.9 true 0.6856637635154392
- x1_MinimumTokenPopulation 0.9 true 0.0
- x1_ArrivalThroughput 0.9 true 0.0075696291888686495
- x1_MaximumTokenPopulation 0.9 true 10.0
- x1_MeanTokenPopulation 0.9 true 1.5572748769690716
- x2_DepartureThroughput 0.9 true 0.008917658107904559
- x2_TokenColorOccupancy 0.9 true 0.45924883600069744
- x2_MinimumTokenPopulation 0.9 true 0.0
- x2_ArrivalThroughput 0.9 true 0.008917653930172142
- x2_MaximumTokenPopulation 0.9 true 9.0
- x2_MeanTokenPopulation 0.9 true 0.7220279963640949
- x1_MaximumTokenResidenceTime 0.9 true 4510.187192365527
- x1_StandardDeviationTokenResidenceTime 0.9 true 250.49023921944024
- x1_MinimumTokenResidenceTime 0.9 true 0.00003230571746826172
- x2_MaximumTokenResidenceTime 0.9 true 1961.8250945806503
- x2_StandardDeviationTokenResidenceTime 0.9 true 104.06937027892322
- x2_MinimumTokenResidenceTime 0.9 true 0.000005900859832763672
- Depository_x1_ArrivalThroughput 0.9 true 0.0075696417220659
- Depository_x1_DepartureThroughput 0.9 true 0.0075696417220659
- Depository_x2_ArrivalThroughput 0.9 true 0.008917658107904559
- Depository_x2_DepartureThroughput 0.9 true 0.008917653930172142
- Depository_TokenOccupancy 0.9 true 0.0
- Depository_x1_TokenColorOccupancy 0.9 true 0.0
- Depository_x1_MinimumTokenPopulation 0.9 true 0.0
- Depository_x1_MaximumTokenPopulation 0.9 true 1.0
- Depository_x1_MeanTokenPopulation 0.9 true 0.0
- Depository_x2_TokenColorOccupancy 0.9 true 0.0
- Depository_x2_MinimumTokenPopulation 0.9 true 0.0
- Depository_x2_MaximumTokenPopulation 0.9 true 1.0
- Depository_x2_MeanTokenPopulation 0.9 true 0.0
- Depository_x1_MaximumTokenResidenceTime 0.9 true 0.0
- Depository_x1_MeanTokenResidenceTime 0.9 true 0.0
- Depository_x1_StandardDeviationTokenResidenceTime 0.9 true 0.0
- Depository_x1_MinimumTokenResidenceTime 0.9 true 0.0
- Depository_x2_MaximumTokenResidenceTime 0.9 true 0.0
- Depository_x2_MeanTokenResidenceTime 0.9 true 0.0
- Depository_x2_StandardDeviationTokenResidenceTime 0.9 true 0.0
- Depository_x2_MinimumTokenResidenceTime 0.9 true 0.0
-
-DBS-PQ
-DBS-PQ
- x1_ArrivalThroughput 0.9 true 0.0075696417220659
- x1_DepartureThroughput 0.9 true 0.0075696417220659
- x2_ArrivalThroughput 0.9 true 0.008917653930172142
- x2_DepartureThroughput 0.9 true 0.008917653930172142
- TokenOccupancy 0.9 true 0.0
- x1_TokenColorOccupancy 0.9 true 0.0
- x1_MinimumTokenPopulation 0.9 true 0.0
- x1_MaximumTokenPopulation 0.9 true 1.0
- x1_MeanTokenPopulation 0.9 true 0.0
- x2_TokenColorOccupancy 0.9 true 0.0
- x2_MinimumTokenPopulation 0.9 true 0.0
- x2_MaximumTokenPopulation 0.9 true 1.0
- x2_MeanTokenPopulation 0.9 true 0.0
- x1_MaximumTokenResidenceTime 0.9 true 0.0
- x1_MeanTokenResidenceTime 0.9 true 0.0
- x1_StandardDeviationTokenResidenceTime 0.9 true 0.0
- x1_MinimumTokenResidenceTime 0.9 true 0.0
- x2_MaximumTokenResidenceTime 0.9 true 0.0
- x2_MeanTokenResidenceTime 0.9 true 0.0
- x2_StandardDeviationTokenResidenceTime 0.9 true 0.0
- x2_MinimumTokenResidenceTime 0.9 true 0.0
-
-DBS-CPU
-DBS-CPU
- Q2_TotalArrivalThroughput 0.9 true 0.01648729565223804
- Q2_TotalDepartureThroughput 0.9 true 0.016487291474505623
- Q2_QueueUtilization 0.9 true 0.5440022351773528
- Q2_MeanTokenResidenceTime 0.9 true 65.17822728837292
- QueueUtilizationDueToThisPlace 0.9 true 0.5440022351773528
- x1_DepartureThroughput 0.9 true 0.007569637544333483
- x1_TokenColorOccupancy 0.9 true 0.46766592807426755
- x1_MinimumTokenPopulation 0.9 true 0.0
- x1_ArrivalThroughput 0.9 true 0.0075696417220659
- x1_MaximumTokenPopulation 0.9 true 9.0
- x1_MeanTokenPopulation 0.9 true 0.784738025401853
- x2_DepartureThroughput 0.9 true 0.008917653930172142
- x2_TokenColorOccupancy 0.9 true 0.23205206502467296
- x2_MinimumTokenPopulation 0.9 true 0.0
- x2_ArrivalThroughput 0.9 true 0.008917653930172142
- x2_MaximumTokenPopulation 0.9 true 7.0
- x2_MeanTokenPopulation 0.9 true 0.2898748367844379
- x1_MaximumTokenResidenceTime 0.9 true 2105.853387981653
- x1_StandardDeviationTokenResidenceTime 0.9 true 124.1568579299494
- x1_MinimumTokenResidenceTime 0.9 true 0.0000661015510559082
- x2_MaximumTokenResidenceTime 0.9 true 914.1334798485041
- x2_StandardDeviationTokenResidenceTime 0.9 true 41.91327293212713
- x2_MinimumTokenResidenceTime 0.9 true 0.000003874301910400391
- Depository_x1_ArrivalThroughput 0.9 true 0.007569637544333483
- Depository_x1_DepartureThroughput 0.9 true 0.007569637544333483
- Depository_x2_ArrivalThroughput 0.9 true 0.008917653930172142
- Depository_x2_DepartureThroughput 0.9 true 0.008917653930172142
- Depository_TokenOccupancy 0.9 true 0.0
- Depository_x1_TokenColorOccupancy 0.9 true 0.0
- Depository_x1_MinimumTokenPopulation 0.9 true 0.0
- Depository_x1_MaximumTokenPopulation 0.9 true 1.0
- Depository_x1_MeanTokenPopulation 0.9 true 0.0
- Depository_x2_TokenColorOccupancy 0.9 true 0.0
- Depository_x2_MinimumTokenPopulation 0.9 true 0.0
- Depository_x2_MaximumTokenPopulation 0.9 true 1.0
- Depository_x2_MeanTokenPopulation 0.9 true 0.0
- Depository_x1_MaximumTokenResidenceTime 0.9 true 0.0
- Depository_x1_MeanTokenResidenceTime 0.9 true 0.0
- Depository_x1_StandardDeviationTokenResidenceTime 0.9 true 0.0
- Depository_x1_MinimumTokenResidenceTime 0.9 true 0.0
- Depository_x2_MaximumTokenResidenceTime 0.9 true 0.0
- Depository_x2_MeanTokenResidenceTime 0.9 true 0.0
- Depository_x2_StandardDeviationTokenResidenceTime 0.9 true 0.0
- Depository_x2_MinimumTokenResidenceTime 0.9 true 0.0
-
-DBS-I/O
-DBS-I/O
- Q3_TotalArrivalThroughput 0.9 true 0.016487291474505623
- Q3_TotalDepartureThroughput 0.9 true 0.016487291474505623
- Q3_QueueUtilization 0.9 true 0.14438360926685856
- Q3_MeanTokenResidenceTime 0.9 true 10.317288049015453
- QueueUtilizationDueToThisPlace 0.9 true 0.14438360926685856
- x1_DepartureThroughput 0.9 true 0.007569637544333483
- x1_TokenColorOccupancy 0.9 true 0.09375593204070043
- x1_MinimumTokenPopulation 0.9 true 0.0
- x1_ArrivalThroughput 0.9 true 0.007569637544333483
- x1_MaximumTokenPopulation 0.9 true 6.0
- x1_MeanTokenPopulation 0.9 true 0.10235064636597677
- x2_DepartureThroughput 0.9 true 0.008917653930172142
- x2_TokenColorOccupancy 0.9 true 0.06345546918414863
- x2_MinimumTokenPopulation 0.9 true 0.0
- x2_ArrivalThroughput 0.9 true 0.008917653930172142
- x2_MaximumTokenPopulation 0.9 true 5.0
- x2_MeanTokenPopulation 0.9 true 0.06775348892457447
- x1_MaximumTokenResidenceTime 0.9 true 202.0901901423931
- x1_StandardDeviationTokenResidenceTime 0.9 true 13.32601427934229
- x1_MinimumTokenResidenceTime 0.9 true 1.1920928955078125E-7
- x2_MaximumTokenResidenceTime 0.9 true 177.1643733382225
- x2_StandardDeviationTokenResidenceTime 0.9 true 8.496105426550299
- x2_MinimumTokenResidenceTime 0.9 true 0.0000024139881134033203
- Depository_x1_ArrivalThroughput 0.9 true 0.007569637544333483
- Depository_x1_DepartureThroughput 0.9 true 0.007569637544333483
- Depository_x2_ArrivalThroughput 0.9 true 0.008917653930172142
- Depository_x2_DepartureThroughput 0.9 true 0.008917653930172142
- Depository_TokenOccupancy 0.9 true 0.0
- Depository_x1_TokenColorOccupancy 0.9 true 0.0
- Depository_x1_MinimumTokenPopulation 0.9 true 0.0
- Depository_x1_MaximumTokenPopulation 0.9 true 1.0
- Depository_x1_MeanTokenPopulation 0.9 true 0.0
- Depository_x2_TokenColorOccupancy 0.9 true 0.0
- Depository_x2_MinimumTokenPopulation 0.9 true 0.0
- Depository_x2_MaximumTokenPopulation 0.9 true 1.0
- Depository_x2_MeanTokenPopulation 0.9 true 0.0
- Depository_x1_MaximumTokenResidenceTime 0.9 true 0.0
- Depository_x1_MeanTokenResidenceTime 0.9 true 0.0
- Depository_x1_StandardDeviationTokenResidenceTime 0.9 true 0.0
- Depository_x1_MinimumTokenResidenceTime 0.9 true 0.0
- Depository_x2_MaximumTokenResidenceTime 0.9 true 0.0
- Depository_x2_MeanTokenResidenceTime 0.9 true 0.0
- Depository_x2_StandardDeviationTokenResidenceTime 0.9 true 0.0
- Depository_x2_MinimumTokenResidenceTime 0.9 true 0.0
-
-
-
+WLS-Thread-Pool.t_ArrivalThroughput 0.01648140570695123
+WLS-Thread-Pool.t_DepartureThroughput 0.016481394285638294
+WLS-Thread-Pool.TokenOccupancy 0.9869036573026563
+WLS-Thread-Pool.t_TokenColorOccupancy 0.9869036573026563
+WLS-Thread-Pool.t_MinimumTokenPopulation 0.0
+WLS-Thread-Pool.t_MaximumTokenPopulation 10.0
+WLS-Thread-Pool.t_MeanTokenPopulation 6.480796548881728
+WLS-Thread-Pool.t_MaximumTokenResidenceTime 1631.8863010704517
+WLS-Thread-Pool.t_MeanTokenResidenceTime 393.21892613849474
+WLS-Thread-Pool.t_StandardDeviationTokenResidenceTime 174.31281549690567
+WLS-Thread-Pool.t_MinimumTokenResidenceTime 0.0
+Client.QueueUtilizationDueToThisPlace 1.0
+Client.x1_DepartureThroughput 0.007556340637743412
+Client.x1_TokenColorOccupancy 0.9999487887766335
+Client.x1_MinimumTokenPopulation 0.0
+Client.x1_ArrivalThroughput 0.007556340637743412
+Client.x1_MaximumTokenPopulation 10.0
+Client.x1_MeanTokenPopulation 7.557160099582195
+Client.x2_DepartureThroughput 0.008925059358551351
+Client.x2_TokenColorOccupancy 1.0
+Client.x2_MinimumTokenPopulation 1.0
+Client.x2_ArrivalThroughput 0.008925065069207818
+Client.x2_MaximumTokenPopulation 10.0
+Client.x2_MeanTokenPopulation 8.91540827443868
+Client.x1_MaximumTokenResidenceTime 15750.990299880505
+Client.x1_MeanTokenResidenceTime 1000.1087641995389
+Client.x1_StandardDeviationTokenResidenceTime 999.3344483164562
+Client.x1_MinimumTokenResidenceTime 0.00027382373809814453
+Client.x2_MaximumTokenResidenceTime 13164.4397097677
+Client.x2_MeanTokenResidenceTime 998.9209840871604
+Client.x2_StandardDeviationTokenResidenceTime 998.5408869009169
+Client.x2_MinimumTokenResidenceTime 0.00004540383815765381
+Client.Depository_x1_ArrivalThroughput 0.007556340637743412
+Client.Depository_x1_DepartureThroughput 0.007556340637743412
+Client.Depository_x2_ArrivalThroughput 0.008925059358551351
+Client.Depository_x2_DepartureThroughput 0.008925053647894884
+Client.Depository_TokenOccupancy 0.005309926731022542
+Client.Depository_x1_TokenColorOccupancy 0.002496390369916355
+Client.Depository_x1_MinimumTokenPopulation 0.0
+Client.Depository_x1_MaximumTokenPopulation 4.0
+Client.Depository_x1_MeanTokenPopulation 0.002895735988648894
+Client.Depository_x2_TokenColorOccupancy 0.003946965285695041
+Client.Depository_x2_MinimumTokenPopulation 0.0
+Client.Depository_x2_MaximumTokenPopulation 6.0
+Client.Depository_x2_MeanTokenPopulation 0.005332438870943184
+Client.Depository_x1_MaximumTokenResidenceTime 500.9639725089073
+Client.Depository_x1_MeanTokenResidenceTime 0.38321935543573676
+Client.Depository_x1_StandardDeviationTokenResidenceTime 7.049858114585877
+Client.Depository_x1_MinimumTokenResidenceTime 0.0
+Client.Depository_x2_MaximumTokenResidenceTime 596.9852166324854
+Client.Depository_x2_MeanTokenResidenceTime 0.5974685510378892
+Client.Depository_x2_StandardDeviationTokenResidenceTime 8.962913719952128
+Client.Depository_x2_MinimumTokenResidenceTime 0.0
+WLS-CPU.QueueUtilizationDueToThisPlace 0.7614700853867187
+WLS-CPU.x1_DepartureThroughput 0.007556334927086944
+WLS-CPU.x1_TokenColorOccupancy 0.6854733539503854
+WLS-CPU.x1_MinimumTokenPopulation 0.0
+WLS-CPU.x1_ArrivalThroughput 0.007556340637743412
+WLS-CPU.x1_MaximumTokenPopulation 10.0
+WLS-CPU.x1_MeanTokenPopulation 1.5557980680059431
+WLS-CPU.x2_DepartureThroughput 0.008925053647894884
+WLS-CPU.x2_TokenColorOccupancy 0.45937881447412227
+WLS-CPU.x2_MinimumTokenPopulation 0.0
+WLS-CPU.x2_ArrivalThroughput 0.008925053647894884
+WLS-CPU.x2_MaximumTokenPopulation 8.0
+WLS-CPU.x2_MeanTokenPopulation 0.7217445611155731
+WLS-CPU.x1_MaximumTokenResidenceTime 4212.1970295012
+WLS-CPU.x1_MeanTokenResidenceTime 205.89337883380412
+WLS-CPU.x1_StandardDeviationTokenResidenceTime 250.33117061015054
+WLS-CPU.x1_MinimumTokenResidenceTime 0.00015720725059509277
+WLS-CPU.x2_MaximumTokenResidenceTime 1979.223610818386
+WLS-CPU.x2_MeanTokenResidenceTime 80.86737024282257
+WLS-CPU.x2_StandardDeviationTokenResidenceTime 103.79392899919647
+WLS-CPU.x2_MinimumTokenResidenceTime 0.000025451183319091797
+WLS-CPU.Depository_x1_ArrivalThroughput 0.007556334927086944
+WLS-CPU.Depository_x1_DepartureThroughput 0.007556334927086944
+WLS-CPU.Depository_x2_ArrivalThroughput 0.008925053647894884
+WLS-CPU.Depository_x2_DepartureThroughput 0.008925059358551351
+WLS-CPU.Depository_TokenOccupancy 0.0
+WLS-CPU.Depository_x1_TokenColorOccupancy 0.0
+WLS-CPU.Depository_x1_MinimumTokenPopulation 0.0
+WLS-CPU.Depository_x1_MaximumTokenPopulation 1.0
+WLS-CPU.Depository_x1_MeanTokenPopulation 0.0
+WLS-CPU.Depository_x2_TokenColorOccupancy 0.0
+WLS-CPU.Depository_x2_MinimumTokenPopulation 0.0
+WLS-CPU.Depository_x2_MaximumTokenPopulation 1.0
+WLS-CPU.Depository_x2_MeanTokenPopulation 0.0
+WLS-CPU.Depository_x1_MaximumTokenResidenceTime 0.0
+WLS-CPU.Depository_x1_MeanTokenResidenceTime 0.0
+WLS-CPU.Depository_x1_StandardDeviationTokenResidenceTime 0.0
+WLS-CPU.Depository_x1_MinimumTokenResidenceTime 0.0
+WLS-CPU.Depository_x2_MaximumTokenResidenceTime 0.0
+WLS-CPU.Depository_x2_MeanTokenResidenceTime 0.0
+WLS-CPU.Depository_x2_StandardDeviationTokenResidenceTime 0.0
+WLS-CPU.Depository_x2_MinimumTokenResidenceTime 0.0
+DBS-PQ.x1_ArrivalThroughput 0.007556334927086944
+DBS-PQ.x1_DepartureThroughput 0.007556334927086944
+DBS-PQ.x2_ArrivalThroughput 0.008925059358551351
+DBS-PQ.x2_DepartureThroughput 0.008925059358551351
+DBS-PQ.TokenOccupancy 0.0
+DBS-PQ.x1_TokenColorOccupancy 0.0
+DBS-PQ.x1_MinimumTokenPopulation 0.0
+DBS-PQ.x1_MaximumTokenPopulation 1.0
+DBS-PQ.x1_MeanTokenPopulation 0.0
+DBS-PQ.x2_TokenColorOccupancy 0.0
+DBS-PQ.x2_MinimumTokenPopulation 0.0
+DBS-PQ.x2_MaximumTokenPopulation 1.0
+DBS-PQ.x2_MeanTokenPopulation 0.0
+DBS-PQ.x1_MaximumTokenResidenceTime 0.0
+DBS-PQ.x1_MeanTokenResidenceTime 0.0
+DBS-PQ.x1_StandardDeviationTokenResidenceTime 0.0
+DBS-PQ.x1_MinimumTokenResidenceTime 0.0
+DBS-PQ.x2_MaximumTokenResidenceTime 0.0
+DBS-PQ.x2_MeanTokenResidenceTime 0.0
+DBS-PQ.x2_StandardDeviationTokenResidenceTime 0.0
+DBS-PQ.x2_MinimumTokenResidenceTime 0.0
+DBS-CPU.QueueUtilizationDueToThisPlace 0.5434170797102199
+DBS-CPU.x1_DepartureThroughput 0.007556340637743412
+DBS-CPU.x1_TokenColorOccupancy 0.46683677482637365
+DBS-CPU.x1_MinimumTokenPopulation 0.0
+DBS-CPU.x1_ArrivalThroughput 0.007556334927086944
+DBS-CPU.x1_MaximumTokenPopulation 9.0
+DBS-CPU.x1_MeanTokenPopulation 0.7818953405477339
+DBS-CPU.x2_DepartureThroughput 0.008925065069207818
+DBS-CPU.x2_TokenColorOccupancy 0.23196538874004563
+DBS-CPU.x2_MinimumTokenPopulation 0.0
+DBS-CPU.x2_ArrivalThroughput 0.008925059358551351
+DBS-CPU.x2_MaximumTokenPopulation 7.0
+DBS-CPU.x2_MeanTokenPopulation 0.2896801023351004
+DBS-CPU.x1_MaximumTokenResidenceTime 2687.813190743327
+DBS-CPU.x1_MeanTokenResidenceTime 103.47547427536462
+DBS-CPU.x1_StandardDeviationTokenResidenceTime 123.64685250991683
+DBS-CPU.x1_MinimumTokenResidenceTime 0.00002215057611465454
+DBS-CPU.x2_MaximumTokenResidenceTime 1060.802170947194
+DBS-CPU.x2_MeanTokenResidenceTime 32.45694660498007
+DBS-CPU.x2_StandardDeviationTokenResidenceTime 41.87137958806754
+DBS-CPU.x2_MinimumTokenResidenceTime 0.000012114644050598145
+DBS-CPU.Depository_x1_ArrivalThroughput 0.007556340637743412
+DBS-CPU.Depository_x1_DepartureThroughput 0.007556340637743412
+DBS-CPU.Depository_x2_ArrivalThroughput 0.008925065069207818
+DBS-CPU.Depository_x2_DepartureThroughput 0.008925065069207818
+DBS-CPU.Depository_TokenOccupancy 0.0
+DBS-CPU.Depository_x1_TokenColorOccupancy 0.0
+DBS-CPU.Depository_x1_MinimumTokenPopulation 0.0
+DBS-CPU.Depository_x1_MaximumTokenPopulation 1.0
+DBS-CPU.Depository_x1_MeanTokenPopulation 0.0
+DBS-CPU.Depository_x2_TokenColorOccupancy 0.0
+DBS-CPU.Depository_x2_MinimumTokenPopulation 0.0
+DBS-CPU.Depository_x2_MaximumTokenPopulation 1.0
+DBS-CPU.Depository_x2_MeanTokenPopulation 0.0
+DBS-CPU.Depository_x1_MaximumTokenResidenceTime 0.0
+DBS-CPU.Depository_x1_MeanTokenResidenceTime 0.0
+DBS-CPU.Depository_x1_StandardDeviationTokenResidenceTime 0.0
+DBS-CPU.Depository_x1_MinimumTokenResidenceTime 0.0
+DBS-CPU.Depository_x2_MaximumTokenResidenceTime 0.0
+DBS-CPU.Depository_x2_MeanTokenResidenceTime 0.0
+DBS-CPU.Depository_x2_StandardDeviationTokenResidenceTime 0.0
+DBS-CPU.Depository_x2_MinimumTokenResidenceTime 0.0
+DBS-I/O.QueueUtilizationDueToThisPlace 0.14425634465607082
+DBS-I/O.x1_DepartureThroughput 0.007556340637743412
+DBS-I/O.x1_TokenColorOccupancy 0.09357887886794902
+DBS-I/O.x1_MinimumTokenPopulation 0.0
+DBS-I/O.x1_ArrivalThroughput 0.007556340637743412
+DBS-I/O.x1_MaximumTokenPopulation 6.0
+DBS-I/O.x1_MeanTokenPopulation 0.10225075587511652
+DBS-I/O.x2_DepartureThroughput 0.008925065069207818
+DBS-I/O.x2_TokenColorOccupancy 0.06349607332104366
+DBS-I/O.x2_MinimumTokenPopulation 0.0
+DBS-I/O.x2_ArrivalThroughput 0.008925065069207818
+DBS-I/O.x2_MaximumTokenPopulation 6.0
+DBS-I/O.x2_MeanTokenPopulation 0.0678346232396187
+DBS-I/O.x1_MaximumTokenResidenceTime 182.46988666057587
+DBS-I/O.x1_MeanTokenResidenceTime 13.531782218019778
+DBS-I/O.x1_StandardDeviationTokenResidenceTime 13.360253266519559
+DBS-I/O.x1_MinimumTokenResidenceTime 0.000019103288650512695
+DBS-I/O.x2_MaximumTokenResidenceTime 192.61492735147476
+DBS-I/O.x2_MeanTokenResidenceTime 7.60046259759534
+DBS-I/O.x2_StandardDeviationTokenResidenceTime 8.520982507854045
+DBS-I/O.x2_MinimumTokenResidenceTime 0.0000010132789611816406
+DBS-I/O.Depository_x1_ArrivalThroughput 0.007556340637743412
+DBS-I/O.Depository_x1_DepartureThroughput 0.007556340637743412
+DBS-I/O.Depository_x2_ArrivalThroughput 0.008925065069207818
+DBS-I/O.Depository_x2_DepartureThroughput 0.008925065069207818
+DBS-I/O.Depository_TokenOccupancy 0.0
+DBS-I/O.Depository_x1_TokenColorOccupancy 0.0
+DBS-I/O.Depository_x1_MinimumTokenPopulation 0.0
+DBS-I/O.Depository_x1_MaximumTokenPopulation 1.0
+DBS-I/O.Depository_x1_MeanTokenPopulation 0.0
+DBS-I/O.Depository_x2_TokenColorOccupancy 0.0
+DBS-I/O.Depository_x2_MinimumTokenPopulation 0.0
+DBS-I/O.Depository_x2_MaximumTokenPopulation 1.0
+DBS-I/O.Depository_x2_MeanTokenPopulation 0.0
+DBS-I/O.Depository_x1_MaximumTokenResidenceTime 0.0
+DBS-I/O.Depository_x1_MeanTokenResidenceTime 0.0
+DBS-I/O.Depository_x1_StandardDeviationTokenResidenceTime 0.0
+DBS-I/O.Depository_x1_MinimumTokenResidenceTime 0.0
+DBS-I/O.Depository_x2_MaximumTokenResidenceTime 0.0
+DBS-I/O.Depository_x2_MeanTokenResidenceTime 0.0
+DBS-I/O.Depository_x2_StandardDeviationTokenResidenceTime 0.0
+DBS-I/O.Depository_x2_MinimumTokenResidenceTime 0.0
+Queue_Q0.TotalArrivalThroughput 0.01648140570695123
+Queue_Q0.TotalDepartureThroughput 0.016481399996294763
+Queue_Q0.QueueUtilization 1.0
+Queue_Q0.MeanTokenResidenceTime 999.465553792033
+Queue_Q1.TotalArrivalThroughput 0.016481394285638294
+Queue_Q1.TotalDepartureThroughput 0.01648138857498183
+Queue_Q1.QueueUtilization 0.7614700853867187
+Queue_Q1.MeanTokenResidenceTime 138.18889938536012
+Queue_Q2.TotalArrivalThroughput 0.016481394285638294
+Queue_Q2.TotalDepartureThroughput 0.01648140570695123
+Queue_Q2.QueueUtilization 0.5434170797102199
+Queue_Q2.MeanTokenResidenceTime 65.01728740419341
+Queue_Q3.TotalArrivalThroughput 0.01648140570695123
+Queue_Q3.TotalDepartureThroughput 0.01648140570695123
+Queue_Q3.QueueUtilization 0.14425634465607082
+Queue_Q3.MeanTokenResidenceTime 10.319834493425502
\ No newline at end of file
diff --git a/tools.descartes.dql.connector.simQPN/tests/tools/descartes/dql/connector/simQPN/PerformanceMetricsQueryConnectorImplTest.java b/tools.descartes.dql.connector.simQPN/tests/tools/descartes/dql/connector/simQPN/PerformanceMetricsQueryConnectorImplTest.java
index 32dd7b9ce8acc02e84aee39f750cf8123b366576..b359d4efdd99c418da0781991352ea6949481cbb 100644
--- a/tools.descartes.dql.connector.simQPN/tests/tools/descartes/dql/connector/simQPN/PerformanceMetricsQueryConnectorImplTest.java
+++ b/tools.descartes.dql.connector.simQPN/tests/tools/descartes/dql/connector/simQPN/PerformanceMetricsQueryConnectorImplTest.java
@@ -2,6 +2,7 @@ package tools.descartes.dql.connector.simQPN;
import static org.junit.Assert.*;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -18,6 +19,9 @@ import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import tools.descartes.dql.connector.simQPN.testUtils.TestUtil;
+import tools.descartes.dql.models.mapping.domain.DecimalResult;
+import tools.descartes.dql.models.mapping.domain.Probe;
+import tools.descartes.dql.models.mapping.domain.Resource;
import tools.descartes.dql.models.mapping.mapping.EntityMapping;
import tools.descartes.dql.models.mapping.mapping.MappingFactory;
import tools.descartes.dql.models.mapping.mapping.impl.MappingFactoryImpl;
@@ -53,17 +57,68 @@ public class PerformanceMetricsQueryConnectorImplTest {
request = msqc.requestProbes(request);
EntityMapping answer = pmqc.requestMetrics(request);
-// TestUtil.saveToFile(resultPath, TestUtil.entityMapptingToString(answer));
-// System.out.println(TestUtil.entityMapptingToString(answer));
+// TestUtil.saveToFile(resultPath, TestUtil.dumpResultsToString(answer));
- //check for expected answers
- if (!TestUtil.contentCompare(TestUtil.loadFromFile(resultPath),
- TestUtil.entityMapptingToString(answer))) {
- assertEquals(TestUtil.loadFromFile(resultPath),
- TestUtil.entityMapptingToString(answer));
+ Double[] expectedAnswers = loadDecimalResults(resultPath);
+ String[] metricNames = loadMetricNames(resultPath);
+
+ int i = 0;
+ List<String> failedComparisons = new LinkedList<String>();
+ for (Resource r: answer.getResources())
+ for (Probe p: r.getProbes())
+ if (p instanceof DecimalResult) {
+ DecimalResult d = (DecimalResult)p;
+ String metricName = (r.getIdentifier() + "." + d.getMetricName());
+ if (!metricName.equals(metricNames[i]))
+ fail("Metric #" + (i + 1) + " does not have the expected Name: expected '"
+ + metricNames[i] + "' but was '" + metricName);
+ Double expectedAnswer = expectedAnswers[i];
+ Double realAnswer = Double.valueOf(d.getValue().toString());
+ if (expectedAnswer != 0) {
+ Double percentage = realAnswer/(expectedAnswer/100);
+ if (percentage < 30 || percentage > 300)
+ failedComparisons.add(metricNames[i] + ": expected " + expectedAnswers[i]
+ + ", actual " + d.getValue());
+ } else
+ if (realAnswer != 0)
+ failedComparisons.add(metricNames[i] + ": expected " + expectedAnswers[i]
+ + ", actual " + d.getValue());
+ i++;
+ }
+ if (!failedComparisons.isEmpty())
+ fail(listToString(failedComparisons));
+ }
+
+ private static String listToString(List<String> list) {
+ String ret = "";
+ boolean firstline = true;
+ for (String s: list) {
+ if (!firstline)
+ ret += "\n";
+ else
+ firstline = false;
+ ret += s;
}
+ return ret;
}
+ private static Double[] loadDecimalResults(String path) {
+ String content = TestUtil.loadFromFile(path);
+ String[] firstSplit = content.split("\n");
+ Double[] result = new Double[firstSplit.length - 1];
+ for (int i = 0; i < firstSplit.length - 1; i++)
+ result[i] = Double.valueOf(firstSplit[i + 1].split(" ")[1]);
+ return result;
+ }
+
+ private static String[] loadMetricNames(String path) {
+ String content = TestUtil.loadFromFile(path);
+ String[] firstSplit = content.split("\n");
+ String[] result = new String[firstSplit.length - 1];
+ for (int i = 0; i < firstSplit.length - 1; i++)
+ result[i] = firstSplit[i + 1].split(" ")[0];
+ return result;
+ }
/*
* This test looks complicated, but is actually quite simple.
diff --git a/tools.descartes.dql.connector.simQPN/tests/tools/descartes/dql/connector/simQPN/testUtils/TestUtil.java b/tools.descartes.dql.connector.simQPN/tests/tools/descartes/dql/connector/simQPN/testUtils/TestUtil.java
index 16a1ce88414012e8eb10ea4bf37340f403f7b677..d68a291ad6699c3a3dd481f74709310166fab285 100644
--- a/tools.descartes.dql.connector.simQPN/tests/tools/descartes/dql/connector/simQPN/testUtils/TestUtil.java
+++ b/tools.descartes.dql.connector.simQPN/tests/tools/descartes/dql/connector/simQPN/testUtils/TestUtil.java
@@ -17,6 +17,18 @@ import tools.descartes.dql.models.mapping.mapping.EntityMapping;
public class TestUtil {
+ public static String dumpResultsToString(EntityMapping em) {
+ String result = "";
+ for (Resource r: em.getResources())
+ for (Probe p: r.getProbes())
+ if (p instanceof DecimalResult) {
+ DecimalResult dr = (DecimalResult)p;
+ result += "\n" + r.getIdentifier() + "." + dr.getMetricName()
+ + " " + dr.getValue();
+ }
+ return result;
+ }
+
public static String loadFromFile(String path) {
try {
return new String(Files.readAllBytes(Paths.get(path)));
@@ -100,7 +112,7 @@ public class TestUtil {
ret += p.getMetricName();
ret += " " + p.getAccuracy();
ret += " " + p.getValid();
- ret += " " + p.getValue().setScale(1, RoundingMode.HALF_UP);
+ ret += " " + Double.valueOf(p.getValue().toString());
return ret;
}