diff --git a/VectoCoreTest/Models/Simulation/SimulationTests.cs b/VectoCoreTest/Models/Simulation/SimulationTests.cs
index 480cdce00546483f5bdfa7c5b23bbe665f9abfac..5c5b6505e83afac8a29a2c11c02efeedf760d0ed 100644
--- a/VectoCoreTest/Models/Simulation/SimulationTests.cs
+++ b/VectoCoreTest/Models/Simulation/SimulationTests.cs
@@ -1,6 +1,8 @@
-using System.Data;
+using System.IO;
+using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Utils;
@@ -11,7 +13,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
public class SimulationTests
{
private const string EngineFile = @"TestData\Components\24t Coach.veng";
- private const string CycleFile = @"TestData\Cycles\Coach Engine Only.vdri";
+ private const string CycleFile = @"TestData\Cycles\Coach Engine Only short.vdri";
[TestMethod]
public void TestSimulationEngineOnly()
@@ -32,11 +34,11 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
}
}
- [TestMethod, Ignore]
+ [TestMethod]
public void TestEngineOnly_JobRun()
{
var resultFileName = "TestEngineOnly_JobRun-result.vmod";
- var expectedResultsName = @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnly.vmod";
+ var expectedResultsName = @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnly short.vmod";
var job = SimulatorFactory.CreateTimeBasedEngineOnlyJob(EngineFile, CycleFile, resultFileName);
job.Run();
@@ -45,51 +47,54 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var expectedResults = ModalResults.ReadFromFile(expectedResultsName);
Assert.AreEqual(expectedResults.Rows.Count, results.Rows.Count, "Moddata: Row count differs.");
-
- for (var i = 0; i < expectedResults.Rows.Count; i++) {
- var row = results.Rows[i];
- var expectedRow = expectedResults.Rows[i];
-
- foreach (DataColumn col in expectedResults.Columns) {
- Assert.AreEqual(expectedRow[col], row[col], "Moddata: Value differs (Row {0}, Col {1}): {2} != {3}");
- }
- }
}
- [TestMethod, Ignore]
+ [TestMethod]
public void TestEngineOnly_SimulatorRun()
{
+ var resultFileName = "TestEngineOnly_SimulatorRun-result.vmod";
+ var expectedResultsName = @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnly short.vmod";
+
var sim = new JobContainer();
- var job = SimulatorFactory.CreateTimeBasedEngineOnlyJob(EngineFile, CycleFile,
- "TestEngineOnly-SimulatorRun-result.vmod");
+ var job = SimulatorFactory.CreateTimeBasedEngineOnlyJob(EngineFile, CycleFile, resultFileName);
sim.AddJob(job);
sim.RunSimulation();
- // todo: Add additional assertions.
- Assert.Fail("Todo: Add additional assertions.");
+ var results = ModalResults.ReadFromFile(resultFileName);
+ var expectedResults = ModalResults.ReadFromFile(expectedResultsName);
+
+ Assert.AreEqual(expectedResults.Rows.Count, results.Rows.Count, "Moddata: Row count differs.");
}
- [TestMethod, Ignore]
- public void TestEngineOnly_MultipleJobs()
+ public IVectoSimulator CreateJob(string resultFileName)
{
- var simulation = new JobContainer();
+ if (File.Exists(resultFileName)) {
+ File.Delete(resultFileName);
+ }
+ return SimulatorFactory.CreateTimeBasedEngineOnlyJob(EngineFile, CycleFile, resultFileName);
+ }
- var sim1 = SimulatorFactory.CreateTimeBasedEngineOnlyJob(EngineFile, CycleFile,
- "TestEngineOnly-MultipleJobs-result1.vmod");
- simulation.AddJob(sim1);
- var sim2 = SimulatorFactory.CreateTimeBasedEngineOnlyJob(EngineFile, CycleFile,
- "TestEngineOnly-MultipleJobs-result2.vmod");
- simulation.AddJob(sim2);
+ [TestMethod]
+ public void TestEngineOnly_MultipleJobs()
+ {
+ var resultFileName = "TestEngineOnly-MultipleJobs-result{0}.vmod";
+ var resultFiles = new[] { 1, 2, 3 }.Select(x => string.Format(resultFileName, x)).ToList();
- var sim3 = SimulatorFactory.CreateTimeBasedEngineOnlyJob(EngineFile, CycleFile,
- "TestEngineOnly-MultipleJobs-result3.vmod");
- simulation.AddJob(sim3);
+ var expectedResultsName = @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnly short.vmod";
+ var expectedResults = ModalResults.ReadFromFile(expectedResultsName);
+
+ var simulation = new JobContainer();
+ foreach (var resultFile in resultFiles) {
+ simulation.AddJob(CreateJob(resultFile));
+ }
simulation.RunSimulation();
- // todo: Add additional assertions.
- Assert.Fail("Todo: Add additional assertions.");
+ foreach (var resultFile in resultFiles) {
+ var results = ModalResults.ReadFromFile(resultFile);
+ Assert.AreEqual(expectedResults.Rows.Count, results.Rows.Count, "Moddata: Row count differs.");
+ }
}
}
}
\ No newline at end of file
diff --git a/VectoCoreTest/TestData/Cycles/Coach Engine Only short.vdri b/VectoCoreTest/TestData/Cycles/Coach Engine Only short.vdri
new file mode 100644
index 0000000000000000000000000000000000000000..a7043ef47fc4e737933321e195a19aada6954a46
--- /dev/null
+++ b/VectoCoreTest/TestData/Cycles/Coach Engine Only short.vdri
@@ -0,0 +1,308 @@
+<n>,<Pe>
+600,0
+600,0
+600,0
+600,0
+600,0
+600,0
+600,0
+600,0
+600,0
+600,-2.38E-07
+600,-2.38E-07
+600,0
+600,0
+600,0
+600,0
+600,0
+600,0
+600,-2.38E-07
+600,2.38E-07
+600,0
+644.4445,2.329973
+644.4445,0.5693641
+644.4445,4.264177
+869.7512,7.98456
+644.4445,1.351656
+1015.31,-0.2716608
+948.6478,-0.4653716
+872.4501,-0.5719776
+644.4445,1.012361
+816.044,0.1606398
+644.4445,3.967641
+644.4445,4.3916
+645.3466,1.254886
+602.9238,0.36098
+644.4445,1.097353
+644.4445,1.476951
+645.6951,2.961375
+656.8193,3.33839
+688.8293,2.509675
+715.7259,3.104633
+743.2361,2.779576
+759.3434,2.025352
+763.0762,1.467997
+761.0308,1.383811
+757.7582,1.320618
+755.406,1.475238
+756.3265,1.681716
+753.872,1.098228
+749.1166,1.411724
+747.787,1.465289
+743.7986,1.110595
+691.6417,-3.012229
+627.2637,-0.1685431
+1049.495,-0.09707546
+644.4445,1.615664
+1026.825,0.4667768
+977.9754,-0.4151859
+906.5457,-0.4785028
+764.8557,-2.495939
+615.8789,-0.5095253
+600,-0.2679868
+644.4445,0.5701756
+644.4445,1.185031
+600,0.2967396
+646.6069,3.811063
+895.4804,7.923037
+653.8535,6.359474
+791.9158,11.55912
+900.8318,4.931076
+1007.856,14.46236
+1156.708,13.49057
+1345.086,27.20026
+1602.138,35.01208
+1888.49,46.58702
+2103.714,24.29906
+2146.359,-1.109985
+1286.033,8.800848
+1351.937,37.56419
+1494.108,56.84015
+1650.18,55.71647
+1797.949,62.99876
+1974.041,90.22348
+2191.804,115.1789
+2403.877,105.9852
+2503.301,18.33513
+1611.144,-1.709167
+1619.774,43.61679
+1655.685,42.16265
+1690.462,44.19933
+1723.907,42.2117
+1766.618,62.7349
+1823.327,70.33007
+1898.131,102.0343
+1980.033,91.64824
+2027.516,42.57878
+2040.799,27.31307
+1396.846,69.06043
+1435.803,91.8233
+1479.637,89.72998
+1511.026,58.87632
+1535.129,70.88527
+1563.544,76.08076
+1591.288,72.46291
+1615.981,69.52535
+1637.034,63.16708
+1654.957,61.31534
+1674.975,72.86595
+1695.262,64.75288
+1709.799,54.75394
+1712.769,24.54955
+1702.061,5.766651
+1685.925,4.414207
+1669.991,5.575367
+1656.502,12.07608
+1644.88,11.30247
+1634.482,15.56817
+1624.607,12.47053
+1610.151,-0.5362444
+1594.136,6.376687
+1580.163,5.485111
+1564.78,1.025784
+1550.539,8.4501
+1539.777,11.6633
+1532.066,17.71403
+1521.599,2.418658
+1504.309,-4.049212
+1481.361,-14.07779
+1453.792,-17.15281
+1423.724,-18.15207
+1385.246,-16.81612
+1337.242,-15.72801
+1293.188,-15.42869
+1281.755,38.3059
+1286.484,11.6914
+1283.596,17.9171
+1285.597,24.78118
+1291.778,29.405
+1303.359,40.06316
+1321.147,47.6144
+1343.046,53.40984
+1367.31,56.75732
+1398.372,76.35516
+1441.017,95.91759
+1491.115,106.3325
+1533.099,77.92695
+1561.824,69.6596
+1584.033,60.08042
+1597.119,41.62484
+1603.93,40.29163
+1607.558,31.45644
+1604.965,19.52167
+1600.142,23.70411
+1596.299,22.48869
+1589.192,12.48158
+1578.793,11.02395
+1566.889,6.910674
+1551.426,-1.123854
+1528.707,-15.20682
+1502.589,-11.37927
+1476.041,-16.47795
+1439.148,-17.79036
+1386.845,-16.22873
+1331.801,-15.54598
+1276.609,-14.19835
+1222.116,-13.53877
+1183.826,-13.63705
+1165.594,4.323093
+1154.524,-0.2198782
+1145.307,8.251244
+1136.212,-0.1459947
+1127.318,8.395197
+1127.425,20.90548
+1132.316,19.78157
+1134.976,15.85121
+1140.847,27.66578
+1153.503,32.64259
+1173.508,46.8272
+1195.77,39.98267
+1214.31,39.54551
+1235.31,48.15401
+1262.019,56.77373
+1290.77,56.59818
+1317.063,53.30949
+1343.879,61.21212
+1364.448,38.20493
+1372.416,26.90753
+1376.097,26.42333
+1374.269,11.18833
+1368.546,15.03598
+1362.863,11.02519
+1356.038,11.46854
+1346.136,1.988382
+1325.11,-16.2194
+1284.63,-14.65078
+1238.373,-14.2102
+1193.929,-12.98282
+1155.988,-13.10039
+1137.273,2.958799
+1132.786,15.8914
+1141.075,33.33242
+1156.7,34.19608
+1179.433,52.38899
+1213.827,66.11726
+1258.176,83.05579
+1305.898,81.63163
+1353.754,91.2124
+1396.935,75.19558
+1438.893,94.76639
+1487.004,100.8023
+1529.298,83.95088
+1563.974,82.77102
+1596.393,81.57443
+1624.446,72.54066
+1640.138,42.54347
+1643,29.84203
+1638.257,16.47232
+1629.605,16.00256
+1630.478,48.60144
+1642.785,55.60721
+1656.623,55.29026
+1669.48,53.73763
+1680.188,49.11893
+1689.163,48.75134
+1695.907,42.08216
+1700.851,42.99605
+1706.79,46.16529
+1713.763,47.34768
+1720.427,45.77478
+1727.319,48.89489
+1725.733,15.54477
+1714.932,15.2667
+1703.74,13.40421
+1690.842,8.433504
+1676.749,8.346373
+1663.421,10.28855
+1648.951,3.619027
+1633.192,5.002003
+1617.433,2.826547
+1602.775,7.905733
+1589.501,6.74611
+1576.428,7.864722
+1567.118,18.46364
+1564.686,30.00007
+1567.427,35.38074
+1572.196,36.95614
+1576.469,34.14531
+1576.307,22.5677
+1570.826,16.47429
+1563.423,15.84486
+1553.562,7.964062
+1536.916,-5.952643
+1517.233,-2.275624
+1497.389,-6.935693
+1471.863,-18.41763
+1442.372,-18.13165
+1414.871,-13.40553
+1387.812,-17.13374
+1362.057,-10.3961
+1346.257,8.515593
+1345.787,31.16553
+1358.712,46.74545
+1379.066,53.84549
+1401.382,54.66264
+1424.557,58.96523
+1447.437,56.39186
+1469.605,59.47992
+1493.117,63.22589
+1515.124,57.4621
+1535.841,61.76757
+1557.969,64.56117
+1578.323,58.54613
+1596.594,60.07353
+1611.991,50.88236
+1621.194,40.61778
+1619.421,14.21795
+1605.113,-1.868717
+1588.762,6.50421
+1576.67,11.31663
+1569.348,21.61535
+1567.91,30.3064
+1571.135,36.95245
+1576.267,36.91877
+1582.797,42.09142
+1590.294,40.76203
+1597.817,42.91198
+1605.462,41.89369
+1612.273,40.82465
+1619.582,44.26139
+1628.167,45.92483
+1637.464,47.59579
+1648.723,53.73099
+1661.419,53.84293
+1676.91,65.1045
+1695.235,65.79607
+1711.21,58.91008
+1724.968,59.73791
+1739.437,63.20061
+1753.772,61.00745
+1768,64.61153
+1781.368,59.52817
+1794.521,65.5128
+1809.072,66.50668
+1818.449,47.4547
+1817.24,26.92148
+1805.995,8.979017
+1786.662,-4.010155
+1765.233,-0.05493259
\ No newline at end of file
diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly short.vmod b/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly short.vmod
new file mode 100644
index 0000000000000000000000000000000000000000..ad97f71a13ae578760a17a2c0b940c3ecddf1fc1
--- /dev/null
+++ b/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly short.vmod
@@ -0,0 +1,308 @@
+time [s],n [1/min],Tq_eng [Nm],Tq_clutch [Nm],Tq_full [Nm],Tq_drag [Nm],Pe_eng [kW],Pe_full [kW],Pe_drag [kW],Pe_clutch [kW],Pa [Eng],Paux [kW],FC [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+1,600,0,0,1282,-148,0,80.55044,-9.299114,0,0,0,1459,-,-
+2,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+3,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+4,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+5,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+6,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+7,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+8,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+9,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+10,600,-3.787888E-06,-3.787888E-06,801.2501,-148,-2.38E-07,50.34402,-9.299114,-2.38E-07,0,0,1459,-,-
+11,600,-3.787888E-06,-3.787888E-06,801.2501,-148,-2.38E-07,50.34402,-9.299114,-2.38E-07,0,0,1459,-,-
+12,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+13,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+14,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+15,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+16,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+17,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+18,600,-3.787888E-06,-3.787888E-06,801.2501,-148,-2.38E-07,50.34402,-9.299114,-2.38E-07,0,0,1459,-,-
+19,600,3.787888E-06,3.787888E-06,801.2501,-148,2.38E-07,50.34402,-9.299114,2.38E-07,0,0,1459,-,-
+20,600,0,0,801.2501,-148,0,50.34402,-9.299114,0,0,0,1459,-,-
+21,644.4445,51.60141,34.52524,871.9445,-148.2222,3.482377,58.84411,-10.00294,2.329973,1.152404,0,2042.289,-,-
+22,644.4445,8.436764,8.436764,891.295,-148.2222,0.5693641,60.15,-10.00294,0.5693641,0,0,1632.441,-,-
+23,644.4445,63.18603,63.18603,875.1083,-148.2222,4.264177,59.05762,-10.00294,4.264177,0,0,2152.285,-,-
+24,869.7512,165.7099,87.66522,1247.88,-152.8363,15.09288,113.6571,-13.92035,7.98456,7.10832,0,4339.71,-,-
+25,644.4445,-85.30151,20.02867,955.8112,-148.2222,-5.756664,64.50394,-10.00294,1.351656,-7.10832,0,711.4219,-,-
+26,1015.31,118.0717,-2.555052,1417.196,-161.4545,12.55374,150.6806,-17.16632,-0.2716608,12.82541,0,4727.767,-,-
+27,948.6478,-32.14379,-4.684533,1403.206,-157.1756,-3.193234,139.3975,-15.61417,-0.4653716,-2.727862,0,2206.477,-,-
+28,872.4501,-37.90639,-6.260512,1221.509,-152.9848,-3.463232,111.6005,-13.97711,-0.5719776,-2.891254,0,1758.151,-,-
+29,644.4445,-91.78082,15.00104,852.7004,-148.2222,-6.193927,57.5454,-10.00294,1.012361,-7.206288,0,647.5482,-,-
+30,816.044,62.98565,1.879797,1117.715,-149.8824,5.382497,95.51535,-12.80834,0.1606398,5.221857,0,2716.129,-,-
+31,644.4445,-18.58481,58.792,901.8535,-148.2222,-1.254216,60.86255,-10.00294,3.967641,-5.221857,0,1369.122,-,-
+32,644.4445,65.07417,65.07417,864.9752,-148.2222,4.3916,58.37378,-10.00294,4.3916,0,0,2170.213,-,-
+33,645.3466,18.92747,18.56875,897.748,-148.2267,1.279129,60.6703,-10.01724,1.254886,0.02424291,0,1733.944,-,-
+34,602.9238,-11.75811,5.717314,813.498,-148.0146,-0.7423839,51.36266,-9.345352,0.36098,-1.103364,0,1349.227,-,-
+35,644.4445,32.25071,16.26044,867.8193,-148.2222,2.176474,58.56572,-10.00294,1.097353,1.079121,0,1858.554,-,-
+36,644.4445,21.88527,21.88527,884.0386,-148.2222,1.476951,59.66029,-10.00294,1.476951,0,0,1760.134,-,-
+37,645.6951,44.29346,43.79628,882.1249,-148.2285,2.994993,59.64667,-10.02277,2.961375,0.03361782,0,1975.526,-,-
+38,656.8193,52.92505,48.53584,907.957,-148.2841,3.640288,62.45105,-10.19927,3.33839,0.3018979,0,2080.844,-,-
+39,688.8293,47.23377,34.79183,961.4687,-148.4442,3.407162,69.35461,-10.70788,2.509675,0.8974872,0,2094.026,-,-
+40,715.7259,51.92436,41.42237,1002.374,-148.5786,3.891764,75.12854,-11.13606,3.104633,0.7871312,0,2195.046,-,-
+41,743.2361,46.45741,35.71274,1047.836,-148.7162,3.61585,81.55463,-11.5748,2.779576,0.8362737,0,2200.909,-,-
+42,759.3434,31.81196,25.47028,1071.758,-148.7967,2.529631,85.22429,-11.83206,2.025352,0.5042791,0,2095.676,-,-
+43,763.0762,19.8526,18.37083,1072.514,-148.8154,1.586404,85.70369,-11.89171,1.467997,0.1184073,0,1989.96,-,-
+44,761.0308,16.54884,17.36385,1064.854,-148.8052,1.318859,84.86353,-11.85902,1.383811,-0.06495218,0,1954.296,-,-
+45,757.7582,15.33736,16.64248,1058.417,-148.7888,1.217054,83.98775,-11.80673,1.320618,-0.1035636,0,1935.92,-,-
+46,755.406,17.71142,18.64889,1054.212,-148.777,1.401079,83.39443,-11.76915,1.475238,-0.07415938,0,1953.523,-,-
+47,756.3265,21.59923,21.23317,1056.541,-148.7816,1.710709,83.68047,-11.78385,1.681716,0.02899319,0,1992.37,-,-
+48,753.872,12.93295,13.91125,1054.129,-148.7694,1.020995,83.2185,-11.74464,1.098228,-0.07723287,0,1904.93,-,-
+49,749.1166,16.09747,17.99583,1043.319,-148.7456,1.262803,81.84558,-11.66869,1.411724,-0.1489212,0,1924.99,-,-
+50,747.787,18.18229,18.71185,1042.371,-148.7389,1.42382,81.62605,-11.64746,1.465289,-0.04146888,0,1941.994,-,-
+51,743.7986,12.66705,14.25843,1036.835,-148.719,0.9866417,80.75947,-11.58378,1.110595,-0.1239533,0,1881.251,-,-
+52,691.6417,-63.12659,-41.58897,952.126,-148.4582,-4.572167,68.96111,-10.75261,-3.012229,-1.559938,0,1029.139,-,-
+53,627.2637,-29.49878,-2.565856,818.5142,-148.1363,-1.937684,53.76566,-9.730616,-0.1685431,-1.76914,0,1225.452,-,-
+54,1049.495,133.3385,-0.8832842,1430.888,-164.702,14.65428,157.2587,-18.10122,-0.09707546,14.75135,0,5039.796,-,-
+55,644.4445,-148.2222,63.61569,953.374,-148.2222,-10.00294,64.33946,-10.00294,4.293173,-14.29611,0,0,-,-
+56,1026.825,128.1715,4.340945,1402.615,-162.5484,13.78214,150.8216,-17.47864,0.4667768,13.31536,0,4909.66,-,-
+57,977.9754,-23.97845,-4.054022,1452.932,-158.7887,-2.455714,148.7997,-16.26208,-0.4151859,-2.040528,0,2413.945,-,-
+58,906.5457,-34.58462,-5.040413,1279.149,-154.86,-3.28323,121.4338,-14.70136,-0.4785028,-2.804727,0,1968.133,-,-
+59,764.8557,-92.76798,-31.16203,1048.102,-148.8243,-7.430298,83.94824,-11.92016,-2.495939,-4.93436,0,706.9113,-,-
+60,615.8789,-74.35345,-7.900268,783.3046,-148.0794,-4.795403,50.51898,-9.550334,-0.5095253,-4.285877,0,759.3614,-,-
+61,600,-10.66753,-4.265142,772.6295,-148,-0.6702606,48.54575,-9.299114,-0.2679868,-0.4022738,0,1353.838,-,-
+62,644.4445,25.52496,8.44879,868.2201,-148.2222,1.722579,58.59277,-10.00294,0.5701756,1.152404,0,1794.693,-,-
+63,644.4445,17.55964,17.55964,881.5164,-148.2222,1.185031,59.49008,-10.00294,1.185031,0,0,1719.062,-,-
+64,600,-13.61832,4.722757,808.3227,-148,-0.855664,50.78841,-9.299114,0.2967396,-1.152404,0,1324.749,-,-
+65,646.6069,74.16109,56.28299,870.6453,-148.233,5.021634,58.95358,-10.03723,3.811063,1.210571,0,2261.034,-,-
+66,895.4804,169.7638,84.49032,1291.33,-154.2514,15.91951,121.0938,-14.46485,7.923037,7.996473,0,4618.244,-,-
+67,653.8535,-21.04008,92.87785,974.0977,-148.2693,-1.440644,66.69781,-10.1522,6.359474,-7.800117,0,1364.677,-,-
+68,791.9158,189.5361,139.3854,1100.002,-148.9596,15.71808,91.22227,-12.3531,11.55912,4.15896,0,4122.556,-,-
+69,900.8318,92.9934,52.27203,1342.243,-154.5457,8.772522,126.6203,-14.57905,4.931076,3.841446,0,3495.276,-,-
+70,1007.856,177.3563,137.0289,1468.67,-160.7463,18.71862,155.007,-16.96556,14.46236,4.256257,0,5629.611,-,-
+71,1156.708,166.7947,111.3725,1495.45,-174.8873,20.20387,181.1441,-21.18413,13.49057,6.713297,0,6098.791,-,-
+72,1345.086,262.8184,193.1054,1491.288,-196.4103,37.01983,210.0585,-27.66578,27.20026,9.819574,0,9012.633,-,-
+73,1602.138,302.7682,208.6841,1468.421,-235.31,50.79708,246.365,-39.47925,35.01208,15.78501,0,12347.58,-,-
+74,1888.49,340.8813,235.5709,1358.222,-280.3706,67.41344,268.605,-55.44672,46.58702,20.82642,0,17071.38,-,-
+75,2103.714,191.5638,110.2997,933.7136,-320.7057,42.2016,205.6975,-70.6516,24.29906,17.90253,0,ERROR,-,-
+76,2146.359,11.86287,-4.938399,824.0921,-328.8082,2.666372,185.228,-73.90496,-1.109985,3.776357,0,ERROR,-,-
+77,1286.033,-189.324,267.5433,1444.925,-189.324,-25.49684,194.5924,-25.49684,36.03087,-61.5277,0,0,-,-
+78,1351.937,290.9179,265.3316,1369.964,-197.2324,41.18656,193.952,-27.92309,37.56419,3.62237,0,9727.088,-,-
+79,1494.108,417.1658,363.2826,1511.604,-218.0573,65.27085,236.5096,-34.11782,56.84015,8.4307,0,14130.17,-,-
+80,1650.18,381.5908,322.4213,1528.646,-242.2761,65.94135,264.16,-41.86687,55.71647,10.22488,0,14950.52,-,-
+81,1797.949,390.9861,334.6001,1555.095,-263.7026,73.61517,292.7945,-49.65013,62.99876,10.6164,0,17044.73,-,-
+82,1974.041,503.3981,436.4503,1205.259,-296.1976,104.063,249.1524,-61.23029,90.22348,13.83952,0,23496.69,-,-
+83,2191.804,584.1646,501.8138,785.6,-337.4427,134.0805,180.315,-77.45161,115.1789,18.90157,0,ERROR,-,-
+84,2403.877,334.2301,253.5614,334.2301,-377.7366,84.13688,84.13688,-95.08893,63.82986,20.30701,0,ERROR,-,-
+85,2503.301,83.6814,44.90277,83.6814,-396.6272,21.93667,21.93667,-103.9739,11.77104,10.16563,0,ERROR,-,-
+86,1611.144,-236.6159,216.6994,1441.529,-236.6159,-39.9215,243.2128,-39.9215,36.56123,-76.48273,0,0,-,-
+87,1619.774,260.5656,257.1406,1328.07,-237.8672,44.19775,225.2704,-40.3476,43.61679,0.5809621,0,11442.74,-,-
+88,1655.685,257.3117,243.1765,1493.182,-243.0743,44.61346,258.8923,-42.14494,42.16265,2.450815,0,11737.14,-,-
+89,1690.462,263.3754,249.6788,1501.846,-248.117,46.62397,265.864,-43.92285,44.19933,2.424642,0,12260.41,-,-
+90,1723.907,247.0045,233.8247,1513.155,-252.9665,44.59101,273.1655,-45.66731,42.2117,2.379314,0,12189.81,-,-
+91,1766.618,355.8987,339.1079,1522.386,-259.1596,65.84119,281.6412,-47.94448,62.7349,3.106289,0,15683.46,-,-
+92,1823.327,390.5547,368.3391,1507.445,-268.3155,74.57188,287.8291,-51.23172,70.33007,4.241803,0,17433.51,-,-
+93,1898.131,542.5043,513.3238,1362.408,-282.1542,107.8346,270.8083,-56.08431,102.0343,5.800274,0,23354.69,-,-
+94,1980.033,473.9185,442.0008,1225.946,-297.3061,98.26631,254.1982,-61.64599,91.64824,6.618071,0,22660.56,-,-
+95,2027.516,219.2136,200.5397,1118.692,-306.228,46.54364,237.5217,-65.01863,42.57878,3.964862,0,15797.86,-,-
+96,2040.799,133.0717,127.8032,1042.907,-308.7518,28.43902,222.8816,-65.98396,27.31307,1.125953,0,13476.4,-,-
+97,1396.846,156.8016,472.1198,1510.407,-202.6215,22.93653,220.9383,-29.63894,69.06043,-46.1239,0,7294.59,-,-
+98,1435.803,625.9942,610.7021,1486.395,-208.7285,94.12257,223.4898,-31.38377,91.8233,2.299267,0,18608.47,-,-
+99,1479.637,596.285,579.1003,1638.52,-215.7419,92.3927,253.8841,-33.42861,89.72998,2.662722,0,18461.63,-,-
+100,1511.026,384.4443,372.0832,1619.301,-220.7642,60.83226,256.2289,-34.93246,58.87632,1.955944,0,13495.06,-,-
+101,1535.129,450.4592,440.943,1540.038,-224.6206,72.41507,247.5739,-36.10964,70.88527,1.529799,0,15363.01,-,-
+102,1563.544,475.8654,464.6609,1552.839,-229.167,77.91532,254.2524,-37.52242,76.08076,1.834564,0,16369.6,-,-
+103,1591.288,445.793,434.8489,1552.04,-233.6061,74.28662,258.6308,-38.92795,72.46291,1.823713,0,15935.56,-,-
+104,1615.981,420.5964,410.8453,1541.956,-237.3172,71.17548,260.9376,-40.16004,69.52534,1.650137,0,15581,-,-
+105,1637.034,376.7959,368.472,1537.732,-240.3699,64.59405,263.6131,-41.20657,63.16708,1.426964,0,14654.49,-,-
+106,1654.957,360.8903,353.7967,1528.068,-242.9688,62.5447,264.8245,-42.10811,61.31534,1.229361,0,14436.09,-,-
+107,1674.975,423.3385,415.4202,1527.41,-245.8714,74.25483,267.9122,-43.12657,72.86594,1.388883,0,16385.63,-,-
+108,1695.262,372.7732,364.7486,1548.608,-248.813,66.17747,274.9204,-44.17113,64.75288,1.424586,0,15265.61,-,-
+109,1709.799,311.5632,305.803,1538.409,-250.9209,55.7853,275.4517,-44.92731,54.75394,1.03136,0,13749.58,-,-
+110,1712.769,138.0533,136.8725,1523.713,-251.3515,24.76135,273.2943,-45.0826,24.54955,0.2118034,0,9194.938,-,-
+111,1702.061,28.0789,32.3534,1474.757,-249.7988,5.004767,262.8598,-44.524,5.766651,-0.7618836,0,6447.526,-,-
+112,1685.925,18.55083,25.00264,1438.175,-247.4592,3.275143,253.9093,-43.68883,4.414207,-1.139064,0,6138.234,-,-
+113,1669.991,25.50993,31.88091,1428.804,-245.1487,4.461204,249.8707,-42.87186,5.575367,-1.114164,0,6197.817,-,-
+114,1656.502,64.22581,69.61542,1425.358,-243.1928,11.14115,247.2547,-42.18628,12.07608,-0.9349269,0,6980.247,-,-
+115,1644.88,60.975,65.61612,1432.581,-241.5076,10.50303,246.7642,-41.60003,11.30247,-0.7994394,0,6838.022,-,-
+116,1634.482,86.8046,90.95547,1427.739,-239.9999,14.8577,244.3755,-41.07899,15.56817,-0.7104735,0,7351.635,-,-
+117,1624.607,69.35912,73.30067,1432.346,-238.568,11.79996,243.6828,-40.58721,12.47053,-0.6705701,0,6903.351,-,-
+118,1610.151,-8.958691,-3.180296,1421.806,-236.4719,-1.510566,239.7372,-39.87262,-0.5362445,-0.9743218,0,5071.328,-,-
+119,1594.136,31.79309,38.19804,1393.639,-234.0618,5.307461,232.6506,-39.07369,6.376687,-1.069226,0,5873.244,-,-
+120,1580.163,27.56288,33.14782,1410.468,-231.8261,4.560947,233.3962,-38.36125,5.485111,-0.9241639,0,5672.295,-,-
+121,1564.78,0.1084973,6.259995,1412.572,-229.3648,0.01777874,231.4689,-37.58449,1.025784,-1.008005,0,5052.063,-,-
+122,1550.539,46.34854,52.04159,1406.345,-227.0862,7.525707,228.3511,-36.87246,8.4501,-0.9243928,0,5874.88,-,-
+123,1539.777,68.03522,72.33276,1424.68,-225.3643,10.97034,229.7225,-36.33889,11.6633,-0.6929553,0,6266.684,-,-
+124,1532.066,107.3345,110.4107,1433.926,-224.1306,17.2205,230.0557,-35.95897,17.71403,-0.4935339,0,7084.224,-,-
+125,1521.599,10.99956,15.17909,1450.146,-222.4558,1.752686,231.0684,-35.44644,2.418658,-0.6659723,0,5066.046,-,-
+126,1504.309,-32.6241,-25.70424,1420.156,-219.6894,-5.139302,223.7184,-34.60787,-4.049212,-1.09009,0,4084.938,-,-
+127,1481.361,-99.95219,-90.74965,1409.226,-216.0177,-15.50536,218.6101,-33.51035,-14.07779,-1.42757,0,2553.177,-,-
+128,1453.792,-123.7437,-112.669,1389.738,-211.6067,-18.83883,211.5747,-32.21516,-17.15281,-1.686018,0,1924.042,-,-
+129,1423.724,-133.8422,-121.7508,1386.066,-206.7958,-19.95481,206.6513,-30.83161,-18.15207,-1.80274,0,1574.076,-,-
+130,1385.246,-131.4476,-115.9232,1385.915,-201.2295,-19.06813,201.0444,-29.19088,-16.81612,-2.252012,0,1480.202,-,-
+131,1337.242,-131.7597,-112.3143,1386.438,-195.469,-18.45105,194.1507,-27.37263,-15.72801,-2.723043,0,1351.391,-,-
+132,1293.188,-131.7594,-113.9302,1386.407,-190.1826,-17.84316,187.7504,-25.75496,-15.42869,-2.414474,0,1239.262,-,-
+133,1281.755,280.8157,285.3856,1387.649,-188.8106,37.69251,186.2573,-25.34312,38.3059,-0.6133919,0,8923.244,-,-
+134,1286.484,88.66115,86.78277,1542.419,-189.3781,11.94446,207.7951,-25.51307,11.6914,0.2530556,0,5330.455,-,-
+135,1283.596,132.1435,133.2941,1470.823,-189.0315,17.76245,197.7048,-25.40921,17.9171,-0.154655,0,6115.976,-,-
+136,1285.597,184.868,184.0723,1486.977,-189.2717,24.8883,200.1878,-25.48115,24.78118,0.1071213,0,7139.962,-,-
+137,1291.778,219.8263,217.3725,1506.494,-190.0134,29.73693,203.7905,-25.70399,29.405,0.3319256,0,7840.916,-,-
+138,1303.359,298.118,293.53,1519.203,-191.4031,40.68937,207.3521,-26.12411,40.06316,0.6262089,0,9388.702,-,-
+139,1321.147,351.1894,344.1585,1547.789,-193.5376,48.58711,214.1369,-26.77597,47.6144,0.9727128,0,10788.32,-,-
+140,1343.046,388.3968,379.7535,1567.049,-196.1655,54.62547,220.3951,-27.5894,53.40984,1.215631,0,11867.24,-,-
+141,1367.31,405.9631,396.3932,1580.564,-199.0772,58.12757,226.3121,-28.50475,56.75732,1.370251,0,12503.42,-,-
+142,1398.372,533.6426,521.4193,1586.355,-202.8046,78.14511,232.3013,-29.69814,76.35516,1.78995,0,15906.99,-,-
+143,1441.017,652.3432,635.6244,1618.891,-209.5627,98.44051,244.2954,-31.62363,95.91759,2.522923,0,19304.12,-,-
+144,1491.115,700.5682,680.9673,1642.688,-217.5784,109.3932,256.5045,-33.97469,106.3325,3.060659,0,21105.35,-,-
+145,1533.099,501.866,485.3878,1645.194,-224.2958,80.57245,264.1289,-36.00974,77.92695,2.645497,0,16660.79,-,-
+146,1561.824,437.2379,425.9124,1570.433,-228.8918,71.51194,256.8504,-37.43613,69.6596,1.852338,0,15328,-,-
+147,1584.033,370.9688,362.1931,1542.367,-232.4453,61.53614,255.8472,-38.55792,60.08042,1.455722,0,13918.84,-,-
+148,1597.119,254.0642,248.8781,1517.213,-234.539,42.49221,253.7538,-39.22663,41.62484,0.8673695,0,11035.82,-,-
+149,1603.93,242.5883,239.8837,1479.453,-235.5699,40.7459,248.4936,-39.56706,40.29163,0.4542723,0,10811.12,-,-
+150,1607.558,188.3012,186.8591,1476.785,-236.0959,31.6992,248.6065,-39.74511,31.45644,0.2427594,0,9453.464,-,-
+151,1604.965,115.1183,116.151,1458.706,-235.7199,19.3481,245.167,-39.61781,19.52167,-0.1735651,0,7805.927,-,-
+152,1600.142,139.5388,141.4609,1433.319,-235.0206,23.38202,240.1762,-39.38157,23.70411,-0.322085,0,8321.567,-,-
+153,1596.299,132.9996,134.5307,1442.266,-234.4078,22.23274,241.0951,-39.18456,22.48869,-0.2559469,0,8146.651,-,-
+154,1589.192,72.16615,75.00057,1442.031,-233.2707,12.00988,239.9825,-38.82087,12.48158,-0.4717039,0,6735.84,-,-
+155,1578.793,62.52636,66.67814,1424.337,-231.6069,10.33753,235.4868,-38.29175,11.02395,-0.6864161,0,6441.528,-,-
+156,1566.889,37.36164,42.11662,1423.943,-229.7022,6.130456,233.6465,-37.69052,6.910674,-0.7802182,0,5789.528,-,-
+157,1551.426,-13.10146,-6.917516,1418.969,-227.2282,-2.128527,230.5327,-36.91661,-1.123854,-1.004673,0,4711.783,-,-
+158,1528.707,-104.0995,-94.99167,1406.439,-223.5931,-16.66486,225.151,-35.79409,-15.20682,-1.45804,0,2648.69,-,-
+159,1502.589,-82.80148,-72.31786,1379.31,-219.4143,-13.02887,217.0354,-34.525,-11.37927,-1.649604,0,3012.819,-,-
+160,1476.041,-117.264,-106.6046,1391.963,-215.1666,-18.12558,215.1566,-33.25844,-16.47795,-1.647626,0,2161.942,-,-
+161,1439.148,-132.9151,-118.0458,1385.627,-209.2637,-20.03126,208.824,-31.53755,-17.79036,-2.240899,0,1663.382,-,-
+162,1386.845,-132.9506,-111.745,1385.777,-201.4214,-19.30843,201.2565,-29.25244,-16.22873,-3.079699,0,1452.39,-,-
+163,1331.801,-133.8245,-111.468,1385.583,-194.8161,-18.66396,193.2415,-27.1702,-15.54598,-3.117978,0,1293.743,-,-
+164,1276.609,-128.6442,-106.2066,1385.146,-188.1931,-17.19795,185.1749,-25.15882,-14.19835,-2.999598,0,1263.141,-,-
+165,1222.116,-127.9566,-105.7884,1387.107,-181.6539,-16.37584,177.5216,-23.24801,-13.53877,-2.837072,0,1053.489,-,-
+166,1183.826,-125.4862,-110.0028,1387.964,-177.4635,-15.55652,172.0659,-22.00014,-13.63705,-1.919466,0,960.2736,-,-
+167,1165.594,28.10565,35.41756,1389.707,-175.7314,3.430595,169.6286,-21.44991,4.323093,-0.8924977,0,3666.319,-,-
+168,1154.524,-6.244895,-1.818656,1448.141,-174.6798,-0.755017,175.0823,-21.11904,-0.2198782,-0.5351388,0,3094.676,-,-
+169,1145.307,65.11436,68.7969,1435.139,-173.8042,7.809574,172.1253,-20.84542,8.251244,-0.4416704,0,4220.387,-,-
+170,1136.212,-4.860706,-1.227013,1462.113,-172.9401,-0.5783455,173.9679,-20.57708,-0.1459947,-0.4323508,0,3078.992,-,-
+171,1127.318,67.56091,71.11412,1435.663,-172.0952,7.975731,169.4835,-20.31627,8.395197,-0.4194656,0,4192.891,-,-
+172,1127.425,177.1121,177.0695,1462.833,-172.1054,20.91051,172.7074,-20.31939,20.90548,0.005029416,0,6147.238,-,-
+173,1132.316,168.7684,166.8263,1503.63,-172.57,20.01186,178.2942,-20.46264,19.78157,0.2302854,0,6020.309,-,-
+174,1134.976,134.4239,133.3666,1500.64,-172.8227,15.97687,178.3577,-20.54074,15.85121,0.1256567,0,5416.246,-,-
+175,1140.847,233.9027,231.5724,1487.65,-173.3805,27.94418,177.7283,-20.71363,27.66578,0.2783994,0,7169.132,-,-
+176,1153.503,275.2409,270.2323,1524.251,-174.5828,33.24761,184.1212,-21.08865,32.64259,0.6050165,0,7971.472,-,-
+177,1173.508,388.9442,381.0513,1538.956,-176.4833,47.79715,189.1215,-21.68793,46.8272,0.9699469,0,10251.02,-,-
+178,1195.77,328.0738,319.2975,1580.639,-178.5981,41.08165,197.9288,-22.36419,39.98267,1.098981,0,9270.215,-,-
+179,1214.31,318.3061,310.9846,1558.649,-180.7172,40.47652,198.2014,-22.98041,39.54551,0.931007,0,9206.757,-,-
+180,1235.31,380.5298,372.2441,1554.836,-183.2372,49.22585,201.1357,-23.70382,48.15401,1.071837,0,10570.94,-,-
+181,1262.019,440.1047,429.5887,1577.179,-186.4423,58.1635,208.4373,-24.6399,56.77373,1.389773,0,12094.41,-,-
+182,1290.77,430.0348,418.7212,1598.863,-189.8924,58.12743,216.1169,-25.66759,56.59818,1.52925,0,12191.17,-,-
+183,1317.063,396.8761,386.5177,1595.544,-193.0476,54.73816,220.0614,-26.6256,53.30949,1.428664,0,11792.24,-,-
+184,1343.879,445.5239,434.9593,1583.359,-196.2655,62.69888,222.8272,-27.62058,61.21212,1.48676,0,13050.7,-,-
+185,1364.448,275.5064,267.383,1602.053,-198.7338,39.36564,228.9088,-28.39601,38.20493,1.160712,0,9503.778,-,-
+186,1372.416,190.3846,187.2231,1540.215,-199.6899,27.3619,221.3583,-28.69925,26.90753,0.4543749,0,7786.681,-,-
+187,1376.097,184.8251,183.3622,1508.703,-200.1317,26.63413,217.411,-28.83988,26.42333,0.2108036,0,7702.954,-,-
+188,1374.269,77.01573,77.74364,1506.902,-199.9123,11.08357,216.8629,-28.77,11.18833,-0.1047558,0,5623.243,-,-
+189,1368.546,102.6343,104.9165,1466.502,-199.2255,14.70892,210.1699,-28.55177,15.03598,-0.327064,0,6079.081,-,-
+190,1362.863,74.98503,77.25121,1476.148,-198.5436,10.70177,210.674,-28.33588,11.02519,-0.3234253,0,5513.225,-,-
+191,1356.038,78.03934,80.76212,1465.761,-197.7245,11.0819,208.1439,-28.07767,11.46854,-0.3866442,0,5529.301,-,-
+192,1346.136,10.15046,14.1053,1466.98,-196.5363,1.430881,206.7958,-27.70514,1.988382,-0.5575015,0,4219.15,-,-
+193,1325.11,-125.3171,-116.8838,1441.367,-194.0132,-17.38966,200.0115,-26.92228,-16.2194,-1.170257,0,1457.168,-,-
+194,1284.63,-125.2688,-108.9066,1389.025,-189.1556,-16.85192,186.8602,-25.44637,-14.65078,-2.201144,0,1355.156,-,-
+195,1238.373,-128.3282,-109.5772,1388.77,-183.6048,-16.64188,180.0986,-23.81026,-14.2102,-2.431676,0,1127.828,-,-
+196,1193.929,-121.8544,-103.8393,1387.585,-178.4232,-15.2352,173.487,-22.30789,-12.98282,-2.252384,0,1045.102,-,-
+197,1155.988,-123.5645,-108.2187,1390.305,-174.8189,-14.95807,168.3031,-21.16266,-13.10039,-1.857681,0,946.9177,-,-
+198,1137.273,17.33537,24.84403,1390.401,-173.0409,2.064555,165.5897,-20.6083,2.958799,-0.8942443,0,3436.898,-,-
+199,1132.786,132.1742,133.9633,1444.027,-172.6147,15.67917,171.2978,-20.47643,15.8914,-0.2122258,0,5365.638,-,-
+200,1141.075,282.235,278.9485,1486.705,-173.4021,33.72513,177.651,-20.72035,33.33242,0.3927116,0,8012.46,-,-
+201,1156.7,288.4862,282.3105,1541.908,-174.8865,34.94414,186.7703,-21.18388,34.19608,0.7480633,0,8243.312,-,-
+202,1179.433,433.1273,424.1682,1543.597,-177.0461,53.49553,190.6496,-21.86695,52.38899,1.106537,0,11076.96,-,-
+203,1213.827,533.6437,520.1509,1595.32,-180.6592,67.83234,202.7838,-22.9639,66.11726,1.715078,0,13463.11,-,-
+204,1258.176,647.7133,630.3763,1630.563,-185.9811,85.34004,214.8362,-24.50411,83.05579,2.28425,0,16548.54,-,-
+205,1305.898,615.5694,596.9261,1671.516,-191.7077,84.18115,228.5854,-26.21667,81.63163,2.549525,0,16516.85,-,-
+206,1353.754,662.1136,643.4066,1660.178,-197.4505,93.8644,235.3548,-27.99153,91.2124,2.651995,0,18269.16,-,-
+207,1396.935,530.9465,514.0288,1678.118,-202.6322,77.67041,245.4863,-29.6424,75.19558,2.47483,0,15821.61,-,-
+208,1438.893,645.3757,628.9227,1618.688,-209.2229,97.24555,243.9047,-31.52581,94.7664,2.479159,0,19110.46,-,-
+209,1487.004,666.1713,647.3359,1642.031,-216.9206,103.7353,255.6949,-33.7786,100.8023,2.93302,0,20232.32,-,-
+210,1529.298,540.8066,524.209,1634.988,-223.6877,86.60893,261.8396,-35.82307,83.95088,2.658054,0,17641.09,-,-
+211,1563.974,519.0283,505.3824,1581.921,-229.2358,85.00592,259.0854,-37.54401,82.77102,2.234901,0,17516.64,-,-
+212,1596.393,500.7312,487.9616,1563.793,-234.4229,83.70918,261.4253,-39.18938,81.57443,2.134751,0,17454.87,-,-
+213,1624.446,437.4968,426.4298,1559.941,-238.5447,74.42327,265.364,-40.57922,72.54066,1.882612,0,16132.98,-,-
+214,1640.138,253.9133,247.6988,1543.796,-240.82,43.61084,265.1545,-41.362,42.54347,1.067368,0,11485.44,-,-
+215,1643,174.5831,173.4452,1489.427,-241.235,30.03782,256.2627,-41.50558,29.84203,0.1957847,0,9440.03,-,-
+216,1638.257,94.12595,96.01611,1464.097,-240.5472,16.14805,251.1773,-41.26777,16.47232,-0.3242709,0,7537.55,-,-
+217,1629.605,90.32108,93.77315,1436.357,-239.2927,15.41346,245.1169,-40.83574,16.00256,-0.5891012,0,7400.79,-,-
+218,1630.478,284.9937,284.6463,1435.299,-239.4193,48.66074,245.0676,-40.87923,48.60144,0.05930305,0,12186.9,-,-
+219,1642.785,328.1166,323.2375,1498.332,-241.2038,56.44656,257.7611,-41.49479,55.60721,0.8393521,0,13431.13,-,-
+220,1656.623,324.1941,318.7104,1514.342,-243.2103,56.24157,262.7098,-42.19241,55.29026,0.9513068,0,13475.6,-,-
+221,1669.48,312.4716,307.3751,1516.174,-245.0746,54.62864,265.069,-42.84579,53.73763,0.8910128,0,13308.15,-,-
+222,1680.188,283.4135,279.1659,1515.49,-246.6273,49.86628,266.6487,-43.39379,49.11893,0.7473452,0,12670,-,-
+223,1689.163,279.1665,275.6046,1509.757,-247.9286,49.38141,267.0591,-43.85578,48.75134,0.6300723,0,12654.84,-,-
+224,1695.907,239.6342,236.9558,1510.49,-248.9065,42.55782,268.2554,-44.20454,42.08216,0.4756607,0,11704.2,-,-
+225,1700.851,243.3625,241.398,1501.278,-249.6234,43.34595,267.3968,-44.46109,42.99605,0.3499058,0,11852.67,-,-
+226,1706.79,260.6488,258.2896,1503.995,-250.4846,46.58697,268.8159,-44.77027,46.16529,0.4216813,0,12362.04,-,-
+227,1713.763,266.5962,263.8271,1510.533,-251.4956,47.84464,271.0876,-45.13462,47.34768,0.4969591,0,12589.24,-,-
+228,1720.427,256.7214,254.0747,1514.005,-252.4619,46.25162,272.7672,-45.48422,45.77478,0.4768417,0,12404.27,-,-
+229,1727.319,273.0472,270.3101,1513.517,-253.4612,49.38998,273.7717,-45.84719,48.89489,0.4950959,0,12899.53,-,-
+230,1725.733,85.38517,86.01656,1517.501,-253.2313,15.43067,274.2404,-45.76354,15.54477,-0.1141038,0,7917.964,-,-
+231,1714.932,80.69829,85.00993,1465.649,-251.6651,14.49238,263.2119,-45.19585,15.2667,-0.774316,0,7698.164,-,-
+232,1703.74,70.66096,75.12929,1459.92,-250.0423,12.60699,260.472,-44.61135,13.40421,-0.7972171,0,7407.18,-,-
+233,1690.842,42.47742,47.62954,1452.069,-248.1721,7.521246,257.1099,-43.94248,8.433504,-0.9122583,0,6701.299,-,-
+234,1676.749,41.90197,47.53364,1438.48,-246.1286,7.357514,252.5808,-43.21741,8.346373,-0.9888586,0,6603.908,-,-
+235,1663.421,53.73914,59.06407,1432.981,-244.196,9.360985,249.6154,-42.53725,10.28855,-0.9275653,0,6787.909,-,-
+236,1648.951,15.1749,20.95827,1430.939,-242.0979,2.620367,247.0912,-41.80492,3.619027,-0.9986598,0,5841.106,-,-
+237,1633.192,22.94546,29.24678,1412.975,-239.8129,3.924303,241.6576,-41.01458,5.002003,-1.0777,0,5919.836,-,-
+238,1617.433,10.38626,16.68789,1409.397,-237.5278,1.759196,238.7197,-40.23179,2.826547,-1.067351,0,5545.211,-,-
+239,1602.775,41.24259,47.10218,1399.786,-235.4024,6.922247,234.9432,-39.51046,7.905733,-0.9834862,0,6145.36,-,-
+240,1589.501,35.22456,40.52882,1411.455,-233.3202,5.863204,234.9398,-38.83664,6.74611,-0.8829063,0,5914.4,-,-
+241,1576.428,42.4172,47.64097,1412.482,-231.2285,7.002365,233.177,-38.17193,7.864722,-0.8623572,0,5975.049,-,-
+242,1567.118,108.7932,112.5089,1417.038,-229.7389,17.85385,232.5476,-37.70204,18.46364,-0.6097859,0,7384.198,-,-
+243,1564.686,182.1222,183.0908,1439.974,-229.3498,29.84137,235.9449,-37.57977,30.00007,-0.1586975,0,9000.88,-,-
+244,1567.427,216.6412,215.5515,1463.832,-229.7883,35.55962,240.2742,-37.71759,35.38074,0.178876,0,9801.553,-,-
+245,1572.196,226.3613,224.4664,1474.038,-230.5514,37.26812,242.6856,-37.95797,36.95614,0.3119749,0,10060.53,-,-
+246,1576.469,208.5297,206.8316,1476.131,-231.235,34.42564,243.6908,-38.174,34.14531,0.2803271,0,9684.789,-,-
+247,1576.307,136.6511,136.7155,1470.421,-231.2091,22.55706,242.7231,-38.1658,22.5677,-0.01064106,0,8075.542,-,-
+248,1570.826,97.96491,100.1498,1447.918,-230.3322,16.11489,238.1775,-37.88884,16.47429,-0.3594035,0,7171.021,-,-
+249,1563.423,93.82656,96.77948,1436.728,-229.1477,15.3614,235.223,-37.51635,15.84486,-0.4834555,0,7022.25,-,-
+250,1553.562,45.01631,48.95279,1437.766,-227.5699,7.323642,233.9081,-37.02304,7.964062,-0.6404199,0,5862.97,-,-
+251,1536.916,-43.64536,-36.98547,1424.929,-224.9065,-7.024523,229.3358,-36.19769,-5.952643,-1.07188,0,3998.378,-,-
+252,1517.233,-22.20588,-14.32253,1398.079,-221.7573,-3.528165,222.1328,-35.23375,-2.275624,-1.252541,0,4364.28,-,-
+253,1497.389,-52.17993,-44.23098,1409.751,-218.5822,-8.182137,221.0577,-34.27505,-6.935693,-1.246444,0,3638.88,-,-
+254,1471.863,-129.7375,-119.4917,1403.956,-214.4981,-19.99684,216.3961,-33.06126,-18.41763,-1.579213,0,1878.493,-,-
+255,1442.372,-131.897,-120.0415,1380.628,-209.7795,-19.92236,208.5368,-31.68611,-18.13165,-1.790714,0,1699.533,-,-
+256,1414.871,-101.527,-90.47707,1384.572,-205.3793,-15.04275,205.1451,-30.43002,-13.40553,-1.637216,0,2219.569,-,-
+257,1387.812,-128.767,-117.8943,1398.685,-201.5374,-18.71388,203.2728,-29.28971,-17.13374,-1.580141,0,1543.594,-,-
+258,1362.057,-83.23212,-72.88641,1388.299,-198.4468,-11.87175,198.0191,-28.30532,-10.3961,-1.475654,0,2443.914,-,-
+259,1346.257,54.07869,60.40297,1405.922,-196.5508,7.623997,198.2064,-27.70968,8.515593,-0.8915963,0,5008.681,-,-
+260,1345.787,220.9541,221.1412,1457.786,-196.4944,31.13917,205.4466,-27.69206,31.16553,-0.02636111,0,8198.562,-,-
+261,1358.712,333.6551,328.5363,1519.57,-198.0454,47.47378,216.2104,-28.1787,46.74545,0.7283328,0,10775.96,-,-
+262,1379.066,380.8911,372.8513,1560.774,-200.4879,55.00656,225.3999,-28.95356,53.84549,1.161071,0,12068.53,-,-
+263,1401.382,381.2917,372.4821,1577.677,-203.2211,55.95547,231.5278,-29.82318,54.66264,1.292827,0,12305.13,-,-
+264,1424.557,404.4114,395.2643,1571.296,-206.9291,60.3298,234.4048,-30.86953,58.96523,1.364565,0,13088.56,-,-
+265,1447.437,381.0715,372.0387,1573.158,-210.5899,57.76101,238.4518,-31.92022,56.39186,1.369148,0,12735.44,-,-
+266,1469.605,395.2474,386.4926,1558.484,-214.1368,60.82727,239.8456,-32.95494,59.47992,1.347347,0,13336.24,-,-
+267,1493.117,413.6466,404.364,1556.443,-217.8987,64.6773,243.3636,-34.07039,63.22589,1.451412,0,14035.23,-,-
+268,1515.124,370.8573,362.1635,1556.314,-221.4198,58.84149,246.9302,-35.13123,57.4621,1.379386,0,13187.24,-,-
+269,1535.841,392.2365,384.0481,1535.497,-224.7346,63.08453,246.9585,-36.14471,61.76757,1.316962,0,13958.87,-,-
+270,1557.969,404.4594,395.7163,1535.803,-228.275,65.98759,250.5664,-37.2431,64.56117,1.426421,0,14500.55,-,-
+271,1578.323,362.2679,354.2205,1533.596,-231.5317,59.87621,253.4753,-38.26793,58.54613,1.330078,0,13633.58,-,-
+272,1596.594,366.5314,359.3023,1514.146,-234.455,61.28219,253.1576,-39.1997,60.07353,1.208664,0,13936.99,-,-
+273,1611.991,307.5205,301.4227,1516.898,-236.7387,51.9117,256.0635,-39.96322,50.88236,1.029342,0,12574.25,-,-
+274,1621.194,242.9022,239.2504,1500.462,-238.0731,41.23775,254.735,-40.41792,40.61778,0.6199704,0,11001.19,-,-
+275,1619.421,83.13358,83.83949,1480.15,-237.8161,14.09824,251.0117,-40.33012,14.21795,-0.1197111,0,7179.405,-,-
+276,1605.113,-16.83658,-11.11756,1424.597,-235.7414,-2.830011,239.4563,-39.62507,-1.868717,-0.9612941,0,4866.479,-,-
+277,1588.762,32.55358,39.09373,1392.197,-233.2019,5.416094,231.6264,-38.79892,6.50421,-1.088116,0,5849.199,-,-
+278,1576.67,63.71032,68.54057,1411.518,-231.2672,10.51911,233.0537,-38.18418,11.31663,-0.7975154,0,6451.732,-,-
+279,1569.348,128.6064,131.5268,1423.699,-230.0957,21.13539,233.9732,-37.81433,21.61535,-0.4799578,0,7843.047,-,-
+280,1567.91,184.0075,184.58,1445.831,-229.8656,30.2124,237.3927,-37.7419,30.3064,-0.09399752,0,9067.521,-,-
+281,1571.135,225.8775,224.5955,1463.46,-230.3816,37.16338,240.7815,-37.90443,36.95245,0.2109283,0,10041.36,-,-
+282,1576.267,225.6991,223.6603,1475.985,-231.2027,37.25532,243.6353,-38.16377,36.91877,0.3365473,0,10082.22,-,-
+283,1582.797,256.5382,253.945,1474.044,-232.2475,42.52124,244.3229,-38.49505,42.09142,0.4298178,0,10948.31,-,-
+284,1590.294,247.7415,244.7653,1482.072,-233.447,41.25768,246.8172,-38.87715,40.76203,0.4956531,0,10800.24,-,-
+285,1597.817,259.4486,256.4619,1477.018,-234.6507,43.41172,247.1391,-39.26247,42.91198,0.4997346,0,11182.36,-,-
+286,1605.462,252.2189,249.1839,1481.53,-235.792,42.40394,249.0802,-39.6422,41.89369,0.5102514,0,11076.17,-,-
+287,1612.273,244.504,241.7994,1480.908,-236.7796,41.28128,250.0319,-39.97711,40.82465,0.4566321,0,10948.56,-,-
+288,1619.582,263.8737,260.9717,1480.265,-237.8394,44.75357,251.0562,-40.33809,44.26139,0.4921818,0,11526.21,-,-
+289,1628.167,272.7591,269.3519,1488.449,-239.0842,46.50577,253.7824,-40.76416,45.92483,0.5809404,0,11846.34,-,-
+290,1637.464,281.2563,277.5672,1493.461,-240.4323,48.22838,256.0909,-41.22808,47.59579,0.6325875,0,12163.94,-,-
+291,1648.723,315.6714,311.2064,1498.715,-242.0648,54.5019,258.759,-41.79343,53.73099,0.7709109,0,13172.07,-,-
+292,1661.419,314.5045,309.4717,1511.854,-243.9057,54.71856,263.0374,-42.43555,53.84293,0.8756322,0,13275.72,-,-
+293,1676.91,376.8787,370.7427,1515.02,-246.152,66.18201,266.046,-43.22567,65.1045,1.077512,0,15151.65,-,-
+294,1695.235,377.8835,370.6308,1536.186,-248.8091,67.08361,272.7108,-44.16973,65.79607,1.287538,0,15406.91,-,-
+295,1711.21,335.0712,328.7439,1539.962,-251.1254,60.04392,275.9573,-45.00105,58.91008,1.133842,0,14418.61,-,-
+296,1724.968,336.1577,330.7047,1532.28,-253.1204,60.72293,276.7883,-45.72321,59.73791,0.9850166,0,14619.46,-,-
+297,1739.437,352.6974,346.9636,1536.123,-255.2184,64.24503,279.8101,-46.4889,63.20061,1.044426,0,15257.42,-,-
+298,1753.772,337.8669,332.1859,1543.633,-257.2969,62.0508,283.4953,-47.25376,61.00745,1.043355,0,15024.29,-,-
+299,1768,354.618,348.9789,1543.912,-259.36,65.65557,285.8469,-48.01908,64.61153,1.044039,0,15665.12,-,-
+300,1781.368,324.4095,319.1099,1551.088,-261.2984,60.51679,289.3468,-48.74376,59.52817,0.9886206,0,14993.79,-,-
+301,1794.521,353.8322,348.6174,1548.421,-263.2055,66.49278,290.9821,-49.46206,65.5128,0.9799822,0,15972.46,-,-
+302,1809.072,356.8266,351.0596,1537.472,-265.6783,67.59923,291.2672,-50.33158,66.50668,1.092547,0,16261.57,-,-
+303,1818.449,252.9226,249.2008,1519.33,-267.4131,48.16343,289.3224,-50.92281,47.4547,0.7087328,0,13524.64,-,-
+304,1817.24,140.9867,141.4679,1501.393,-267.1894,26.8299,285.7166,-50.84639,26.92148,-0.09158371,0,10427.37,-,-
+305,1805.995,42.98833,47.47704,1501.863,-265.1091,8.130097,284.0374,-50.13832,8.979017,-0.8489196,0,7644.279,-,-
+306,1786.662,-29.16826,-21.43335,1487.643,-262.066,-5.457346,278.3362,-49.03223,-4.010155,-1.447191,0,5653.945,-,-
+307,1765.233,-8.876257,-0.2971662,1460.826,-258.9588,-1.640818,270.0407,-47.86977,-0.05493259,-1.585886,0,6003.647,-,-
\ No newline at end of file
diff --git a/VectoCoreTest/VectoCoreTest.csproj b/VectoCoreTest/VectoCoreTest.csproj
index 661347087f4a69979b960cb7472e25a2548a7c55..ac585d368ff0cca3d054795c66bbc1bb03525ced 100644
--- a/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCoreTest/VectoCoreTest.csproj
@@ -124,6 +124,9 @@
<None Include="TestData\Components\Retarder.vrlm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Cycles\Coach Engine Only short.vdri">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Cycles\Coach First Cycle only.vdri">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -151,6 +154,9 @@
<None Include="TestData\Cycles\Coach Engine Only.vdri">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Results\EngineOnlyCycles\24tCoach_EngineOnly short.vmod">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Results\EngineOnlyCycles\24tCoach_EngineOnlyPaux.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>