data-restructor 3.3.3 → 3.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. package/.github/ISSUE_TEMPLATE/bug_report.md +2 -2
  2. package/.github/workflows/codeql-analysis.yml +4 -4
  3. package/.github/workflows/continuous-integration.yaml +84 -0
  4. package/CHANGELOG.md +103 -75
  5. package/CONTRIBUTING.md +51 -43
  6. package/Commands.md +15 -15
  7. package/README.md +188 -137
  8. package/SECURITY.md +15 -0
  9. package/coverage/coverage-summary.json +4 -4
  10. package/coverage/datarestructor.js.html +446 -320
  11. package/coverage/describedfield.js.html +47 -47
  12. package/coverage/index.html +19 -19
  13. package/coverage/templateResolver.js.html +26 -26
  14. package/devdist/datarestructor-global-all.js +65 -23
  15. package/devdist/datarestructor-ie-global-all.js +65 -23
  16. package/devdist/datarestructor-ie.js +1479 -1616
  17. package/devdist/datarestructor.js +1439 -1559
  18. package/devdist/describedfield-ie.js +259 -279
  19. package/devdist/describedfield.js +257 -277
  20. package/devdist/templateResolver-ie.js +220 -252
  21. package/devdist/templateResolver.js +196 -227
  22. package/dist/datarestructor-global-all-min.js +1 -1
  23. package/dist/datarestructor-ie-global-all-min.js +1 -1
  24. package/dist/datarestructor-ie.js +1 -1
  25. package/dist/datarestructor-ie.js.map +1 -1
  26. package/dist/datarestructor.js +1 -1
  27. package/dist/datarestructor.js.map +1 -1
  28. package/dist/describedfield-ie.js +1 -1
  29. package/dist/describedfield-ie.js.map +1 -1
  30. package/dist/describedfield.js +1 -1
  31. package/dist/describedfield.js.map +1 -1
  32. package/dist/templateResolver-ie.js +1 -1
  33. package/dist/templateResolver-ie.js.map +1 -1
  34. package/dist/templateResolver.js +1 -1
  35. package/dist/templateResolver.js.map +1 -1
  36. package/docs/datarestructor.js.html +66 -24
  37. package/docs/describedfield.js.html +1 -1
  38. package/docs/index.html +49 -44
  39. package/docs/module-datarestructor.DescribedEntryCreator.html +1 -1
  40. package/docs/module-datarestructor.PropertyStructureDescriptionBuilder.html +1 -1
  41. package/docs/module-datarestructor.Restructor.html +3 -3
  42. package/docs/module-datarestructor.Transform.html +7 -30
  43. package/docs/module-datarestructor.html +100 -3
  44. package/docs/module-described_field.DescribedDataFieldBuilder.html +1 -1
  45. package/docs/module-described_field.DescribedDataFieldGroup.html +1 -1
  46. package/docs/module-described_field.html +1 -1
  47. package/docs/module-template_resolver.Resolver.html +1 -1
  48. package/docs/module-template_resolver.html +1 -1
  49. package/docs/templateResolver.js.html +1 -1
  50. package/package.json +16 -14
  51. package/renovate.json +20 -0
  52. package/src/js/datarestructor.js +65 -23
  53. package/test/js/DataRestructorUseCaseTest.js +36 -0
  54. package/.github/workflows/action.yaml +0 -44
package/coverage/datarestructor.js.html CHANGED
@@ -23,30 +23,30 @@
23
23
  <div class='clearfix'>
24
24
 
25
25
  <div class='fl pad1y space-right2'>
26
- <span class="strong">98.47% </span>
26
+ <span class="strong">97.99% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>321/326</span>
28
+ <span class='fraction'>342/349</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
- <span class="strong">93.52% </span>
33
+ <span class="strong">92.97% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>101/108</span>
35
+ <span class='fraction'>119/128</span>
36
36
  </div>
37
37
 
38
38
 
39
39
  <div class='fl pad1y space-right2'>
40
- <span class="strong">98.61% </span>
40
+ <span class="strong">98.68% </span>
41
41
  <span class="quiet">Functions</span>
42
- <span class='fraction'>71/72</span>
42
+ <span class='fraction'>75/76</span>
43
43
  </div>
44
44
 
45
45
 
46
46
  <div class='fl pad1y space-right2'>
47
- <span class="strong">98.45% </span>
47
+ <span class="strong">98.53% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>317/322</span>
49
+ <span class='fraction'>335/340</span>
50
50
  </div>
51
51
 
52
52
 
@@ -1253,7 +1253,49 @@
1253
1253
  <a name='L1194'></a><a href='#L1194'>1194</a>
1254
1254
  <a name='L1195'></a><a href='#L1195'>1195</a>
1255
1255
  <a name='L1196'></a><a href='#L1196'>1196</a>
1256
- <a name='L1197'></a><a href='#L1197'>1197</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
1256
+ <a name='L1197'></a><a href='#L1197'>1197</a>
1257
+ <a name='L1198'></a><a href='#L1198'>1198</a>
1258
+ <a name='L1199'></a><a href='#L1199'>1199</a>
1259
+ <a name='L1200'></a><a href='#L1200'>1200</a>
1260
+ <a name='L1201'></a><a href='#L1201'>1201</a>
1261
+ <a name='L1202'></a><a href='#L1202'>1202</a>
1262
+ <a name='L1203'></a><a href='#L1203'>1203</a>
1263
+ <a name='L1204'></a><a href='#L1204'>1204</a>
1264
+ <a name='L1205'></a><a href='#L1205'>1205</a>
1265
+ <a name='L1206'></a><a href='#L1206'>1206</a>
1266
+ <a name='L1207'></a><a href='#L1207'>1207</a>
1267
+ <a name='L1208'></a><a href='#L1208'>1208</a>
1268
+ <a name='L1209'></a><a href='#L1209'>1209</a>
1269
+ <a name='L1210'></a><a href='#L1210'>1210</a>
1270
+ <a name='L1211'></a><a href='#L1211'>1211</a>
1271
+ <a name='L1212'></a><a href='#L1212'>1212</a>
1272
+ <a name='L1213'></a><a href='#L1213'>1213</a>
1273
+ <a name='L1214'></a><a href='#L1214'>1214</a>
1274
+ <a name='L1215'></a><a href='#L1215'>1215</a>
1275
+ <a name='L1216'></a><a href='#L1216'>1216</a>
1276
+ <a name='L1217'></a><a href='#L1217'>1217</a>
1277
+ <a name='L1218'></a><a href='#L1218'>1218</a>
1278
+ <a name='L1219'></a><a href='#L1219'>1219</a>
1279
+ <a name='L1220'></a><a href='#L1220'>1220</a>
1280
+ <a name='L1221'></a><a href='#L1221'>1221</a>
1281
+ <a name='L1222'></a><a href='#L1222'>1222</a>
1282
+ <a name='L1223'></a><a href='#L1223'>1223</a>
1283
+ <a name='L1224'></a><a href='#L1224'>1224</a>
1284
+ <a name='L1225'></a><a href='#L1225'>1225</a>
1285
+ <a name='L1226'></a><a href='#L1226'>1226</a>
1286
+ <a name='L1227'></a><a href='#L1227'>1227</a>
1287
+ <a name='L1228'></a><a href='#L1228'>1228</a>
1288
+ <a name='L1229'></a><a href='#L1229'>1229</a>
1289
+ <a name='L1230'></a><a href='#L1230'>1230</a>
1290
+ <a name='L1231'></a><a href='#L1231'>1231</a>
1291
+ <a name='L1232'></a><a href='#L1232'>1232</a>
1292
+ <a name='L1233'></a><a href='#L1233'>1233</a>
1293
+ <a name='L1234'></a><a href='#L1234'>1234</a>
1294
+ <a name='L1235'></a><a href='#L1235'>1235</a>
1295
+ <a name='L1236'></a><a href='#L1236'>1236</a>
1296
+ <a name='L1237'></a><a href='#L1237'>1237</a>
1297
+ <a name='L1238'></a><a href='#L1238'>1238</a>
1298
+ <a name='L1239'></a><a href='#L1239'>1239</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
1257
1299
  <span class="cline-any cline-neutral">&nbsp;</span>
1258
1300
  <span class="cline-any cline-neutral">&nbsp;</span>
1259
1301
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1328,7 +1370,7 @@
1328
1370
  <span class="cline-any cline-neutral">&nbsp;</span>
1329
1371
  <span class="cline-any cline-neutral">&nbsp;</span>
1330
1372
  <span class="cline-any cline-neutral">&nbsp;</span>
1331
- <span class="cline-any cline-yes">231x</span>
1373
+ <span class="cline-any cline-yes">241x</span>
1332
1374
  <span class="cline-any cline-neutral">&nbsp;</span>
1333
1375
  <span class="cline-any cline-neutral">&nbsp;</span>
1334
1376
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1358,9 +1400,9 @@
1358
1400
  <span class="cline-any cline-neutral">&nbsp;</span>
1359
1401
  <span class="cline-any cline-neutral">&nbsp;</span>
1360
1402
  <span class="cline-any cline-neutral">&nbsp;</span>
1361
- <span class="cline-any cline-yes">231x</span>
1362
- <span class="cline-any cline-yes">182x</span>
1363
- <span class="cline-any cline-yes">182x</span>
1403
+ <span class="cline-any cline-yes">241x</span>
1404
+ <span class="cline-any cline-yes">192x</span>
1405
+ <span class="cline-any cline-yes">192x</span>
1364
1406
  <span class="cline-any cline-neutral">&nbsp;</span>
1365
1407
  <span class="cline-any cline-neutral">&nbsp;</span>
1366
1408
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1374,9 +1416,9 @@
1374
1416
  <span class="cline-any cline-neutral">&nbsp;</span>
1375
1417
  <span class="cline-any cline-neutral">&nbsp;</span>
1376
1418
  <span class="cline-any cline-neutral">&nbsp;</span>
1377
- <span class="cline-any cline-yes">231x</span>
1378
- <span class="cline-any cline-yes">182x</span>
1379
- <span class="cline-any cline-yes">182x</span>
1419
+ <span class="cline-any cline-yes">241x</span>
1420
+ <span class="cline-any cline-yes">192x</span>
1421
+ <span class="cline-any cline-yes">192x</span>
1380
1422
  <span class="cline-any cline-neutral">&nbsp;</span>
1381
1423
  <span class="cline-any cline-neutral">&nbsp;</span>
1382
1424
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1390,7 +1432,7 @@
1390
1432
  <span class="cline-any cline-neutral">&nbsp;</span>
1391
1433
  <span class="cline-any cline-neutral">&nbsp;</span>
1392
1434
  <span class="cline-any cline-neutral">&nbsp;</span>
1393
- <span class="cline-any cline-yes">231x</span>
1435
+ <span class="cline-any cline-yes">241x</span>
1394
1436
  <span class="cline-any cline-yes">16x</span>
1395
1437
  <span class="cline-any cline-yes">16x</span>
1396
1438
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1402,7 +1444,7 @@
1402
1444
  <span class="cline-any cline-neutral">&nbsp;</span>
1403
1445
  <span class="cline-any cline-neutral">&nbsp;</span>
1404
1446
  <span class="cline-any cline-neutral">&nbsp;</span>
1405
- <span class="cline-any cline-yes">231x</span>
1447
+ <span class="cline-any cline-yes">241x</span>
1406
1448
  <span class="cline-any cline-yes">16x</span>
1407
1449
  <span class="cline-any cline-yes">16x</span>
1408
1450
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1414,9 +1456,9 @@
1414
1456
  <span class="cline-any cline-neutral">&nbsp;</span>
1415
1457
  <span class="cline-any cline-neutral">&nbsp;</span>
1416
1458
  <span class="cline-any cline-neutral">&nbsp;</span>
1417
- <span class="cline-any cline-yes">231x</span>
1418
- <span class="cline-any cline-yes">55x</span>
1419
- <span class="cline-any cline-yes">55x</span>
1459
+ <span class="cline-any cline-yes">241x</span>
1460
+ <span class="cline-any cline-yes">59x</span>
1461
+ <span class="cline-any cline-yes">59x</span>
1420
1462
  <span class="cline-any cline-neutral">&nbsp;</span>
1421
1463
  <span class="cline-any cline-neutral">&nbsp;</span>
1422
1464
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1429,9 +1471,9 @@
1429
1471
  <span class="cline-any cline-neutral">&nbsp;</span>
1430
1472
  <span class="cline-any cline-neutral">&nbsp;</span>
1431
1473
  <span class="cline-any cline-neutral">&nbsp;</span>
1432
- <span class="cline-any cline-yes">231x</span>
1433
- <span class="cline-any cline-yes">88x</span>
1434
- <span class="cline-any cline-yes">88x</span>
1474
+ <span class="cline-any cline-yes">241x</span>
1475
+ <span class="cline-any cline-yes">94x</span>
1476
+ <span class="cline-any cline-yes">94x</span>
1435
1477
  <span class="cline-any cline-neutral">&nbsp;</span>
1436
1478
  <span class="cline-any cline-neutral">&nbsp;</span>
1437
1479
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1446,9 +1488,9 @@
1446
1488
  <span class="cline-any cline-neutral">&nbsp;</span>
1447
1489
  <span class="cline-any cline-neutral">&nbsp;</span>
1448
1490
  <span class="cline-any cline-neutral">&nbsp;</span>
1449
- <span class="cline-any cline-yes">231x</span>
1450
- <span class="cline-any cline-yes">142x</span>
1451
- <span class="cline-any cline-yes">142x</span>
1491
+ <span class="cline-any cline-yes">241x</span>
1492
+ <span class="cline-any cline-yes">152x</span>
1493
+ <span class="cline-any cline-yes">152x</span>
1452
1494
  <span class="cline-any cline-neutral">&nbsp;</span>
1453
1495
  <span class="cline-any cline-neutral">&nbsp;</span>
1454
1496
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1461,9 +1503,9 @@
1461
1503
  <span class="cline-any cline-neutral">&nbsp;</span>
1462
1504
  <span class="cline-any cline-neutral">&nbsp;</span>
1463
1505
  <span class="cline-any cline-neutral">&nbsp;</span>
1464
- <span class="cline-any cline-yes">231x</span>
1465
- <span class="cline-any cline-yes">131x</span>
1466
- <span class="cline-any cline-yes">131x</span>
1506
+ <span class="cline-any cline-yes">241x</span>
1507
+ <span class="cline-any cline-yes">141x</span>
1508
+ <span class="cline-any cline-yes">141x</span>
1467
1509
  <span class="cline-any cline-neutral">&nbsp;</span>
1468
1510
  <span class="cline-any cline-neutral">&nbsp;</span>
1469
1511
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1478,18 +1520,18 @@
1478
1520
  <span class="cline-any cline-neutral">&nbsp;</span>
1479
1521
  <span class="cline-any cline-neutral">&nbsp;</span>
1480
1522
  <span class="cline-any cline-neutral">&nbsp;</span>
1481
- <span class="cline-any cline-yes">231x</span>
1482
- <span class="cline-any cline-yes">231x</span>
1483
- <span class="cline-any cline-yes">231x</span>
1523
+ <span class="cline-any cline-yes">241x</span>
1524
+ <span class="cline-any cline-yes">241x</span>
1525
+ <span class="cline-any cline-yes">241x</span>
1484
1526
  <span class="cline-any cline-yes">1x</span>
1485
1527
  <span class="cline-any cline-neutral">&nbsp;</span>
1486
- <span class="cline-any cline-yes">230x</span>
1528
+ <span class="cline-any cline-yes">240x</span>
1487
1529
  <span class="cline-any cline-neutral">&nbsp;</span>
1488
1530
  <span class="cline-any cline-neutral">&nbsp;</span>
1489
- <span class="cline-any cline-yes">230x</span>
1531
+ <span class="cline-any cline-yes">240x</span>
1490
1532
  <span class="cline-any cline-neutral">&nbsp;</span>
1491
1533
  <span class="cline-any cline-neutral">&nbsp;</span>
1492
- <span class="cline-any cline-yes">230x</span>
1534
+ <span class="cline-any cline-yes">240x</span>
1493
1535
  <span class="cline-any cline-neutral">&nbsp;</span>
1494
1536
  <span class="cline-any cline-neutral">&nbsp;</span>
1495
1537
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1504,9 +1546,9 @@
1504
1546
  <span class="cline-any cline-neutral">&nbsp;</span>
1505
1547
  <span class="cline-any cline-neutral">&nbsp;</span>
1506
1548
  <span class="cline-any cline-neutral">&nbsp;</span>
1507
- <span class="cline-any cline-yes">231x</span>
1508
- <span class="cline-any cline-yes">231x</span>
1509
- <span class="cline-any cline-yes">231x</span>
1549
+ <span class="cline-any cline-yes">241x</span>
1550
+ <span class="cline-any cline-yes">241x</span>
1551
+ <span class="cline-any cline-yes">241x</span>
1510
1552
  <span class="cline-any cline-neutral">&nbsp;</span>
1511
1553
  <span class="cline-any cline-neutral">&nbsp;</span>
1512
1554
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1516,9 +1558,9 @@
1516
1558
  <span class="cline-any cline-neutral">&nbsp;</span>
1517
1559
  <span class="cline-any cline-neutral">&nbsp;</span>
1518
1560
  <span class="cline-any cline-neutral">&nbsp;</span>
1519
- <span class="cline-any cline-yes">231x</span>
1520
- <span class="cline-any cline-yes">131x</span>
1521
- <span class="cline-any cline-yes">131x</span>
1561
+ <span class="cline-any cline-yes">241x</span>
1562
+ <span class="cline-any cline-yes">141x</span>
1563
+ <span class="cline-any cline-yes">141x</span>
1522
1564
  <span class="cline-any cline-neutral">&nbsp;</span>
1523
1565
  <span class="cline-any cline-neutral">&nbsp;</span>
1524
1566
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1530,9 +1572,9 @@
1530
1572
  <span class="cline-any cline-neutral">&nbsp;</span>
1531
1573
  <span class="cline-any cline-neutral">&nbsp;</span>
1532
1574
  <span class="cline-any cline-neutral">&nbsp;</span>
1533
- <span class="cline-any cline-yes">231x</span>
1534
- <span class="cline-any cline-yes">131x</span>
1535
- <span class="cline-any cline-yes">131x</span>
1575
+ <span class="cline-any cline-yes">241x</span>
1576
+ <span class="cline-any cline-yes">141x</span>
1577
+ <span class="cline-any cline-yes">141x</span>
1536
1578
  <span class="cline-any cline-neutral">&nbsp;</span>
1537
1579
  <span class="cline-any cline-neutral">&nbsp;</span>
1538
1580
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1544,9 +1586,9 @@
1544
1586
  <span class="cline-any cline-neutral">&nbsp;</span>
1545
1587
  <span class="cline-any cline-neutral">&nbsp;</span>
1546
1588
  <span class="cline-any cline-neutral">&nbsp;</span>
1547
- <span class="cline-any cline-yes">231x</span>
1548
- <span class="cline-any cline-yes">53x</span>
1549
- <span class="cline-any cline-yes">53x</span>
1589
+ <span class="cline-any cline-yes">241x</span>
1590
+ <span class="cline-any cline-yes">57x</span>
1591
+ <span class="cline-any cline-yes">57x</span>
1550
1592
  <span class="cline-any cline-neutral">&nbsp;</span>
1551
1593
  <span class="cline-any cline-neutral">&nbsp;</span>
1552
1594
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1557,9 +1599,9 @@
1557
1599
  <span class="cline-any cline-neutral">&nbsp;</span>
1558
1600
  <span class="cline-any cline-neutral">&nbsp;</span>
1559
1601
  <span class="cline-any cline-neutral">&nbsp;</span>
1560
- <span class="cline-any cline-yes">231x</span>
1561
- <span class="cline-any cline-yes">231x</span>
1562
- <span class="cline-any cline-yes">231x</span>
1602
+ <span class="cline-any cline-yes">241x</span>
1603
+ <span class="cline-any cline-yes">241x</span>
1604
+ <span class="cline-any cline-yes">241x</span>
1563
1605
  <span class="cline-any cline-neutral">&nbsp;</span>
1564
1606
  <span class="cline-any cline-neutral">&nbsp;</span>
1565
1607
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1571,133 +1613,133 @@
1571
1613
  <span class="cline-any cline-neutral">&nbsp;</span>
1572
1614
  <span class="cline-any cline-neutral">&nbsp;</span>
1573
1615
  <span class="cline-any cline-neutral">&nbsp;</span>
1574
- <span class="cline-any cline-yes">231x</span>
1575
- <span class="cline-any cline-yes">53x</span>
1576
- <span class="cline-any cline-yes">53x</span>
1616
+ <span class="cline-any cline-yes">241x</span>
1617
+ <span class="cline-any cline-yes">57x</span>
1618
+ <span class="cline-any cline-yes">57x</span>
1577
1619
  <span class="cline-any cline-neutral">&nbsp;</span>
1578
1620
  <span class="cline-any cline-neutral">&nbsp;</span>
1579
1621
  <span class="cline-any cline-neutral">&nbsp;</span>
1580
1622
  <span class="cline-any cline-neutral">&nbsp;</span>
1581
1623
  <span class="cline-any cline-neutral">&nbsp;</span>
1582
1624
  <span class="cline-any cline-neutral">&nbsp;</span>
1583
- <span class="cline-any cline-yes">231x</span>
1584
- <span class="cline-any cline-yes">231x</span>
1585
- <span class="cline-any cline-yes">231x</span>
1586
- <span class="cline-any cline-yes">228x</span>
1625
+ <span class="cline-any cline-yes">241x</span>
1626
+ <span class="cline-any cline-yes">241x</span>
1627
+ <span class="cline-any cline-yes">241x</span>
1628
+ <span class="cline-any cline-yes">238x</span>
1587
1629
  <span class="cline-any cline-neutral">&nbsp;</span>
1588
- <span class="cline-any cline-yes">231x</span>
1589
- <span class="cline-any cline-yes">228x</span>
1630
+ <span class="cline-any cline-yes">241x</span>
1631
+ <span class="cline-any cline-yes">238x</span>
1590
1632
  <span class="cline-any cline-neutral">&nbsp;</span>
1591
- <span class="cline-any cline-yes">231x</span>
1592
- <span class="cline-any cline-yes">204x</span>
1633
+ <span class="cline-any cline-yes">241x</span>
1634
+ <span class="cline-any cline-yes">212x</span>
1593
1635
  <span class="cline-any cline-neutral">&nbsp;</span>
1594
- <span class="cline-any cline-yes">231x</span>
1636
+ <span class="cline-any cline-yes">241x</span>
1595
1637
  <span class="cline-any cline-neutral">&nbsp;</span>
1596
1638
  <span class="cline-any cline-neutral">&nbsp;</span>
1597
1639
  <span class="cline-any cline-neutral">&nbsp;</span>
1598
1640
  <span class="cline-any cline-neutral">&nbsp;</span>
1599
- <span class="cline-any cline-yes">462x</span>
1641
+ <span class="cline-any cline-yes">482x</span>
1600
1642
  <span class="cline-any cline-yes">2x</span>
1601
1643
  <span class="cline-any cline-yes">2x</span>
1602
1644
  <span class="cline-any cline-neutral">&nbsp;</span>
1603
1645
  <span class="cline-any cline-neutral">&nbsp;</span>
1604
- <span class="cline-any cline-yes">460x</span>
1605
- <span class="cline-any cline-yes">176x</span>
1606
- <span class="cline-any cline-yes">176x</span>
1646
+ <span class="cline-any cline-yes">480x</span>
1647
+ <span class="cline-any cline-yes">188x</span>
1648
+ <span class="cline-any cline-yes">188x</span>
1607
1649
  <span class="cline-any cline-neutral">&nbsp;</span>
1608
- <span class="cline-any cline-yes">284x</span>
1650
+ <span class="cline-any cline-yes">292x</span>
1609
1651
  <span class="cline-any cline-neutral">&nbsp;</span>
1610
1652
  <span class="cline-any cline-neutral">&nbsp;</span>
1611
1653
  <span class="cline-any cline-neutral">&nbsp;</span>
1612
- <span class="cline-any cline-yes">231x</span>
1613
- <span class="cline-any cline-yes">231x</span>
1654
+ <span class="cline-any cline-yes">241x</span>
1655
+ <span class="cline-any cline-yes">241x</span>
1614
1656
  <span class="cline-any cline-yes">89x</span>
1615
1657
  <span class="cline-any cline-no">&nbsp;</span>
1616
1658
  <span class="cline-any cline-neutral">&nbsp;</span>
1617
1659
  <span class="cline-any cline-neutral">&nbsp;</span>
1618
- <span class="cline-any cline-yes">142x</span>
1619
- <span class="cline-any cline-yes">87x</span>
1620
- <span class="cline-any cline-yes">33293x</span>
1660
+ <span class="cline-any cline-yes">152x</span>
1661
+ <span class="cline-any cline-yes">93x</span>
1662
+ <span class="cline-any cline-yes">77753x</span>
1621
1663
  <span class="cline-any cline-neutral">&nbsp;</span>
1622
1664
  <span class="cline-any cline-neutral">&nbsp;</span>
1623
- <span class="cline-any cline-yes">55x</span>
1624
- <span class="cline-any cline-yes">22194x</span>
1665
+ <span class="cline-any cline-yes">59x</span>
1666
+ <span class="cline-any cline-yes">51834x</span>
1625
1667
  <span class="cline-any cline-neutral">&nbsp;</span>
1626
1668
  <span class="cline-any cline-neutral">&nbsp;</span>
1627
1669
  <span class="cline-any cline-neutral">&nbsp;</span>
1628
1670
  <span class="cline-any cline-neutral">&nbsp;</span>
1629
- <span class="cline-any cline-yes">1330x</span>
1630
- <span class="cline-any cline-yes">1330x</span>
1631
- <span class="cline-any cline-yes">1330x</span>
1632
- <span class="cline-any cline-yes">1328x</span>
1671
+ <span class="cline-any cline-yes">2890x</span>
1672
+ <span class="cline-any cline-yes">2890x</span>
1673
+ <span class="cline-any cline-yes">2890x</span>
1674
+ <span class="cline-any cline-yes">2888x</span>
1633
1675
  <span class="cline-any cline-neutral">&nbsp;</span>
1634
1676
  <span class="cline-any cline-yes">2x</span>
1635
1677
  <span class="cline-any cline-neutral">&nbsp;</span>
1636
1678
  <span class="cline-any cline-neutral">&nbsp;</span>
1637
1679
  <span class="cline-any cline-neutral">&nbsp;</span>
1638
- <span class="cline-any cline-yes">10302x</span>
1639
- <span class="cline-any cline-yes">10301x</span>
1680
+ <span class="cline-any cline-yes">23952x</span>
1681
+ <span class="cline-any cline-yes">23951x</span>
1640
1682
  <span class="cline-any cline-neutral">&nbsp;</span>
1641
1683
  <span class="cline-any cline-yes">1x</span>
1642
1684
  <span class="cline-any cline-neutral">&nbsp;</span>
1643
1685
  <span class="cline-any cline-neutral">&nbsp;</span>
1644
1686
  <span class="cline-any cline-neutral">&nbsp;</span>
1645
- <span class="cline-any cline-yes">230x</span>
1646
- <span class="cline-any cline-yes">10302x</span>
1687
+ <span class="cline-any cline-yes">240x</span>
1688
+ <span class="cline-any cline-yes">23952x</span>
1647
1689
  <span class="cline-any cline-neutral">&nbsp;</span>
1648
1690
  <span class="cline-any cline-neutral">&nbsp;</span>
1649
1691
  <span class="cline-any cline-neutral">&nbsp;</span>
1650
1692
  <span class="cline-any cline-neutral">&nbsp;</span>
1651
- <span class="cline-any cline-yes">230x</span>
1652
- <span class="cline-any cline-yes">10302x</span>
1653
- <span class="cline-any cline-yes">10302x</span>
1654
- <span class="cline-any cline-yes">10302x</span>
1693
+ <span class="cline-any cline-yes">240x</span>
1694
+ <span class="cline-any cline-yes">23952x</span>
1695
+ <span class="cline-any cline-yes">23952x</span>
1696
+ <span class="cline-any cline-yes">23952x</span>
1655
1697
  <span class="cline-any cline-neutral">&nbsp;</span>
1656
1698
  <span class="cline-any cline-neutral">&nbsp;</span>
1657
1699
  <span class="cline-any cline-neutral">&nbsp;</span>
1658
1700
  <span class="cline-any cline-neutral">&nbsp;</span>
1659
- <span class="cline-any cline-yes">176x</span>
1660
- <span class="cline-any cline-yes">19276x</span>
1661
- <span class="cline-any cline-yes">19276x</span>
1662
- <span class="cline-any cline-yes">19276x</span>
1663
- <span class="cline-any cline-yes">19274x</span>
1701
+ <span class="cline-any cline-yes">188x</span>
1702
+ <span class="cline-any cline-yes">45016x</span>
1703
+ <span class="cline-any cline-yes">45016x</span>
1704
+ <span class="cline-any cline-yes">45016x</span>
1705
+ <span class="cline-any cline-yes">45014x</span>
1664
1706
  <span class="cline-any cline-neutral">&nbsp;</span>
1665
1707
  <span class="cline-any cline-yes">2x</span>
1666
1708
  <span class="cline-any cline-neutral">&nbsp;</span>
1667
1709
  <span class="cline-any cline-neutral">&nbsp;</span>
1668
1710
  <span class="cline-any cline-neutral">&nbsp;</span>
1669
1711
  <span class="cline-any cline-neutral">&nbsp;</span>
1670
- <span class="cline-any cline-yes">284x</span>
1671
- <span class="cline-any cline-yes">1328x</span>
1712
+ <span class="cline-any cline-yes">292x</span>
1713
+ <span class="cline-any cline-yes">2888x</span>
1672
1714
  <span class="cline-any cline-neutral">&nbsp;</span>
1673
1715
  <span class="cline-any cline-neutral">&nbsp;</span>
1674
1716
  <span class="cline-any cline-neutral">&nbsp;</span>
1675
1717
  <span class="cline-any cline-neutral">&nbsp;</span>
1676
- <span class="cline-any cline-yes">33293x</span>
1677
- <span class="cline-any cline-yes">33293x</span>
1718
+ <span class="cline-any cline-yes">77753x</span>
1719
+ <span class="cline-any cline-yes">77753x</span>
1678
1720
  <span class="cline-any cline-neutral">&nbsp;</span>
1679
1721
  <span class="cline-any cline-neutral">&nbsp;</span>
1680
1722
  <span class="cline-any cline-neutral">&nbsp;</span>
1681
- <span class="cline-any cline-yes">52569x</span>
1682
- <span class="cline-any cline-yes">52569x</span>
1683
- <span class="cline-any cline-yes">19276x</span>
1723
+ <span class="cline-any cline-yes">122769x</span>
1724
+ <span class="cline-any cline-yes">122769x</span>
1725
+ <span class="cline-any cline-yes">45016x</span>
1684
1726
  <span class="cline-any cline-neutral">&nbsp;</span>
1685
- <span class="cline-any cline-yes">52569x</span>
1686
- <span class="cline-any cline-yes">52569x</span>
1687
- <span class="cline-any cline-yes">52569x</span>
1727
+ <span class="cline-any cline-yes">122769x</span>
1728
+ <span class="cline-any cline-yes">122769x</span>
1729
+ <span class="cline-any cline-yes">122769x</span>
1688
1730
  <span class="cline-any cline-neutral">&nbsp;</span>
1689
1731
  <span class="cline-any cline-neutral">&nbsp;</span>
1690
1732
  <span class="cline-any cline-neutral">&nbsp;</span>
1691
- <span class="cline-any cline-yes">71845x</span>
1692
- <span class="cline-any cline-yes">71845x</span>
1733
+ <span class="cline-any cline-yes">167785x</span>
1734
+ <span class="cline-any cline-yes">167785x</span>
1693
1735
  <span class="cline-any cline-neutral">&nbsp;</span>
1694
1736
  <span class="cline-any cline-neutral">&nbsp;</span>
1695
1737
  <span class="cline-any cline-neutral">&nbsp;</span>
1696
- <span class="cline-any cline-yes">1268x</span>
1738
+ <span class="cline-any cline-yes">1346x</span>
1697
1739
  <span class="cline-any cline-neutral">&nbsp;</span>
1698
1740
  <span class="cline-any cline-neutral">&nbsp;</span>
1699
1741
  <span class="cline-any cline-neutral">&nbsp;</span>
1700
- <span class="cline-any cline-yes">2192x</span>
1742
+ <span class="cline-any cline-yes">2310x</span>
1701
1743
  <span class="cline-any cline-neutral">&nbsp;</span>
1702
1744
  <span class="cline-any cline-neutral">&nbsp;</span>
1703
1745
  <span class="cline-any cline-yes">1x</span>
@@ -1763,28 +1805,28 @@
1763
1805
  <span class="cline-any cline-neutral">&nbsp;</span>
1764
1806
  <span class="cline-any cline-neutral">&nbsp;</span>
1765
1807
  <span class="cline-any cline-neutral">&nbsp;</span>
1766
- <span class="cline-any cline-yes">10294x</span>
1767
- <span class="cline-any cline-yes">10294x</span>
1768
- <span class="cline-any cline-yes">10294x</span>
1769
- <span class="cline-any cline-yes">10294x</span>
1770
- <span class="cline-any cline-yes">10294x</span>
1771
- <span class="cline-any cline-yes">10294x</span>
1772
- <span class="cline-any cline-yes">10294x</span>
1808
+ <span class="cline-any cline-yes">23944x</span>
1809
+ <span class="cline-any cline-yes">23944x</span>
1810
+ <span class="cline-any cline-yes">23944x</span>
1811
+ <span class="cline-any cline-yes">23944x</span>
1812
+ <span class="cline-any cline-yes">23944x</span>
1813
+ <span class="cline-any cline-yes">23944x</span>
1814
+ <span class="cline-any cline-yes">23944x</span>
1773
1815
  <span class="cline-any cline-neutral">&nbsp;</span>
1774
1816
  <span class="cline-any cline-neutral">&nbsp;</span>
1775
1817
  <span class="cline-any cline-neutral">&nbsp;</span>
1776
1818
  <span class="cline-any cline-neutral">&nbsp;</span>
1777
1819
  <span class="cline-any cline-neutral">&nbsp;</span>
1778
1820
  <span class="cline-any cline-neutral">&nbsp;</span>
1779
- <span class="cline-any cline-yes">10294x</span>
1780
- <span class="cline-any cline-yes">10294x</span>
1781
- <span class="cline-any cline-yes">10294x</span>
1782
- <span class="cline-any cline-yes">10294x</span>
1783
- <span class="cline-any cline-yes">10294x</span>
1784
- <span class="cline-any cline-yes">10294x</span>
1785
- <span class="cline-any cline-yes">10294x</span>
1821
+ <span class="cline-any cline-yes">23944x</span>
1822
+ <span class="cline-any cline-yes">23944x</span>
1823
+ <span class="cline-any cline-yes">23944x</span>
1824
+ <span class="cline-any cline-yes">23944x</span>
1825
+ <span class="cline-any cline-yes">23944x</span>
1826
+ <span class="cline-any cline-yes">23944x</span>
1827
+ <span class="cline-any cline-yes">23944x</span>
1786
1828
  <span class="cline-any cline-neutral">&nbsp;</span>
1787
- <span class="cline-any cline-yes">10294x</span>
1829
+ <span class="cline-any cline-yes">23944x</span>
1788
1830
  <span class="cline-any cline-neutral">&nbsp;</span>
1789
1831
  <span class="cline-any cline-neutral">&nbsp;</span>
1790
1832
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1792,15 +1834,15 @@
1792
1834
  <span class="cline-any cline-neutral">&nbsp;</span>
1793
1835
  <span class="cline-any cline-neutral">&nbsp;</span>
1794
1836
  <span class="cline-any cline-neutral">&nbsp;</span>
1795
- <span class="cline-any cline-yes">10294x</span>
1837
+ <span class="cline-any cline-yes">23944x</span>
1796
1838
  <span class="cline-any cline-neutral">&nbsp;</span>
1797
1839
  <span class="cline-any cline-neutral">&nbsp;</span>
1798
1840
  <span class="cline-any cline-neutral">&nbsp;</span>
1799
- <span class="cline-any cline-yes">10294x</span>
1841
+ <span class="cline-any cline-yes">23944x</span>
1800
1842
  <span class="cline-any cline-neutral">&nbsp;</span>
1801
1843
  <span class="cline-any cline-neutral">&nbsp;</span>
1802
1844
  <span class="cline-any cline-neutral">&nbsp;</span>
1803
- <span class="cline-any cline-yes">10294x</span>
1845
+ <span class="cline-any cline-yes">23944x</span>
1804
1846
  <span class="cline-any cline-neutral">&nbsp;</span>
1805
1847
  <span class="cline-any cline-neutral">&nbsp;</span>
1806
1848
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1810,8 +1852,8 @@
1810
1852
  <span class="cline-any cline-neutral">&nbsp;</span>
1811
1853
  <span class="cline-any cline-neutral">&nbsp;</span>
1812
1854
  <span class="cline-any cline-neutral">&nbsp;</span>
1813
- <span class="cline-any cline-yes">10294x</span>
1814
- <span class="cline-any cline-yes">9668x</span>
1855
+ <span class="cline-any cline-yes">23944x</span>
1856
+ <span class="cline-any cline-yes">22542x</span>
1815
1857
  <span class="cline-any cline-neutral">&nbsp;</span>
1816
1858
  <span class="cline-any cline-neutral">&nbsp;</span>
1817
1859
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1819,16 +1861,16 @@
1819
1861
  <span class="cline-any cline-neutral">&nbsp;</span>
1820
1862
  <span class="cline-any cline-neutral">&nbsp;</span>
1821
1863
  <span class="cline-any cline-neutral">&nbsp;</span>
1822
- <span class="cline-any cline-yes">10294x</span>
1823
- <span class="cline-any cline-yes">9780x</span>
1824
- <span class="cline-any cline-yes">336x</span>
1825
- <span class="cline-any cline-yes">336x</span>
1864
+ <span class="cline-any cline-yes">23944x</span>
1865
+ <span class="cline-any cline-yes">22668x</span>
1866
+ <span class="cline-any cline-yes">378x</span>
1867
+ <span class="cline-any cline-yes">378x</span>
1826
1868
  <span class="cline-any cline-neutral">&nbsp;</span>
1827
1869
  <span class="cline-any cline-neutral">&nbsp;</span>
1828
1870
  <span class="cline-any cline-neutral">&nbsp;</span>
1829
- <span class="cline-any cline-yes">9780x</span>
1830
- <span class="cline-any cline-yes">16530x</span>
1831
- <span class="cline-any cline-yes">16530x</span>
1871
+ <span class="cline-any cline-yes">22668x</span>
1872
+ <span class="cline-any cline-yes">38569x</span>
1873
+ <span class="cline-any cline-yes">38569x</span>
1832
1874
  <span class="cline-any cline-neutral">&nbsp;</span>
1833
1875
  <span class="cline-any cline-neutral">&nbsp;</span>
1834
1876
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1847,8 +1889,8 @@
1847
1889
  <span class="cline-any cline-neutral">&nbsp;</span>
1848
1890
  <span class="cline-any cline-neutral">&nbsp;</span>
1849
1891
  <span class="cline-any cline-neutral">&nbsp;</span>
1850
- <span class="cline-any cline-yes">10294x</span>
1851
- <span class="cline-any cline-yes">10294x</span>
1892
+ <span class="cline-any cline-yes">23944x</span>
1893
+ <span class="cline-any cline-yes">23944x</span>
1852
1894
  <span class="cline-any cline-neutral">&nbsp;</span>
1853
1895
  <span class="cline-any cline-neutral">&nbsp;</span>
1854
1896
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1861,20 +1903,20 @@
1861
1903
  <span class="cline-any cline-neutral">&nbsp;</span>
1862
1904
  <span class="cline-any cline-neutral">&nbsp;</span>
1863
1905
  <span class="cline-any cline-neutral">&nbsp;</span>
1864
- <span class="cline-any cline-yes">10294x</span>
1865
- <span class="cline-any cline-yes">10294x</span>
1906
+ <span class="cline-any cline-yes">23944x</span>
1907
+ <span class="cline-any cline-yes">23944x</span>
1866
1908
  <span class="cline-any cline-neutral">&nbsp;</span>
1867
- <span class="cline-any cline-yes">10294x</span>
1868
- <span class="cline-any cline-yes">31832x</span>
1869
- <span class="cline-any cline-yes">31832x</span>
1870
- <span class="cline-any cline-yes">21538x</span>
1871
- <span class="cline-any cline-yes">11244x</span>
1909
+ <span class="cline-any cline-yes">23944x</span>
1910
+ <span class="cline-any cline-yes">73952x</span>
1911
+ <span class="cline-any cline-yes">73952x</span>
1912
+ <span class="cline-any cline-yes">50008x</span>
1913
+ <span class="cline-any cline-yes">26064x</span>
1872
1914
  <span class="cline-any cline-neutral">&nbsp;</span>
1873
- <span class="cline-any cline-yes">21538x</span>
1874
- <span class="cline-any cline-yes">21538x</span>
1915
+ <span class="cline-any cline-yes">50008x</span>
1916
+ <span class="cline-any cline-yes">50008x</span>
1875
1917
  <span class="cline-any cline-neutral">&nbsp;</span>
1876
1918
  <span class="cline-any cline-neutral">&nbsp;</span>
1877
- <span class="cline-any cline-yes">10294x</span>
1919
+ <span class="cline-any cline-yes">23944x</span>
1878
1920
  <span class="cline-any cline-neutral">&nbsp;</span>
1879
1921
  <span class="cline-any cline-neutral">&nbsp;</span>
1880
1922
  <span class="cline-any cline-yes">1x</span>
@@ -1902,13 +1944,13 @@
1902
1944
  <span class="cline-any cline-neutral">&nbsp;</span>
1903
1945
  <span class="cline-any cline-neutral">&nbsp;</span>
1904
1946
  <span class="cline-any cline-neutral">&nbsp;</span>
1905
- <span class="cline-any cline-yes">26x</span>
1947
+ <span class="cline-any cline-yes">28x</span>
1906
1948
  <span class="cline-any cline-neutral">&nbsp;</span>
1907
1949
  <span class="cline-any cline-neutral">&nbsp;</span>
1908
1950
  <span class="cline-any cline-neutral">&nbsp;</span>
1909
1951
  <span class="cline-any cline-neutral">&nbsp;</span>
1910
1952
  <span class="cline-any cline-neutral">&nbsp;</span>
1911
- <span class="cline-any cline-yes">26x</span>
1953
+ <span class="cline-any cline-yes">28x</span>
1912
1954
  <span class="cline-any cline-neutral">&nbsp;</span>
1913
1955
  <span class="cline-any cline-neutral">&nbsp;</span>
1914
1956
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1940,9 +1982,9 @@
1940
1982
  <span class="cline-any cline-neutral">&nbsp;</span>
1941
1983
  <span class="cline-any cline-neutral">&nbsp;</span>
1942
1984
  <span class="cline-any cline-neutral">&nbsp;</span>
1943
- <span class="cline-any cline-yes">26x</span>
1944
- <span class="cline-any cline-yes">2x</span>
1945
- <span class="cline-any cline-yes">2x</span>
1985
+ <span class="cline-any cline-yes">28x</span>
1986
+ <span class="cline-any cline-yes">4x</span>
1987
+ <span class="cline-any cline-yes">4x</span>
1946
1988
  <span class="cline-any cline-neutral">&nbsp;</span>
1947
1989
  <span class="cline-any cline-neutral">&nbsp;</span>
1948
1990
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1950,12 +1992,12 @@
1950
1992
  <span class="cline-any cline-neutral">&nbsp;</span>
1951
1993
  <span class="cline-any cline-neutral">&nbsp;</span>
1952
1994
  <span class="cline-any cline-neutral">&nbsp;</span>
1953
- <span class="cline-any cline-yes">26x</span>
1954
- <span class="cline-any cline-yes">3x</span>
1995
+ <span class="cline-any cline-yes">28x</span>
1996
+ <span class="cline-any cline-yes">5x</span>
1955
1997
  <span class="cline-any cline-yes">2x</span>
1956
1998
  <span class="cline-any cline-neutral">&nbsp;</span>
1957
- <span class="cline-any cline-yes">1x</span>
1958
- <span class="cline-any cline-yes">1x</span>
1999
+ <span class="cline-any cline-yes">3x</span>
2000
+ <span class="cline-any cline-yes">3x</span>
1959
2001
  <span class="cline-any cline-neutral">&nbsp;</span>
1960
2002
  <span class="cline-any cline-neutral">&nbsp;</span>
1961
2003
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1970,12 +2012,12 @@
1970
2012
  <span class="cline-any cline-neutral">&nbsp;</span>
1971
2013
  <span class="cline-any cline-neutral">&nbsp;</span>
1972
2014
  <span class="cline-any cline-neutral">&nbsp;</span>
1973
- <span class="cline-any cline-yes">26x</span>
1974
- <span class="cline-any cline-yes">3x</span>
2015
+ <span class="cline-any cline-yes">28x</span>
2016
+ <span class="cline-any cline-yes">5x</span>
1975
2017
  <span class="cline-any cline-yes">2x</span>
1976
2018
  <span class="cline-any cline-neutral">&nbsp;</span>
1977
- <span class="cline-any cline-yes">1x</span>
1978
- <span class="cline-any cline-yes">1x</span>
2019
+ <span class="cline-any cline-yes">3x</span>
2020
+ <span class="cline-any cline-yes">3x</span>
1979
2021
  <span class="cline-any cline-neutral">&nbsp;</span>
1980
2022
  <span class="cline-any cline-neutral">&nbsp;</span>
1981
2023
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1987,8 +2029,8 @@
1987
2029
  <span class="cline-any cline-neutral">&nbsp;</span>
1988
2030
  <span class="cline-any cline-neutral">&nbsp;</span>
1989
2031
  <span class="cline-any cline-neutral">&nbsp;</span>
1990
- <span class="cline-any cline-yes">26x</span>
1991
- <span class="cline-any cline-yes">16x</span>
2032
+ <span class="cline-any cline-yes">28x</span>
2033
+ <span class="cline-any cline-yes">18x</span>
1992
2034
  <span class="cline-any cline-neutral">&nbsp;</span>
1993
2035
  <span class="cline-any cline-neutral">&nbsp;</span>
1994
2036
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2003,60 +2045,60 @@
2003
2045
  <span class="cline-any cline-neutral">&nbsp;</span>
2004
2046
  <span class="cline-any cline-neutral">&nbsp;</span>
2005
2047
  <span class="cline-any cline-neutral">&nbsp;</span>
2006
- <span class="cline-any cline-yes">16x</span>
2048
+ <span class="cline-any cline-yes">18x</span>
2007
2049
  <span class="cline-any cline-neutral">&nbsp;</span>
2008
- <span class="cline-any cline-yes">16x</span>
2050
+ <span class="cline-any cline-yes">18x</span>
2009
2051
  <span class="cline-any cline-neutral">&nbsp;</span>
2010
- <span class="cline-any cline-yes">16x</span>
2011
- <span class="cline-any cline-yes">1x</span>
2012
- <span class="cline-any cline-yes">1x</span>
2052
+ <span class="cline-any cline-yes">18x</span>
2053
+ <span class="cline-any cline-yes">3x</span>
2054
+ <span class="cline-any cline-yes">3x</span>
2013
2055
  <span class="cline-any cline-neutral">&nbsp;</span>
2014
2056
  <span class="cline-any cline-neutral">&nbsp;</span>
2015
2057
  <span class="cline-any cline-neutral">&nbsp;</span>
2016
- <span class="cline-any cline-yes">16x</span>
2058
+ <span class="cline-any cline-yes">18x</span>
2017
2059
  <span class="cline-any cline-neutral">&nbsp;</span>
2018
- <span class="cline-any cline-yes">16x</span>
2019
- <span class="cline-any cline-yes">730x</span>
2060
+ <span class="cline-any cline-yes">18x</span>
2061
+ <span class="cline-any cline-yes">1705x</span>
2020
2062
  <span class="cline-any cline-neutral">&nbsp;</span>
2021
- <span class="cline-any cline-yes">730x</span>
2063
+ <span class="cline-any cline-yes">1705x</span>
2022
2064
  <span class="cline-any cline-neutral">&nbsp;</span>
2023
- <span class="cline-any cline-yes">730x</span>
2065
+ <span class="cline-any cline-yes">1705x</span>
2024
2066
  <span class="cline-any cline-neutral">&nbsp;</span>
2025
- <span class="cline-any cline-yes">16x</span>
2067
+ <span class="cline-any cline-yes">18x</span>
2026
2068
  <span class="cline-any cline-neutral">&nbsp;</span>
2027
- <span class="cline-any cline-yes">16x</span>
2028
- <span class="cline-any cline-yes">1x</span>
2029
- <span class="cline-any cline-yes">1x</span>
2069
+ <span class="cline-any cline-yes">18x</span>
2070
+ <span class="cline-any cline-yes">3x</span>
2071
+ <span class="cline-any cline-yes">3x</span>
2030
2072
  <span class="cline-any cline-neutral">&nbsp;</span>
2031
2073
  <span class="cline-any cline-neutral">&nbsp;</span>
2032
2074
  <span class="cline-any cline-neutral">&nbsp;</span>
2033
- <span class="cline-any cline-yes">16x</span>
2075
+ <span class="cline-any cline-yes">18x</span>
2034
2076
  <span class="cline-any cline-neutral">&nbsp;</span>
2035
- <span class="cline-any cline-yes">16x</span>
2036
- <span class="cline-any cline-yes">1x</span>
2037
- <span class="cline-any cline-yes">1x</span>
2077
+ <span class="cline-any cline-yes">18x</span>
2078
+ <span class="cline-any cline-yes">3x</span>
2079
+ <span class="cline-any cline-yes">3x</span>
2038
2080
  <span class="cline-any cline-neutral">&nbsp;</span>
2039
2081
  <span class="cline-any cline-neutral">&nbsp;</span>
2040
2082
  <span class="cline-any cline-neutral">&nbsp;</span>
2041
- <span class="cline-any cline-yes">16x</span>
2083
+ <span class="cline-any cline-yes">18x</span>
2042
2084
  <span class="cline-any cline-neutral">&nbsp;</span>
2043
- <span class="cline-any cline-yes">16x</span>
2044
- <span class="cline-any cline-yes">1x</span>
2045
- <span class="cline-any cline-yes">1x</span>
2085
+ <span class="cline-any cline-yes">18x</span>
2086
+ <span class="cline-any cline-yes">3x</span>
2087
+ <span class="cline-any cline-yes">3x</span>
2046
2088
  <span class="cline-any cline-neutral">&nbsp;</span>
2047
2089
  <span class="cline-any cline-neutral">&nbsp;</span>
2048
2090
  <span class="cline-any cline-neutral">&nbsp;</span>
2049
- <span class="cline-any cline-yes">16x</span>
2091
+ <span class="cline-any cline-yes">18x</span>
2050
2092
  <span class="cline-any cline-neutral">&nbsp;</span>
2051
2093
  <span class="cline-any cline-neutral">&nbsp;</span>
2052
- <span class="cline-any cline-yes">16x</span>
2094
+ <span class="cline-any cline-yes">18x</span>
2053
2095
  <span class="cline-any cline-neutral">&nbsp;</span>
2054
- <span class="cline-any cline-yes">16x</span>
2055
- <span class="cline-any cline-yes">1x</span>
2056
- <span class="cline-any cline-yes">1x</span>
2096
+ <span class="cline-any cline-yes">18x</span>
2097
+ <span class="cline-any cline-yes">3x</span>
2098
+ <span class="cline-any cline-yes">3x</span>
2057
2099
  <span class="cline-any cline-neutral">&nbsp;</span>
2058
2100
  <span class="cline-any cline-neutral">&nbsp;</span>
2059
- <span class="cline-any cline-yes">16x</span>
2101
+ <span class="cline-any cline-yes">18x</span>
2060
2102
  <span class="cline-any cline-neutral">&nbsp;</span>
2061
2103
  <span class="cline-any cline-neutral">&nbsp;</span>
2062
2104
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2081,21 +2123,21 @@
2081
2123
  <span class="cline-any cline-neutral">&nbsp;</span>
2082
2124
  <span class="cline-any cline-neutral">&nbsp;</span>
2083
2125
  <span class="cline-any cline-neutral">&nbsp;</span>
2084
- <span class="cline-any cline-yes">714x</span>
2085
- <span class="cline-any cline-yes">714x</span>
2126
+ <span class="cline-any cline-yes">1687x</span>
2127
+ <span class="cline-any cline-yes">1687x</span>
2086
2128
  <span class="cline-any cline-neutral">&nbsp;</span>
2087
- <span class="cline-any cline-yes">714x</span>
2088
- <span class="cline-any cline-yes">304428x</span>
2089
- <span class="cline-any cline-yes">304428x</span>
2090
- <span class="cline-any cline-yes">304428x</span>
2091
- <span class="cline-any cline-yes">303876x</span>
2129
+ <span class="cline-any cline-yes">1687x</span>
2130
+ <span class="cline-any cline-yes">1162169x</span>
2131
+ <span class="cline-any cline-yes">1162169x</span>
2132
+ <span class="cline-any cline-yes">1162169x</span>
2133
+ <span class="cline-any cline-yes">1160841x</span>
2092
2134
  <span class="cline-any cline-neutral">&nbsp;</span>
2093
2135
  <span class="cline-any cline-neutral">&nbsp;</span>
2094
- <span class="cline-any cline-yes">714x</span>
2095
- <span class="cline-any cline-yes">10188x</span>
2096
- <span class="cline-any cline-yes">10188x</span>
2136
+ <span class="cline-any cline-yes">1687x</span>
2137
+ <span class="cline-any cline-yes">23834x</span>
2138
+ <span class="cline-any cline-yes">23834x</span>
2097
2139
  <span class="cline-any cline-neutral">&nbsp;</span>
2098
- <span class="cline-any cline-yes">714x</span>
2140
+ <span class="cline-any cline-yes">1687x</span>
2099
2141
  <span class="cline-any cline-neutral">&nbsp;</span>
2100
2142
  <span class="cline-any cline-neutral">&nbsp;</span>
2101
2143
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2123,13 +2165,13 @@
2123
2165
  <span class="cline-any cline-neutral">&nbsp;</span>
2124
2166
  <span class="cline-any cline-neutral">&nbsp;</span>
2125
2167
  <span class="cline-any cline-neutral">&nbsp;</span>
2126
- <span class="cline-any cline-yes">730x</span>
2127
- <span class="cline-any cline-yes">16x</span>
2168
+ <span class="cline-any cline-yes">1705x</span>
2169
+ <span class="cline-any cline-yes">18x</span>
2128
2170
  <span class="cline-any cline-neutral">&nbsp;</span>
2129
- <span class="cline-any cline-yes">714x</span>
2130
- <span class="cline-any cline-yes">314616x</span>
2171
+ <span class="cline-any cline-yes">1687x</span>
2172
+ <span class="cline-any cline-yes">1186003x</span>
2131
2173
  <span class="cline-any cline-neutral">&nbsp;</span>
2132
- <span class="cline-any cline-yes">714x</span>
2174
+ <span class="cline-any cline-yes">1687x</span>
2133
2175
  <span class="cline-any cline-neutral">&nbsp;</span>
2134
2176
  <span class="cline-any cline-neutral">&nbsp;</span>
2135
2177
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2143,12 +2185,12 @@
2143
2185
  <span class="cline-any cline-neutral">&nbsp;</span>
2144
2186
  <span class="cline-any cline-neutral">&nbsp;</span>
2145
2187
  <span class="cline-any cline-neutral">&nbsp;</span>
2146
- <span class="cline-any cline-yes">714x</span>
2147
- <span class="cline-any cline-yes">714x</span>
2148
- <span class="cline-any cline-yes">10188x</span>
2149
- <span class="cline-any cline-yes">10188x</span>
2188
+ <span class="cline-any cline-yes">1687x</span>
2189
+ <span class="cline-any cline-yes">1687x</span>
2190
+ <span class="cline-any cline-yes">23834x</span>
2191
+ <span class="cline-any cline-yes">23834x</span>
2150
2192
  <span class="cline-any cline-neutral">&nbsp;</span>
2151
- <span class="cline-any cline-yes">714x</span>
2193
+ <span class="cline-any cline-yes">1687x</span>
2152
2194
  <span class="cline-any cline-neutral">&nbsp;</span>
2153
2195
  <span class="cline-any cline-neutral">&nbsp;</span>
2154
2196
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2165,13 +2207,13 @@
2165
2207
  <span class="cline-any cline-neutral">&nbsp;</span>
2166
2208
  <span class="cline-any cline-neutral">&nbsp;</span>
2167
2209
  <span class="cline-any cline-neutral">&nbsp;</span>
2168
- <span class="cline-any cline-yes">16x</span>
2210
+ <span class="cline-any cline-yes">18x</span>
2169
2211
  <span class="cline-any cline-neutral">&nbsp;</span>
2170
2212
  <span class="cline-any cline-neutral">&nbsp;</span>
2171
- <span class="cline-any cline-yes">9668x</span>
2213
+ <span class="cline-any cline-yes">22542x</span>
2172
2214
  <span class="cline-any cline-neutral">&nbsp;</span>
2173
2215
  <span class="cline-any cline-neutral">&nbsp;</span>
2174
- <span class="cline-any cline-yes">9668x</span>
2216
+ <span class="cline-any cline-yes">22542x</span>
2175
2217
  <span class="cline-any cline-neutral">&nbsp;</span>
2176
2218
  <span class="cline-any cline-neutral">&nbsp;</span>
2177
2219
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2190,23 +2232,23 @@
2190
2232
  <span class="cline-any cline-neutral">&nbsp;</span>
2191
2233
  <span class="cline-any cline-neutral">&nbsp;</span>
2192
2234
  <span class="cline-any cline-neutral">&nbsp;</span>
2193
- <span class="cline-any cline-yes">16x</span>
2194
- <span class="cline-any cline-yes">16x</span>
2195
- <span class="cline-any cline-yes">9668x</span>
2196
- <span class="cline-any cline-yes">9668x</span>
2197
- <span class="cline-any cline-yes">9668x</span>
2235
+ <span class="cline-any cline-yes">18x</span>
2236
+ <span class="cline-any cline-yes">18x</span>
2237
+ <span class="cline-any cline-yes">22542x</span>
2238
+ <span class="cline-any cline-yes">22542x</span>
2239
+ <span class="cline-any cline-yes">22542x</span>
2198
2240
  <span class="cline-any cline-no">&nbsp;</span>
2199
2241
  <span class="cline-any cline-neutral">&nbsp;</span>
2200
- <span class="cline-any cline-yes">9668x</span>
2201
- <span class="cline-any cline-yes">9668x</span>
2242
+ <span class="cline-any cline-yes">22542x</span>
2243
+ <span class="cline-any cline-yes">22542x</span>
2202
2244
  <span class="cline-any cline-no">&nbsp;</span>
2203
2245
  <span class="cline-any cline-neutral">&nbsp;</span>
2204
- <span class="cline-any cline-yes">9668x</span>
2205
- <span class="cline-any cline-yes">224x</span>
2246
+ <span class="cline-any cline-yes">22542x</span>
2247
+ <span class="cline-any cline-yes">252x</span>
2206
2248
  <span class="cline-any cline-neutral">&nbsp;</span>
2207
- <span class="cline-any cline-yes">9668x</span>
2249
+ <span class="cline-any cline-yes">22542x</span>
2208
2250
  <span class="cline-any cline-neutral">&nbsp;</span>
2209
- <span class="cline-any cline-yes">16x</span>
2251
+ <span class="cline-any cline-yes">18x</span>
2210
2252
  <span class="cline-any cline-neutral">&nbsp;</span>
2211
2253
  <span class="cline-any cline-neutral">&nbsp;</span>
2212
2254
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2220,19 +2262,19 @@
2220
2262
  <span class="cline-any cline-neutral">&nbsp;</span>
2221
2263
  <span class="cline-any cline-neutral">&nbsp;</span>
2222
2264
  <span class="cline-any cline-neutral">&nbsp;</span>
2223
- <span class="cline-any cline-yes">730x</span>
2224
- <span class="cline-any cline-yes">730x</span>
2265
+ <span class="cline-any cline-yes">1705x</span>
2266
+ <span class="cline-any cline-yes">1705x</span>
2225
2267
  <span class="cline-any cline-neutral">&nbsp;</span>
2226
- <span class="cline-any cline-yes">730x</span>
2227
- <span class="cline-any cline-yes">55480x</span>
2228
- <span class="cline-any cline-yes">55480x</span>
2229
- <span class="cline-any cline-yes">10220x</span>
2230
- <span class="cline-any cline-yes">10220x</span>
2231
- <span class="cline-any cline-yes">10220x</span>
2268
+ <span class="cline-any cline-yes">1705x</span>
2269
+ <span class="cline-any cline-yes">129580x</span>
2270
+ <span class="cline-any cline-yes">129580x</span>
2271
+ <span class="cline-any cline-yes">23870x</span>
2272
+ <span class="cline-any cline-yes">23870x</span>
2273
+ <span class="cline-any cline-yes">23870x</span>
2232
2274
  <span class="cline-any cline-neutral">&nbsp;</span>
2233
2275
  <span class="cline-any cline-neutral">&nbsp;</span>
2234
2276
  <span class="cline-any cline-neutral">&nbsp;</span>
2235
- <span class="cline-any cline-yes">730x</span>
2277
+ <span class="cline-any cline-yes">1705x</span>
2236
2278
  <span class="cline-any cline-neutral">&nbsp;</span>
2237
2279
  <span class="cline-any cline-neutral">&nbsp;</span>
2238
2280
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2249,26 +2291,26 @@
2249
2291
  <span class="cline-any cline-neutral">&nbsp;</span>
2250
2292
  <span class="cline-any cline-neutral">&nbsp;</span>
2251
2293
  <span class="cline-any cline-neutral">&nbsp;</span>
2252
- <span class="cline-any cline-yes">16x</span>
2253
- <span class="cline-any cline-yes">16x</span>
2254
- <span class="cline-any cline-yes">16x</span>
2255
- <span class="cline-any cline-yes">224x</span>
2256
- <span class="cline-any cline-yes">224x</span>
2257
- <span class="cline-any cline-yes">224x</span>
2258
- <span class="cline-any cline-yes">112x</span>
2259
- <span class="cline-any cline-yes">112x</span>
2260
- <span class="cline-any cline-yes">112x</span>
2261
- <span class="cline-any cline-yes">112x</span>
2262
- <span class="cline-any cline-yes">112x</span>
2294
+ <span class="cline-any cline-yes">18x</span>
2295
+ <span class="cline-any cline-yes">18x</span>
2296
+ <span class="cline-any cline-yes">18x</span>
2297
+ <span class="cline-any cline-yes">252x</span>
2298
+ <span class="cline-any cline-yes">252x</span>
2299
+ <span class="cline-any cline-yes">252x</span>
2300
+ <span class="cline-any cline-yes">126x</span>
2301
+ <span class="cline-any cline-yes">126x</span>
2302
+ <span class="cline-any cline-yes">126x</span>
2303
+ <span class="cline-any cline-yes">126x</span>
2304
+ <span class="cline-any cline-yes">126x</span>
2263
2305
  <span class="cline-any cline-neutral">&nbsp;</span>
2264
2306
  <span class="cline-any cline-neutral">&nbsp;</span>
2265
2307
  <span class="cline-any cline-neutral">&nbsp;</span>
2266
2308
  <span class="cline-any cline-neutral">&nbsp;</span>
2267
- <span class="cline-any cline-yes">16x</span>
2268
- <span class="cline-any cline-yes">112x</span>
2269
- <span class="cline-any cline-yes">112x</span>
2309
+ <span class="cline-any cline-yes">18x</span>
2310
+ <span class="cline-any cline-yes">126x</span>
2311
+ <span class="cline-any cline-yes">126x</span>
2270
2312
  <span class="cline-any cline-neutral">&nbsp;</span>
2271
- <span class="cline-any cline-yes">16x</span>
2313
+ <span class="cline-any cline-yes">18x</span>
2272
2314
  <span class="cline-any cline-neutral">&nbsp;</span>
2273
2315
  <span class="cline-any cline-neutral">&nbsp;</span>
2274
2316
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2281,45 +2323,45 @@
2281
2323
  <span class="cline-any cline-neutral">&nbsp;</span>
2282
2324
  <span class="cline-any cline-neutral">&nbsp;</span>
2283
2325
  <span class="cline-any cline-neutral">&nbsp;</span>
2284
- <span class="cline-any cline-yes">16x</span>
2285
- <span class="cline-any cline-yes">16x</span>
2286
- <span class="cline-any cline-yes">16x</span>
2287
- <span class="cline-any cline-yes">16x</span>
2326
+ <span class="cline-any cline-yes">18x</span>
2327
+ <span class="cline-any cline-yes">18x</span>
2328
+ <span class="cline-any cline-yes">18x</span>
2329
+ <span class="cline-any cline-yes">18x</span>
2288
2330
  <span class="cline-any cline-neutral">&nbsp;</span>
2289
- <span class="cline-any cline-yes">16x</span>
2290
- <span class="cline-any cline-yes">1120x</span>
2291
- <span class="cline-any cline-yes">992x</span>
2292
- <span class="cline-any cline-yes">32x</span>
2293
- <span class="cline-any cline-yes">32x</span>
2331
+ <span class="cline-any cline-yes">18x</span>
2332
+ <span class="cline-any cline-yes">1260x</span>
2333
+ <span class="cline-any cline-yes">1116x</span>
2334
+ <span class="cline-any cline-yes">36x</span>
2335
+ <span class="cline-any cline-yes">36x</span>
2294
2336
  <span class="cline-any cline-neutral">&nbsp;</span>
2295
- <span class="cline-any cline-yes">992x</span>
2296
- <span class="cline-any cline-yes">992x</span>
2337
+ <span class="cline-any cline-yes">1116x</span>
2338
+ <span class="cline-any cline-yes">1116x</span>
2297
2339
  <span class="cline-any cline-neutral">&nbsp;</span>
2298
- <span class="cline-any cline-yes">128x</span>
2299
- <span class="cline-any cline-yes">128x</span>
2300
- <span class="cline-any cline-yes">32x</span>
2340
+ <span class="cline-any cline-yes">144x</span>
2341
+ <span class="cline-any cline-yes">144x</span>
2342
+ <span class="cline-any cline-yes">36x</span>
2301
2343
  <span class="cline-any cline-neutral">&nbsp;</span>
2302
- <span class="cline-any cline-yes">96x</span>
2303
- <span class="cline-any cline-yes">64x</span>
2304
- <span class="cline-any cline-yes">64x</span>
2344
+ <span class="cline-any cline-yes">108x</span>
2345
+ <span class="cline-any cline-yes">72x</span>
2346
+ <span class="cline-any cline-yes">72x</span>
2305
2347
  <span class="cline-any cline-neutral">&nbsp;</span>
2306
- <span class="cline-any cline-yes">96x</span>
2307
- <span class="cline-any cline-yes">96x</span>
2348
+ <span class="cline-any cline-yes">108x</span>
2349
+ <span class="cline-any cline-yes">108x</span>
2308
2350
  <span class="cline-any cline-neutral">&nbsp;</span>
2309
- <span class="cline-any cline-yes">128x</span>
2351
+ <span class="cline-any cline-yes">144x</span>
2310
2352
  <span class="cline-any cline-neutral">&nbsp;</span>
2311
- <span class="cline-any cline-yes">16x</span>
2353
+ <span class="cline-any cline-yes">18x</span>
2312
2354
  <span class="cline-any cline-neutral">&nbsp;</span>
2313
2355
  <span class="cline-any cline-neutral">&nbsp;</span>
2314
2356
  <span class="cline-any cline-neutral">&nbsp;</span>
2315
- <span class="cline-any cline-yes">16x</span>
2316
- <span class="cline-any cline-yes">16x</span>
2317
- <span class="cline-any cline-yes">16x</span>
2318
- <span class="cline-any cline-yes">112x</span>
2319
- <span class="cline-any cline-yes">112x</span>
2320
- <span class="cline-any cline-yes">112x</span>
2357
+ <span class="cline-any cline-yes">18x</span>
2358
+ <span class="cline-any cline-yes">18x</span>
2359
+ <span class="cline-any cline-yes">18x</span>
2360
+ <span class="cline-any cline-yes">126x</span>
2361
+ <span class="cline-any cline-yes">126x</span>
2362
+ <span class="cline-any cline-yes">126x</span>
2321
2363
  <span class="cline-any cline-neutral">&nbsp;</span>
2322
- <span class="cline-any cline-yes">16x</span>
2364
+ <span class="cline-any cline-yes">18x</span>
2323
2365
  <span class="cline-any cline-neutral">&nbsp;</span>
2324
2366
  <span class="cline-any cline-neutral">&nbsp;</span>
2325
2367
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2333,14 +2375,14 @@
2333
2375
  <span class="cline-any cline-neutral">&nbsp;</span>
2334
2376
  <span class="cline-any cline-neutral">&nbsp;</span>
2335
2377
  <span class="cline-any cline-neutral">&nbsp;</span>
2336
- <span class="cline-any cline-yes">16x</span>
2378
+ <span class="cline-any cline-yes">18x</span>
2337
2379
  <span class="cline-any cline-neutral">&nbsp;</span>
2338
2380
  <span class="cline-any cline-neutral">&nbsp;</span>
2339
- <span class="cline-any cline-yes">16x</span>
2340
- <span class="cline-any cline-yes">112x</span>
2341
- <span class="cline-any cline-yes">112x</span>
2381
+ <span class="cline-any cline-yes">18x</span>
2382
+ <span class="cline-any cline-yes">126x</span>
2383
+ <span class="cline-any cline-yes">126x</span>
2342
2384
  <span class="cline-any cline-neutral">&nbsp;</span>
2343
- <span class="cline-any cline-yes">16x</span>
2385
+ <span class="cline-any cline-yes">18x</span>
2344
2386
  <span class="cline-any cline-neutral">&nbsp;</span>
2345
2387
  <span class="cline-any cline-neutral">&nbsp;</span>
2346
2388
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2357,7 +2399,6 @@
2357
2399
  <span class="cline-any cline-neutral">&nbsp;</span>
2358
2400
  <span class="cline-any cline-neutral">&nbsp;</span>
2359
2401
  <span class="cline-any cline-neutral">&nbsp;</span>
2360
- <span class="cline-any cline-yes">56116x</span>
2361
2402
  <span class="cline-any cline-neutral">&nbsp;</span>
2362
2403
  <span class="cline-any cline-neutral">&nbsp;</span>
2363
2404
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2367,16 +2408,43 @@
2367
2408
  <span class="cline-any cline-neutral">&nbsp;</span>
2368
2409
  <span class="cline-any cline-neutral">&nbsp;</span>
2369
2410
  <span class="cline-any cline-neutral">&nbsp;</span>
2370
- <span class="cline-any cline-yes">56116x</span>
2371
- <span class="cline-any cline-no">&nbsp;</span>
2372
2411
  <span class="cline-any cline-neutral">&nbsp;</span>
2373
- <span class="cline-any cline-yes">56116x</span>
2374
- <span class="cline-any cline-yes">56116x</span>
2375
- <span class="cline-any cline-yes">56452x</span>
2376
- <span class="cline-any cline-yes">56004x</span>
2412
+ <span class="cline-any cline-yes">82958x</span>
2413
+ <span class="cline-any cline-neutral">&nbsp;</span>
2414
+ <span class="cline-any cline-neutral">&nbsp;</span>
2415
+ <span class="cline-any cline-neutral">&nbsp;</span>
2416
+ <span class="cline-any cline-neutral">&nbsp;</span>
2417
+ <span class="cline-any cline-neutral">&nbsp;</span>
2418
+ <span class="cline-any cline-neutral">&nbsp;</span>
2419
+ <span class="cline-any cline-neutral">&nbsp;</span>
2420
+ <span class="cline-any cline-neutral">&nbsp;</span>
2421
+ <span class="cline-any cline-neutral">&nbsp;</span>
2422
+ <span class="cline-any cline-yes">82958x</span>
2423
+ <span class="cline-any cline-yes">3630x</span>
2424
+ <span class="cline-any cline-neutral">&nbsp;</span>
2425
+ <span class="cline-any cline-yes">79328x</span>
2426
+ <span class="cline-any cline-yes">79328x</span>
2427
+ <span class="cline-any cline-yes">79328x</span>
2428
+ <span class="cline-any cline-yes">79328x</span>
2429
+ <span class="cline-any cline-yes">131213x</span>
2430
+ <span class="cline-any cline-yes">48381x</span>
2431
+ <span class="cline-any cline-yes">2751x</span>
2432
+ <span class="cline-any cline-neutral">&nbsp;</span>
2433
+ <span class="cline-any cline-yes">48381x</span>
2434
+ <span class="cline-any cline-neutral">&nbsp;</span>
2435
+ <span class="cline-any cline-yes">82832x</span>
2436
+ <span class="cline-any cline-yes">82832x</span>
2437
+ <span class="cline-any cline-yes">63924x</span>
2438
+ <span class="cline-any cline-neutral">&nbsp;</span>
2439
+ <span class="cline-any cline-yes">82832x</span>
2440
+ <span class="cline-any cline-yes">82832x</span>
2441
+ <span class="cline-any cline-neutral">&nbsp;</span>
2442
+ <span class="cline-any cline-yes">79328x</span>
2443
+ <span class="cline-any cline-neutral">&nbsp;</span>
2444
+ <span class="cline-any cline-neutral">&nbsp;</span>
2445
+ <span class="cline-any cline-neutral">&nbsp;</span>
2446
+ <span class="cline-any cline-yes">19096x</span>
2377
2447
  <span class="cline-any cline-neutral">&nbsp;</span>
2378
- <span class="cline-any cline-yes">448x</span>
2379
- <span class="cline-any cline-yes">28x</span>
2380
2448
  <span class="cline-any cline-neutral">&nbsp;</span>
2381
2449
  <span class="cline-any cline-neutral">&nbsp;</span>
2382
2450
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2384,12 +2452,28 @@
2384
2452
  <span class="cline-any cline-neutral">&nbsp;</span>
2385
2453
  <span class="cline-any cline-neutral">&nbsp;</span>
2386
2454
  <span class="cline-any cline-neutral">&nbsp;</span>
2455
+ <span class="cline-any cline-yes">76384x</span>
2387
2456
  <span class="cline-any cline-neutral">&nbsp;</span>
2388
2457
  <span class="cline-any cline-neutral">&nbsp;</span>
2389
2458
  <span class="cline-any cline-neutral">&nbsp;</span>
2459
+ <span class="cline-any cline-yes">76384x</span>
2460
+ <span class="cline-any cline-no">&nbsp;</span>
2461
+ <span class="cline-any cline-neutral">&nbsp;</span>
2462
+ <span class="cline-any cline-yes">76384x</span>
2463
+ <span class="cline-any cline-neutral">&nbsp;</span>
2464
+ <span class="cline-any cline-neutral">&nbsp;</span>
2465
+ <span class="cline-any cline-neutral">&nbsp;</span>
2466
+ <span class="cline-any cline-neutral">&nbsp;</span>
2467
+ <span class="cline-any cline-neutral">&nbsp;</span>
2468
+ <span class="cline-any cline-neutral">&nbsp;</span>
2469
+ <span class="cline-any cline-yes">63924x</span>
2470
+ <span class="cline-any cline-yes">63516x</span>
2471
+ <span class="cline-any cline-yes">72x</span>
2390
2472
  <span class="cline-any cline-neutral">&nbsp;</span>
2473
+ <span class="cline-any cline-yes">72x</span>
2474
+ <span class="cline-any cline-yes">19096x</span>
2391
2475
  <span class="cline-any cline-neutral">&nbsp;</span>
2392
- <span class="cline-any cline-yes">56116x</span>
2476
+ <span class="cline-any cline-yes">72x</span>
2393
2477
  <span class="cline-any cline-neutral">&nbsp;</span>
2394
2478
  <span class="cline-any cline-neutral">&nbsp;</span>
2395
2479
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2411,12 +2495,12 @@
2411
2495
  <span class="cline-any cline-neutral">&nbsp;</span>
2412
2496
  <span class="cline-any cline-neutral">&nbsp;</span>
2413
2497
  <span class="cline-any cline-neutral">&nbsp;</span>
2414
- <span class="cline-any cline-yes">56116x</span>
2415
- <span class="cline-any cline-yes">1120x</span>
2416
- <span class="cline-any cline-yes">1120x</span>
2417
- <span class="cline-any cline-yes">56452x</span>
2418
- <span class="cline-any cline-yes">56452x</span>
2419
2498
  <span class="cline-any cline-neutral">&nbsp;</span>
2499
+ <span class="cline-any cline-yes">79328x</span>
2500
+ <span class="cline-any cline-yes">1350x</span>
2501
+ <span class="cline-any cline-yes">1350x</span>
2502
+ <span class="cline-any cline-yes">131213x</span>
2503
+ <span class="cline-any cline-yes">131213x</span>
2420
2504
  <span class="cline-any cline-neutral">&nbsp;</span>
2421
2505
  <span class="cline-any cline-neutral">&nbsp;</span>
2422
2506
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3534,10 +3618,21 @@ datarestructor.Transform = (function () {
3534
3618
  var describedEntity;
3535
3619
  for (index = 0; index &lt; describedEntries.length; index += 1) {
3536
3620
  describedEntity = describedEntries[index];
3537
- result.push(toDescribedField(describedEntity, 0, config));
3621
+ result.push(toDescribedField(describedEntity, {recursionDepth:0, config: config, groupToSkip:""}));
3538
3622
  }
3539
3623
  return result;
3540
3624
  }
3625
+ &nbsp;
3626
+ /**
3627
+ * Describes the context type for the recursive DescribedDataField conversion,
3628
+ * that contains everything that needs to be accessible throughout recursion regardless of the
3629
+ * recursion depth.
3630
+ *
3631
+ * @typedef {Object} module:datarestructor.DescribedFieldRecursionContext
3632
+ * @param {number} recursionDepth current recursion depth
3633
+ * @param {String} groupToSkip name of a group to skip or "" when no group should be skipped.
3634
+ * @param {module:datarestructor.TransformConfig} config configuration for the data transformation
3635
+ */
3541
3636
  &nbsp;
3542
3637
  /**
3543
3638
  * Converts a internal described entry to a newly created public described field.
@@ -3546,13 +3641,12 @@ datarestructor.Transform = (function () {
3546
3641
  * needs to be limited. Therefore, the current recursion depth is taken as second parameter
3547
3642
  * and the maximum recursion depth is taken as third parameter.
3548
3643
  * @param {module:datarestructor.DescribedEntry} entry the internal entry that will be converted
3549
- * @param {number} recursionDepth current hierarchy recursion depth
3550
- * @param {module:datarestructor.TransformConfig} config configuration for the data transformation
3644
+ * @param {module:datarestructor.DescribedFieldRecursionContext} recursionContext context contains everything that needs to be accessible throughout the recursion.
3551
3645
  * @returns {module:described_field.DescribedDataField}
3552
3646
  * @protected
3553
3647
  * @memberof module:datarestructor.Transform
3554
3648
  */
3555
- function toDescribedField(entry, recursionDepth, config) {
3649
+ function toDescribedField(entry, recursionContext) {
3556
3650
  var field = new described_field.DescribedDataFieldBuilder()
3557
3651
  .category(entry.category)
3558
3652
  .type(entry.type)
@@ -3563,30 +3657,62 @@ datarestructor.Transform = (function () {
3563
3657
  .fieldName(entry.fieldName)
3564
3658
  .value(entry.value)
3565
3659
  .build();
3566
- <span class="missing-if-branch" title="if path not taken" >I</span>if (recursionDepth &gt; config.maxRecursionDepth) {
3567
- <span class="cstat-no" title="statement not covered" > return field;</span>
3660
+ if (recursionContext.recursionDepth &gt; recursionContext.config.maxRecursionDepth) {
3661
+ return field;
3568
3662
  }
3663
+ var nextRecursionContext = null;
3664
+ var duplicateGroupNameToSkip = "";
3569
3665
  var fieldGroups = new described_field.DescribedDataFieldGroup(field);
3570
- forEachGroupEntry(entry, function (groupName, groupEntry) {
3571
- if (groupEntry != entry || recursionDepth &lt;= config.removeDuplicationAboveRecursionDepth) {
3572
- fieldGroups.addGroupEntry(groupName, toDescribedField(groupEntry, recursionDepth + 1, config));
3573
- } else {
3574
- if (config.debugMode) {
3575
- console.log(
3576
- "Removed duplicate field " +
3577
- groupEntry.fieldName +
3578
- " with value " +
3579
- groupEntry.value +
3580
- " of group " +
3581
- groupName +
3582
- " at recursion depth " +
3583
- recursionDepth
3584
- );
3666
+ forEachGroupEntry(entry, function (groupName, groupEntry, allGroupEntries) {
3667
+ if (recursionContext.groupToSkip === groupName) {
3668
+ if (recursionContext.config.debugMode) {
3669
+ console.log("Removed duplicate group " + groupName + " at recursion depth " + recursionContext.recursionDepth);
3585
3670
  }
3671
+ return;
3586
3672
  }
3673
+ duplicateGroupNameToSkip = "";
3674
+ if (recursionContext.recursionDepth &gt;= recursionContext.config.removeDuplicationAboveRecursionDepth) {
3675
+ duplicateGroupNameToSkip = arraysEqual(groupEntry[groupName], allGroupEntries, describedFieldEqual)? groupName : "";
3676
+ }
3677
+ nextRecursionContext = {recursionDepth: recursionContext.recursionDepth + 1, config: recursionContext.config, groupToSkip: duplicateGroupNameToSkip};
3678
+ fieldGroups.addGroupEntry(groupName, toDescribedField(groupEntry, nextRecursionContext));
3587
3679
  });
3588
3680
  return field;
3589
3681
  }
3682
+ &nbsp;
3683
+ function describedFieldEqual(a, b) {
3684
+ return (
3685
+ defaultEmpty(a.category) === defaultEmpty(b.category) &amp;&amp;
3686
+ defaultEmpty(a.type) === defaultEmpty(b.type) &amp;&amp;
3687
+ a.fieldName === b.fieldName &amp;&amp;
3688
+ a.value === b.value
3689
+ );
3690
+ }
3691
+ &nbsp;
3692
+ function defaultEmpty(value) {
3693
+ return defaultValue(value, "");
3694
+ }
3695
+ &nbsp;
3696
+ function defaultValue(value, valueAsDefault) {
3697
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof value === "undefined" || !value) {
3698
+ <span class="cstat-no" title="statement not covered" > return valueAsDefault;</span>
3699
+ }
3700
+ return value;
3701
+ }
3702
+ &nbsp;
3703
+ // Reference: https://stackoverflow.com/questions/3115982/how-to-check-if-two-arrays-are-equal-with-javascript/16430730
3704
+ // Added "elementEqualFunction" to implement equal object detection.
3705
+ // Arrays are assumed to be sorted. Differently ordered entries are treated as not equal.
3706
+ function arraysEqual(a, b, elementEqualFunction) {
3707
+ if (a === b) return true;
3708
+ if (a == null || b == null) return false;
3709
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (a.length !== b.length) <span class="cstat-no" title="statement not covered" >return false;</span>
3710
+ &nbsp;
3711
+ for (var i = 0; i &lt; a.length; ++i) {
3712
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (!elementEqualFunction(a[i], b[i])) <span class="cstat-no" title="statement not covered" >return false;</span>
3713
+ }
3714
+ return true;
3715
+ }
3590
3716
  &nbsp;
3591
3717
  /**
3592
3718
  * Takes the full qualified original property name and extracts a simple name out of it.
@@ -3594,6 +3720,7 @@ datarestructor.Transform = (function () {
3594
3720
  * @callback module:datarestructor.onEntryFoundFunction
3595
3721
  * @param {string} groupName name of the group where the entry had been found.
3596
3722
  * @param {module:datarestructor.DescribedEntry} foundEntry the found entry itself.
3723
+ * @param {module:datarestructor.DescribedEntry[]} allEntries the array of all entries where the found entry is an element of.
3597
3724
  */
3598
3725
  &nbsp;
3599
3726
  /**
@@ -3611,13 +3738,12 @@ datarestructor.Transform = (function () {
3611
3738
  groupName = rootEntry.groupNames[groupIndex];
3612
3739
  for (entryIndex = 0; entryIndex &lt; rootEntry[groupName].length; entryIndex += 1) {
3613
3740
  entry = rootEntry[groupName][entryIndex];
3614
- onFoundEntry(groupName, entry);
3741
+ onFoundEntry(groupName, entry, rootEntry[groupName]);
3615
3742
  }
3616
3743
  }
3617
3744
  }
3618
- &nbsp;
3619
3745
  return Transform;
3620
- })();
3746
+ }());
3621
3747
  &nbsp;
3622
3748
  /**
3623
3749
  * Main fassade for the data restructor as static function(s).
@@ -3652,7 +3778,7 @@ datarestructor.Restructor.processJsonUsingDescriptions = function(jsonData, desc
3652
3778
  <div class='footer quiet pad2 space-top1 center small'>
3653
3779
  Code coverage generated by
3654
3780
  <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
3655
- at Sun Jun 06 2021 17:48:13 GMT+0200 (Central European Summer Time)
3781
+ at Mon Oct 31 2022 17:00:01 GMT+0000 (Coordinated Universal Time)
3656
3782
  </div>
3657
3783
  </div>
3658
3784
  <script src="prettify.js"></script>