Skip to content

Fix console blank filtering threshold parsing #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fraximov wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −1
Open

Fix console blank filtering threshold parsing #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions MsdialWorkbench.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsdialLcMsApi", "src\MSDIAL
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsdialCoreTestApp", "tests\MSDIAL5\MsdialCoreTestApp\MsdialCoreTestApp.csproj", "{AA61D298-CAC4-4CFA-8F20-00CDB5ACA5BC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsdialCoreTestAppTests", "tests\MSDIAL5\MsdialCoreTestAppTests\MsdialCoreTestAppTests.csproj", "{0258C2E6-6496-431C-B87A-E81DA4895825}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsdialLcImMsApi", "src\MSDIAL5\MsdialLcImMsApi\MsdialLcImMsApi.csproj", "{0750647B-1DFC-49DC-ADFB-16235E22AA88}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsdialDimsCoreTests", "tests\MSDIAL5\MsdialDimsCoreTests\MsdialDimsCoreTests.csproj", "{98544BC7-3111-4A2B-B33D-72154A7CBC81}"
Expand Down Expand Up @@ -1322,6 +1324,26 @@ Global
{AA61D298-CAC4-4CFA-8F20-00CDB5ACA5BC}.Release|Any CPU.Build.0 = Release|Any CPU
{AA61D298-CAC4-4CFA-8F20-00CDB5ACA5BC}.Release|x64.ActiveCfg = Release|Any CPU
{AA61D298-CAC4-4CFA-8F20-00CDB5ACA5BC}.Release|x64.Build.0 = Release|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug vendor unsupported|Any CPU.ActiveCfg = Debug vendor unsupported|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug vendor unsupported|Any CPU.Build.0 = Debug vendor unsupported|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug vendor unsupported|x64.ActiveCfg = Debug vendor unsupported|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug vendor unsupported|x64.Build.0 = Debug vendor unsupported|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug with args|Any CPU.ActiveCfg = Debug|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug with args|Any CPU.Build.0 = Debug|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug with args|x64.ActiveCfg = Debug|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug with args|x64.Build.0 = Debug|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug|x64.ActiveCfg = Debug|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Debug|x64.Build.0 = Debug|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Release vendor unsupported|Any CPU.ActiveCfg = Release vendor unsupported|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Release vendor unsupported|Any CPU.Build.0 = Release vendor unsupported|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Release vendor unsupported|x64.ActiveCfg = Release vendor unsupported|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Release vendor unsupported|x64.Build.0 = Release vendor unsupported|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Release|Any CPU.Build.0 = Release|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Release|x64.ActiveCfg = Release|Any CPU
{0258C2E6-6496-431C-B87A-E81DA4895825}.Release|x64.Build.0 = Release|Any CPU
{0750647B-1DFC-49DC-ADFB-16235E22AA88}.Debug vendor unsupported|Any CPU.ActiveCfg = Debug|Any CPU
{0750647B-1DFC-49DC-ADFB-16235E22AA88}.Debug vendor unsupported|Any CPU.Build.0 = Debug|Any CPU
{0750647B-1DFC-49DC-ADFB-16235E22AA88}.Debug vendor unsupported|x64.ActiveCfg = Debug vendor unsupported|Any CPU
Expand Down Expand Up @@ -1851,6 +1873,7 @@ Global
{1DC75792-8CC8-4274-B29C-B1023127356D} = {765ED28C-F085-4C96-8E81-683BBAE67B01}
{BE80842B-9747-4BFC-A5B4-1845051AA1D0} = {765ED28C-F085-4C96-8E81-683BBAE67B01}
{629337F8-F6E7-41F2-8DF7-FEBA23AF1222} = {765ED28C-F085-4C96-8E81-683BBAE67B01}
{0258C2E6-6496-431C-B87A-E81DA4895825} = {765ED28C-F085-4C96-8E81-683BBAE67B01}
{98544BC7-3111-4A2B-B33D-72154A7CBC81} = {765ED28C-F085-4C96-8E81-683BBAE67B01}
{B21FC8DB-0C0D-4313-AE05-53F328B5B827} = {765ED28C-F085-4C96-8E81-683BBAE67B01}
{2773E213-04B6-47E2-8277-F86D1D3DA50B} = {765ED28C-F085-4C96-8E81-683BBAE67B01}
Expand Down
7 changes: 6 additions & 1 deletion tests/MSDIAL5/MsdialCoreTestApp/Parser/ConfigParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,12 @@ public static bool ReadCommonParameter(ParameterBase param, string method, strin
if (valueLower.ToLower() == "samplemaxoverblankave")
param.BlankFiltering = (BlankFiltering)Enum.Parse(typeof(BlankFiltering), valueLower, true);
return true;
case "sample max / blank average": if (float.TryParse(valueLower, out float sampleMaxOverBlankAverage)) param.SampleMaxOverBlankAverage = sampleMaxOverBlankAverage; return true;
case "sample max / blank average":
if (float.TryParse(valueLower, out float sampleMaxOverBlankAverage)) {
param.SampleMaxOverBlankAverage = sampleMaxOverBlankAverage;
param.FoldChangeForBlankFiltering = sampleMaxOverBlankAverage;
}
return true;
case "sample average / blank average": if (float.TryParse(valueLower, out float sampleAverageOverBlankAverage)) param.SampleAverageOverBlankAverage = sampleAverageOverBlankAverage; return true;
case "keep reference matched metabolites": if (valueLower == "true" || valueLower == "false") param.IsKeepRefMatchedMetaboliteFeatures = bool.Parse(valueLower); return true;
case "keep suggested metabolites": if (valueLower == "true" || valueLower == "false") param.IsKeepSuggestedMetaboliteFeatures = bool.Parse(valueLower); return true;
Expand Down
21 changes: 21 additions & 0 deletions tests/MSDIAL5/MsdialCoreTestAppTests/Parser/ConfigParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using CompMs.App.MsdialConsole.Parser;
using CompMs.MsdialLcmsApi.Parameter;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace MsdialCoreTestAppTests.Parser;

[TestClass]
public sealed class ConfigParserTests
{
[TestMethod]
public void ReadCommonParameter_UpdatesActiveBlankFilteringFoldChange()
{
var parameter = new MsdialLcmsParameter();

var result = ConfigParser.ReadCommonParameter(parameter, "sample max / blank average", "7");

Assert.IsTrue(result);
Assert.AreEqual(7f, parameter.SampleMaxOverBlankAverage);
Assert.AreEqual(7f, parameter.FoldChangeForBlankFiltering);
}
}