fix: Prevent potential unwrap failures in PeakData.base_peak when dea…

…ling with unorderable floats
mobiusklein · May 4, 2024 · bca6269 · bca6269
1 parent c9f0f1a
commit bca6269
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/spectrum.rs b/src/spectrum.rs
@@ -65,11 +65,12 @@ pub use crate::spectrum::scan_properties::*;
 pub use crate::spectrum::spectrum_types::{
     CentroidSpectrum, CentroidSpectrumType, DeconvolutedSpectrum, DeconvolutedSpectrumType,
     MultiLayerSpectrum, RefPeakDataLevel, RawSpectrum, Spectrum, SpectrumConversionError,
-    SpectrumLike, SpectrumProcessingError, PeakDataLevel, CentroidPeakAdapting, DeconvolutedPeakAdapting
+    SpectrumLike, SpectrumProcessingError, PeakDataLevel, CentroidPeakAdapting,
+    DeconvolutedPeakAdapting
 };
 
 pub use group::{
-    SpectrumGroup, SpectrumGroupIntoIter, SpectrumGroupIter, SpectrumGroupingIterator,
+    SpectrumGroup, SpectrumGroupIntoIter, SpectrumGroupIter, SpectrumGroupingIterator
 };
 
 #[cfg(feature = "mzsignal")]

diff --git a/src/spectrum/spectrum_types.rs b/src/spectrum/spectrum_types.rs
@@ -60,7 +60,7 @@ impl<C: CentroidLike, D: DeconvolutedCentroidLike> PeakDataLevel<C, D> {
                 let result = intensities
                     .iter()
                     .enumerate()
-                    .max_by(|ia, ib| ia.1.partial_cmp(ib.1).unwrap());
+                    .max_by(|ia, ib| ia.1.total_cmp(ib.1));
                 if let Some((i, inten)) = result {
                     CentroidPeak::new(arrays.mzs().unwrap()[i], *inten, i as IndexType)
                 } else {
@@ -199,7 +199,7 @@ impl<'a, C: CentroidLike, D: DeconvolutedCentroidLike> RefPeakDataLevel<'a, C, D
                 let result = intensities
                     .iter()
                     .enumerate()
-                    .max_by(|ia, ib| ia.1.partial_cmp(ib.1).unwrap());
+                    .max_by(|ia, ib| ia.1.total_cmp(ib.1));
                 if let Some((i, inten)) = result {
                     CentroidPeak::new(arrays.mzs().unwrap()[i], *inten, i as IndexType)
                 } else {