Skip to content

Commit

Permalink
Updated to MzLib 1.0.541 and updated one unit test (#2304)
Browse files Browse the repository at this point in the history
  • Loading branch information
nbollis authored Sep 7, 2023
1 parent dedbef8 commit 20713d6
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion MetaMorpheus/CMD/CMD.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="Microsoft.ML.CpuMath" Version="2.0.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
<PackageReference Include="mzLib" Version="1.0.539" />
<PackageReference Include="mzLib" Version="1.0.541" />
<PackageReference Include="Nett" Version="0.15.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion MetaMorpheus/EngineLayer/EngineLayer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageReference Include="Microsoft.ML.CpuMath" Version="2.0.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
<PackageReference Include="mzLib" Version="1.0.539" />
<PackageReference Include="mzLib" Version="1.0.541" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Nett" Version="0.15.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion MetaMorpheus/GUI/GUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<PackageReference Include="Microsoft.ML.CpuMath" Version="2.0.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
<PackageReference Include="mzLib" Version="1.0.539" />
<PackageReference Include="mzLib" Version="1.0.541" />
<PackageReference Include="Nett" Version="0.15.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="OxyPlot.Core" Version="2.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion MetaMorpheus/GuiFunctions/GuiFunctions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="itext7" Version="7.1.13" />
<PackageReference Include="mzLib" Version="1.0.539" />
<PackageReference Include="mzLib" Version="1.0.541" />
<PackageReference Include="OxyPlot.Wpf" Version="2.0.0" />
<PackageReference Include="Svg" Version="3.4.3" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion MetaMorpheus/TaskLayer/TaskLayer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageReference Include="Microsoft.ML.CpuMath" Version="2.0.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
<PackageReference Include="mzLib" Version="1.0.539" />
<PackageReference Include="mzLib" Version="1.0.541" />
<PackageReference Include="NetSerializer" Version="4.1.1" />
<PackageReference Include="Nett" Version="0.15.0" />
</ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions MetaMorpheus/Test/GuiFunctionsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ public static void TestGetUniprotFilename(string proteomeID, bool reviewed, bool
Assert.AreEqual(expectedResult, filename);
}

// Occasionally the downloaded files will change, and thus the expected result will need to be updated.
// To verify, download the database and count the number of entries.
// The expected result will be double the number of entries, due to decoys - 9/1/23 NB
[Test]
[Parallelizable(ParallelScope.All)]
[TestCase("UP000000280", true, true, true, true, "1.fasta.gz", 50)]
[TestCase("UP000000280", true, true, true, false, "2.fasta", 50)]
[TestCase("UP000000280", true, true, false, true, "3.fasta.gz", 40)]
[TestCase("UP000000280", true, true, false, true, "3.fasta.gz", 50)]
[TestCase("UP000000280", true, false, true, true, "4.xml.gz", 50)]
[TestCase("UP000000280", false, true, true, true, "5.fasta.gz", 2)]
[TestCase("UP000000280", true, true, false, false, "6.fasta", 50)]
Expand Down Expand Up @@ -85,7 +87,6 @@ public static async Task UniprotHtmlQueryTest(string proteomeID, bool reviewed,


Assert.That(reader.Count == listCount);

}
}
}
2 changes: 1 addition & 1 deletion MetaMorpheus/Test/Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageReference Include="Microsoft.ML" Version="2.0.0" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="2.0.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="2.0.0" />
<PackageReference Include="mzLib" Version="1.0.539" />
<PackageReference Include="mzLib" Version="1.0.541" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
Expand Down

0 comments on commit 20713d6

Please sign in to comment.