Relax === to == in projection_isequal

Which fixes a bug that can occur when serializing models.

Author: rasmushenningsson

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.9] - 2024-03-04
+
+### Fixed
+
+* Relax `===` to `==` when comparing some models. (This fixes a bug when a model is saved to disk using e.g. JLD2 and the loaded again.)
+
 ## [0.3.8] - 2024-02-22
 
 ### Added

Project.toml

@@ -1,7 +1,7 @@
 name = "SingleCellProjections"
 uuid = "03d38035-ed2f-4a36-82eb-797f1727ab2e"
 authors = ["Rasmus Henningsson <rasmus.henningsson@med.lu.se>"]
-version = "0.3.8"
+version = "0.3.9"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

ext/SingleCellProjectionsPrincipalMomentAnalysisExt.jl

@@ -66,7 +66,7 @@ struct PMAModel <: ProjectionModel
 	obs::Symbol
 end
 
-SingleCellProjections.projection_isequal(m1::PMAModel, m2::PMAModel) = m1.F === m2.F && m1.var_match == m2.var_match
+SingleCellProjections.projection_isequal(m1::PMAModel, m2::PMAModel) = m1.F == m2.F && m1.var_match == m2.var_match
 SingleCellProjections.update_model(m::PMAModel; var=m.var, obs=m.obs, kwargs...) = (SVDModel(m.F, m.var_match, var, obs), kwargs)
 
 """

ext/SingleCellProjectionsUMAPExt.jl

@@ -10,7 +10,7 @@ struct UMAPModel <: ProjectionModel
 	obs::Symbol
 end
 
-SingleCellProjections.projection_isequal(m1::UMAPModel, m2::UMAPModel) = m1.m === m2.m && m1.var_match == m2.var_match
+SingleCellProjections.projection_isequal(m1::UMAPModel, m2::UMAPModel) = m1.m == m2.m && m1.var_match == m2.var_match
 
 SingleCellProjections.update_model(m::UMAPModel; obs=m.obs, kwargs...) = (UMAPModel(m.m, m.var_match, obs), kwargs)
 

src/normalize.jl

@@ -43,7 +43,7 @@ struct NormalizationModel <: ProjectionModel
 end
 
 function projection_isequal(m1::NormalizationModel, m2::NormalizationModel)
-	m1.negβT === m2.negβT && m1.covariates == m2.covariates && m1.rank == m2.rank &&
+	m1.negβT == m2.negβT && m1.covariates == m2.covariates && m1.rank == m2.rank &&
 	m1.var_match == m2.var_match && m1.scaling == m2.scaling
 end
 

src/reduce.jl

@@ -15,7 +15,7 @@ end
 
 # NB: Require Factorizations to be ===. This is faster and more reasonable.
 # Because of numerical issues, we should never expect Factorizations to be equal if they are not identical.
-projection_isequal(m1::SVDModel, m2::SVDModel) = m1.F === m2.F && m1.var_match == m2.var_match
+projection_isequal(m1::SVDModel, m2::SVDModel) = m1.F == m2.F && m1.var_match == m2.var_match
 
 
 update_model(m::SVDModel; var=m.var, obs=m.obs, kwargs...) = (SVDModel(m.F, m.var_match, var, obs), kwargs)
@@ -70,8 +70,7 @@ NearestNeighborModel(name, pre::DataMatrix, post::DataMatrix; kwargs...) =
 	NearestNeighborModel(name, pre, obs_coordinates(post); kwargs...)
 
 function projection_isequal(m1::NearestNeighborModel, m2::NearestNeighborModel)
-	# NB: === for factorizations/matrices
-	m1.name == m2.name && m1.pre === m2.pre && m1.post === m2.post &&
+	m1.name == m2.name && m1.pre == m2.pre && m1.post == m2.post &&
 	m1.var_match == m2.var_match && m1.k == m2.k
 end