Skip to content

Commit 8afbbf8

Browse files
tikig21tikig21
committed
minor changes
1 parent d680dc7 commit 8afbbf8

4 files changed

Lines changed: 19 additions & 17 deletions

File tree

‎Test_Numerics/Data/Paired Data/Test_PairedData.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public Test_PairedData()
6464
double[] xVals = new double[] { 230408, 288010, 345611, 403213, 460815, 518417, 576019, 633612, 691223, 748825, 806427, 864029, 921631, 1036834, 1152038 };
6565
double[] yVals = new double[] { 1519.7, 1520.5, 1520.9, 1521.7, 1523.5, 1525.9, 1528.4, 1530.9, 1533.2, 1534.7, 1535.9, 1538, 1541.3, 1547.7, 1552.7 };
6666
_dataset1 = new OrderedPairedData(xVals, yVals, true, SortOrder.Ascending, true, SortOrder.Ascending);
67-
_dataset2 = new OrderedPairedData(xVals.Reverse().ToArray(), yVals, true, SortOrder.Descending, true, SortOrder.Ascending);
68-
_dataset3 = new OrderedPairedData(xVals, yVals.Reverse().ToArray(), true, SortOrder.Ascending, true, SortOrder.Descending);
69-
_dataset4 = new OrderedPairedData(xVals.Reverse().ToArray(), yVals.Reverse().ToArray(), true, SortOrder.Descending, true, SortOrder.Descending);
67+
_dataset2 = new OrderedPairedData(Enumerable.Reverse(xVals).ToArray(), yVals, true, SortOrder.Descending, true, SortOrder.Ascending);
68+
_dataset3 = new OrderedPairedData(xVals, Enumerable.Reverse(yVals).ToArray(), true, SortOrder.Ascending, true, SortOrder.Descending);
69+
_dataset4 = new OrderedPairedData(Enumerable.Reverse(xVals).ToArray(), yVals.Reverse().ToArray(), true, SortOrder.Descending, true, SortOrder.Descending);
7070
}
7171

7272
/// <summary>
@@ -184,12 +184,12 @@ public void Test_Indexing()
184184

185185
dataset11.Remove(ordinate);
186186
bool test4 = dataset11.Contains(ordinate);
187-
Assert.AreEqual(false, test4);
187+
Assert.IsFalse(test4);
188188

189189
Ordinate newOrdinate = dataset11[4];
190190
dataset11.RemoveAt(4);
191191
bool test5 = dataset11.Contains(newOrdinate);
192-
Assert.AreEqual(false, test5);
192+
Assert.IsFalse(test5);
193193

194194
Ordinate newOrdinate2 = new Ordinate(1243177, 1563.8);
195195
dataset11.Add(newOrdinate2);

‎Test_Numerics/Data/Paired Data/Test_UncertainPairedData.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public Test_UncertainPairedData()
6868
UnivariateDistributionBase[] yVals = new UnivariateDistributionBase[] { new Triangular(1, 2, 3), new Triangular(2, 4, 5), new Triangular(6, 8, 12), new Triangular(13, 19, 20) };
6969

7070
_dataset1 = new UncertainOrderedPairedData(xVals, yVals, true, SortOrder.Ascending, true, SortOrder.Ascending, UnivariateDistributionType.Triangular);
71-
_dataset2 = new UncertainOrderedPairedData(xVals.Reverse().ToArray(), yVals, true, SortOrder.Descending, true, SortOrder.Ascending, UnivariateDistributionType.Triangular);
72-
_dataset3 = new UncertainOrderedPairedData(xVals, yVals.Reverse().ToArray(), true, SortOrder.Ascending, true, SortOrder.Descending, UnivariateDistributionType.Triangular);
73-
_dataset4 = new UncertainOrderedPairedData(xVals.Reverse().ToArray(), yVals.Reverse().ToArray(), true, SortOrder.Descending, true, SortOrder.Descending, UnivariateDistributionType.Triangular);
71+
_dataset2 = new UncertainOrderedPairedData(Enumerable.Reverse(xVals).ToArray(), yVals, true, SortOrder.Descending, true, SortOrder.Ascending, UnivariateDistributionType.Triangular);
72+
_dataset3 = new UncertainOrderedPairedData(xVals, Enumerable.Reverse(yVals).ToArray(), true, SortOrder.Ascending, true, SortOrder.Descending, UnivariateDistributionType.Triangular);
73+
_dataset4 = new UncertainOrderedPairedData(Enumerable.Reverse(xVals).ToArray(), Enumerable.Reverse(yVals).ToArray(), true, SortOrder.Descending, true, SortOrder.Descending, UnivariateDistributionType.Triangular);
7474
}
7575

7676
/// <summary>
@@ -112,9 +112,9 @@ public void Test_CurveSample()
112112
double[] yMeanVals = new double[] { 2, 3.66667, 8.66667, 17.33333 };
113113

114114
var data1Expected = new OrderedPairedData(xVals, yMeanVals, true, SortOrder.Ascending, true, SortOrder.Ascending);
115-
var data2Expected = new OrderedPairedData(xVals.Reverse().ToArray(), yMeanVals, true, SortOrder.Descending, true, SortOrder.Ascending);
116-
var data3Expected = new OrderedPairedData(xVals, yMeanVals.Reverse().ToArray(), true, SortOrder.Ascending, true, SortOrder.Descending);
117-
var data4Expected = new OrderedPairedData(xVals.Reverse().ToArray(), yMeanVals.Reverse().ToArray(), true, SortOrder.Descending, true, SortOrder.Descending);
115+
var data2Expected = new OrderedPairedData(Enumerable.Reverse(xVals).ToArray(), yMeanVals, true, SortOrder.Descending, true, SortOrder.Ascending);
116+
var data3Expected = new OrderedPairedData(xVals, Enumerable.Reverse(yMeanVals).ToArray(), true, SortOrder.Ascending, true, SortOrder.Descending);
117+
var data4Expected = new OrderedPairedData(Enumerable.Reverse(xVals).ToArray(), Enumerable.Reverse(yMeanVals).ToArray(), true, SortOrder.Descending, true, SortOrder.Descending);
118118

119119
for (int i = 0; i < data1.Count; i++)
120120
{
@@ -153,9 +153,9 @@ public void Test_Curve_Sample_Probability()
153153
double[] yInverseVals = new double[] { 2, 3.732051, 8.535898, 17.58258 };
154154

155155
var data1Expected = new OrderedPairedData(xVals, yInverseVals, true, SortOrder.Ascending, true, SortOrder.Ascending);
156-
var data2Expected = new OrderedPairedData(xVals.Reverse().ToArray(), yInverseVals, true, SortOrder.Descending, true, SortOrder.Ascending);
157-
var data3Expected = new OrderedPairedData(xVals, yInverseVals.Reverse().ToArray(), true, SortOrder.Ascending, true, SortOrder.Descending);
158-
var data4Expected = new OrderedPairedData(xVals.Reverse().ToArray(), yInverseVals.Reverse().ToArray(), true, SortOrder.Descending, true, SortOrder.Descending);
156+
var data2Expected = new OrderedPairedData(Enumerable.Reverse(xVals).ToArray(), yInverseVals, true, SortOrder.Descending, true, SortOrder.Ascending);
157+
var data3Expected = new OrderedPairedData(xVals, Enumerable.Reverse(yInverseVals).ToArray(), true, SortOrder.Ascending, true, SortOrder.Descending);
158+
var data4Expected = new OrderedPairedData(Enumerable.Reverse(xVals).ToArray(), Enumerable.Reverse(yInverseVals).ToArray(), true, SortOrder.Descending, true, SortOrder.Descending);
159159

160160
for (int i = 0; i < data1.Count; i++)
161161
{
@@ -189,12 +189,12 @@ public void Test_IList()
189189
// Test Remove and Contains
190190
pairedData.Remove(ordinate);
191191
bool test2 = pairedData.Contains(ordinate);
192-
Assert.AreEqual(false, test2);
192+
Assert.IsFalse(test2);
193193

194194
// Test RemoveAt and Contains
195195
pairedData.RemoveAt(2);
196196
bool test3 = pairedData.Contains(ordinate);
197-
Assert.AreEqual(false, test3);
197+
Assert.IsFalse(test3);
198198

199199
// Test Insert and IndexOf
200200
pairedData.Insert(2, ordinate);

‎Test_Numerics/Data/Time Series/Test_TimeSeriesDownload.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private static void AssertRoughlyEqual(double a, double b, double relTol = 1e-6,
175175

176176
double denom = Math.Max(Math.Abs(a), Math.Abs(b));
177177
if (denom == 0)
178-
Assert.IsTrue(diff <= absTol);
178+
Assert.IsLessThanOrEqualTo(absTol,diff);
179179
else
180180
Assert.IsTrue(diff / denom <= relTol, $"Values differ: {a} vs {b}");
181181
}

‎Test_Numerics/Test_Numerics.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2121
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
2222
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
23+
<PackageReference Include="NUnit" Version="4.4.0" />
24+
<PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
2325
</ItemGroup>
2426

2527
<ItemGroup>

0 commit comments

Comments
 (0)