diff --git a/Buildings/Controls/OBC/CDL/Reals/Sort.mo b/Buildings/Controls/OBC/CDL/Reals/Sort.mo
index 1ba7b3a4bad..0894cf6d076 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sort.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sort.mo
@@ -13,11 +13,15 @@ block Sort
Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nin]
"Connector of Real output signals"
annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
+ Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yIdx[nin]
+ "Indices of the sorted vector with respect to the original vector"
+ annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+ iconTransformation(extent={{100,-80},{140,-40}})));
equation
- y=Modelica.Math.Vectors.sort(
+ (y, yIdx)=Modelica.Math.Vectors.sort(
u,
ascending=ascending);
+
annotation (
defaultComponentName="sort",
Icon(
@@ -42,10 +46,12 @@ equation
info="
Block that sorts the elements of the input signal u.
-If the parameter ascending = true, then the output signal satisfies
+If the parameter ascending = true, then the output signal y satisfies
yi <= yi+1 for all i ∈ {1, ..., n-1}.
Otherwise, it satisfies
yi >= yi+1 for all i ∈ {1, ..., n-1}.
+The output signal yIdx contains the indices of the sorted elements,
+with respect to the input vector u.
Usage
@@ -62,10 +68,14 @@ In real controllers, measurement noise may cause the output to change frequently
This block may for example be used in a variable air volume flow
controller to access the position of the dampers that are most open.
-",
- revisions="
+", revisions="
-
+April 18, 2024, by Jianjun Hu:
+Added an output variable with the indices of the sorted elements.
+This is for issue 3809.
+
+-
March 2, 2020, by Michael Wetter:
Changed icon to display dynamically the output value.
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Reals_Validation_Sort.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Reals_Validation_Sort.txt
index e75a3df1b5c..5e367944045 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Reals_Validation_Sort.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Reals_Validation_Sort.txt
@@ -1,23 +1,33 @@
-last-generated=2017-09-23
+last-generated=2024-04-18
statistics-simulation=
{
- "numerical Jacobians": "0",
- "nonlinear": " ",
- "linear": " "
+ "linear": " ",
+ "nonlinear": " ",
+ "numerical Jacobians": "0"
}
-sorAsc.u[3]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.800000298022158e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
-sorAsc.u[1]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
time=[0e+00, 1e+00]
+sorAsc.u[1]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+sorAsc.u[2]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.899999701977842e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
+sorAsc.u[3]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.800000298022158e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
sorAsc.u[4]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
sorAsc.u[5]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
-sorAsc.u[2]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.899999701977842e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
-sorAsc.y[4]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
-sorAsc.y[5]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
sorAsc.y[1]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
sorAsc.y[2]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.800000154972077e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
sorAsc.y[3]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.899999845027924e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
-sorDes.y[3]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.899999845027924e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
-sorDes.y[2]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
-sorDes.y[5]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
+sorAsc.y[4]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
+sorAsc.y[5]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
sorDes.y[1]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
+sorDes.y[2]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
+sorDes.y[3]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.899999845027924e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
sorDes.y[4]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.800000154972077e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+sorDes.y[5]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
+sorAsc.yIdx[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+sorAsc.yIdx[2]=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2.999996423728557e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00]
+sorAsc.yIdx[3]=[5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2.000003576271443e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00]
+sorAsc.yIdx[4]=[3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4.000011920727175e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00]
+sorAsc.yIdx[5]=[4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.999988079272825e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00]
+sorDes.yIdx[1]=[4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.999988079272825e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00]
+sorDes.yIdx[2]=[3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4.000011920727175e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 2e+00]
+sorDes.yIdx[3]=[5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2.000003576271443e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00]
+sorDes.yIdx[4]=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2.999996423728557e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4e+00]
+sorDes.yIdx[5]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Sort.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Sort.mos
index 2ae546a6364..c7df5162ee2 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Sort.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Sort.mos
@@ -1,4 +1,8 @@
simulateModel("Buildings.Controls.OBC.CDL.Reals.Validation.Sort", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="Sort1");
-createPlot(id=1, position={53, 14, 959, 905}, y={"sorAsc.u[1]", "sorAsc.u[2]", "sorAsc.u[3]", "sorAsc.u[4]", "sorAsc.u[5]"}, range={0.0, 0.0, -4.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
-createPlot(id=1, position={53, 14, 959, 299}, y={"sorAsc.y[1]", "sorAsc.y[2]", "sorAsc.y[3]", "sorAsc.y[4]", "sorAsc.y[5]"}, range={0.0, 0.0, -6.0, 6.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
-createPlot(id=1, position={53, 14, 959, 299}, y={"sorDes.y[1]", "sorDes.y[2]", "sorDes.y[3]", "sorDes.y[4]", "sorDes.y[5]"}, range={0.0, 0.0, -6.0, 6.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
+createPlot(id=1, position={24, 14, 959, 865}, y={"sorAsc.u[1]", "sorAsc.u[2]", "sorAsc.u[3]", "sorAsc.u[4]", "sorAsc.u[5]"}, range={0.0, 1.0, -4.0, 6.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s");
+createPlot(id=1, position={24, 14, 959, 865}, y={"sorAsc.y[1]", "sorAsc.y[2]", "sorAsc.y[3]", "sorAsc.y[4]", "sorAsc.y[5]"}, range={0.0, 1.0, -4.0, 6.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s");
+createPlot(id=1, position={24, 14, 959, 865}, y={"sorDes.y[1]", "sorDes.y[2]", "sorDes.y[3]", "sorDes.y[4]", "sorDes.y[5]"}, range={0.0, 1.0, -6.0, 6.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s");
+createPlot(id=2, position={1001, 330, 1147, 549}, y={"sorAsc.yIdx[1]", "sorAsc.yIdx[2]", "sorAsc.yIdx[3]", "sorAsc.yIdx[4]", "sorAsc.yIdx[5]"}, range={0.0, 1.0, 0.0, 6.0}, grid=true, subPlot=101, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="s");
+createPlot(id=2, position={1001, 330, 1147, 549}, y={"sorDes.yIdx[1]", "sorDes.yIdx[2]", "sorDes.yIdx[3]", "sorDes.yIdx[4]", "sorDes.yIdx[5]"}, range={0.0, 1.0, 0.0, 6.0}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="s");
+
+
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Reals.Validation.Sort.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Reals.Validation.Sort.mos
index a3673ef0c7f..bf0c4455b56 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Reals.Validation.Sort.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Reals.Validation.Sort.mos
@@ -14,5 +14,15 @@ compareVars :=
"sorDes.y[2]",
"sorDes.y[3]",
"sorDes.y[4]",
- "sorDes.y[5]"
+ "sorDes.y[5]",
+ "sorAsc.yIdx[1]",
+ "sorAsc.yIdx[2]",
+ "sorAsc.yIdx[3]",
+ "sorAsc.yIdx[4]",
+ "sorAsc.yIdx[5]",
+ "sorDes.yIdx[1]",
+ "sorDes.yIdx[2]",
+ "sorDes.yIdx[3]",
+ "sorDes.yIdx[4]",
+ "sorDes.yIdx[5]"
};
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/SortRuntime.mo b/Buildings/Templates/Plants/Controls/StagingRotation/SortRuntime.mo
index 10da1a82e72..8fb4d6bc578 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/SortRuntime.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/SortRuntime.mo
@@ -43,7 +43,7 @@ block SortRuntime
Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1Res[nEquAlt](
each k=false) "Signal for staging runtime reset"
annotation (Placement(transformation(extent={{-180,-110},{-160,-90}})));
- Utilities.SortWithIndices sor(
+ Buildings.Controls.OBC.CDL.Reals.Sort sor(
final ascending=true,
nin=nEquAlt)
"Sort equipment by increasing weighted runtime"
@@ -291,8 +291,8 @@ Note that the staging runtime and the time elapsed since an equipment became una
are both computed from Boolean signals (u1Run and u1Ava).
These are discrete-time, piecewise constant variables,
which is why the caveat in the documentation of
-
-Buildings.Templates.Plants.Controls.Utilities.SortWithIndices
+
+Buildings.Controls.OBC.CDL.Reals.Sort
for purely continuous time-varying variables does not apply here.
Therefore, no sampling is performed before sorting the equipment runtimes.
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mo
index bf527d4ed7d..dccbd808ee7 100644
--- a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mo
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mo
@@ -52,7 +52,7 @@ model EquipmentEnable "Validation model for equipment enable logic"
Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[3]
"Cast to real"
annotation (Placement(transformation(extent={{-28,50},{-8,70}})));
- Utilities.SortWithIndices sort(
+ Buildings.Controls.OBC.CDL.Reals.Sort sort(
ascending=false,
nin=3)
"Sort lead/lag alternate equipment with available equipment first"
@@ -60,7 +60,7 @@ model EquipmentEnable "Validation model for equipment enable logic"
Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1[2]
"Cast to real"
annotation (Placement(transformation(extent={{-28,-90},{-8,-70}})));
- Utilities.SortWithIndices sort1(
+ Buildings.Controls.OBC.CDL.Reals.Sort sort1(
ascending=false,
nin=2)
"Sort lead/lag alternate equipment with available equipment first"
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_11_0_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_11_0_1.mo
index 4d94fb99768..74ebd83cae8 100644
--- a/Buildings/UsersGuide/ReleaseNotes/Version_11_0_1.mo
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_11_0_1.mo
@@ -43,6 +43,12 @@ have been improved in a
| Buildings.Controls.OBC.CDL
|
+| Buildings.Controls.OBC.CDL.Reals.Sort
+ |
+ Added an output variable with the indices of the sorted elements.
+ This is for issue 3809.
+ |
+
| Buildings.Controls.OBC.CDL.Logical.Latch
|
Simplified the implementation.
@@ -65,7 +71,7 @@ have been improved in a
non-backward compatible way:
|