From 32552a1a8b2e7e967417e642f11e2631176204b0 Mon Sep 17 00:00:00 2001 From: Zhuoxin Shi Date: Tue, 26 Aug 2025 10:42:38 -0500 Subject: [PATCH 1/3] xicspline toString --- .../PeakIndexing/PeakSpline/XicSpline.cs | 11 +++++++++++ mzLib/Test/TestXic.cs | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs b/mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs index 80280231e..1fbd6f876 100644 --- a/mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs +++ b/mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs @@ -107,5 +107,16 @@ public void AddPeaks(float[] rtArray, float[] intensityArray, out double[] newRt } } } + + public override string ToString() + { + var sb = new StringBuilder(); + sb.AppendLine($"XicSplineSettings: "); + sb.AppendLine($" XicSplineType: {GetType().Name}"); + sb.AppendLine($" SplineRtInterval: {SplineRtInterval}"); + sb.AppendLine($" NumberOfPeaksToAdd: {NumberOfPeaksToAdd}"); + sb.AppendLine($" Gap: {Gap}"); + return sb.ToString(); + } } } diff --git a/mzLib/Test/TestXic.cs b/mzLib/Test/TestXic.cs index 2f5264fb5..41acc901b 100644 --- a/mzLib/Test/TestXic.cs +++ b/mzLib/Test/TestXic.cs @@ -12,6 +12,8 @@ using MathNet.Numerics.Distributions; using System.Collections; using Proteomics.AminoAcidPolymer; +using NUnit.Framework.Legacy; +using static Nett.TomlObjectFactory; namespace Test { @@ -336,5 +338,20 @@ public static void TestBspline() Assert.That(xic.XYData.First().Item1, Is.EqualTo(xic.StartRT).Within(0.0001)); Assert.That(xic.XYData.Last().Item1, Is.EqualTo(xic.EndRT).Within(0.0001)); } + + [Test] + public static void TestXicSplineToString() + { + var cubicSpline = new XicCubicSpline(0.05); + var result = cubicSpline.ToString(); + var lines = result.Split('\n').Select(l => l.Trim()).ToArray(); + + Assert.That(lines.Any(l => l.Contains("XicSplineSettings:")), Is.True); + Assert.That(lines.Any(l => l.Contains("XicSplineType: XicCubicSpline")), Is.True); + Assert.That(lines.Any(l => l.Contains("SplineRtInterval: 0.05")), Is.True); + Assert.That(lines.Any(l => l.Contains("NumberOfPeaksToAdd: 0")), Is.True); + Assert.That(lines.Any(l => l.Contains("Gap: 1")), Is.True); + } } } + From fed87713d96ebdccebefa344103036fd5f6f02ff Mon Sep 17 00:00:00 2001 From: Zhuoxin Shi Date: Tue, 26 Aug 2025 11:04:20 -0500 Subject: [PATCH 2/3] . --- mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs b/mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs index 1fbd6f876..bd9d0f55d 100644 --- a/mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs +++ b/mzLib/MassSpectrometry/PeakIndexing/PeakSpline/XicSpline.cs @@ -112,6 +112,7 @@ public override string ToString() { var sb = new StringBuilder(); sb.AppendLine($"XicSplineSettings: "); + sb.AppendLine($" XicSplineType: {GetType().Name}"); sb.AppendLine($" SplineRtInterval: {SplineRtInterval}"); sb.AppendLine($" NumberOfPeaksToAdd: {NumberOfPeaksToAdd}"); From 70011fa46a464dccb20a5d6e3149f1afea8f186f Mon Sep 17 00:00:00 2001 From: Zhuoxin Shi Date: Tue, 26 Aug 2025 11:13:00 -0500 Subject: [PATCH 3/3] . --- mzLib/Test/TestXic.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mzLib/Test/TestXic.cs b/mzLib/Test/TestXic.cs index 41acc901b..43559489a 100644 --- a/mzLib/Test/TestXic.cs +++ b/mzLib/Test/TestXic.cs @@ -1,19 +1,12 @@ using Chemistry; using FlashLFQ; using MassSpectrometry; -using MathNet.Numerics.Interpolation; using MzLibUtil; using NUnit.Framework; using System.Collections.Generic; using System.Linq; using Assert = NUnit.Framework.Legacy.ClassicAssert; -using MassSpectrometry; -using Microsoft.ML.Transforms; using MathNet.Numerics.Distributions; -using System.Collections; -using Proteomics.AminoAcidPolymer; -using NUnit.Framework.Legacy; -using static Nett.TomlObjectFactory; namespace Test { @@ -345,7 +338,6 @@ public static void TestXicSplineToString() var cubicSpline = new XicCubicSpline(0.05); var result = cubicSpline.ToString(); var lines = result.Split('\n').Select(l => l.Trim()).ToArray(); - Assert.That(lines.Any(l => l.Contains("XicSplineSettings:")), Is.True); Assert.That(lines.Any(l => l.Contains("XicSplineType: XicCubicSpline")), Is.True); Assert.That(lines.Any(l => l.Contains("SplineRtInterval: 0.05")), Is.True);