@@ -22,12 +22,12 @@ namespace CompMs.MsdialGcMsApi.Algorithm.Alignment;
2222
2323public abstract class GcmsPeakJoiner : IPeakJoiner
2424{
25- public static GcmsPeakJoiner CreateRTJoiner ( MsRefSearchParameterBase msMatchParam , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer , IFeatureAccessor < SpectrumFeature > accessor , IProgress < int > progress = null ) {
26- return new GcmsRTPeakJoiner ( parameter . RiCompoundType , msMatchParam , parameter , evaluator , refer , accessor , progress ) ;
25+ public static GcmsPeakJoiner CreateRTJoiner ( MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer , IFeatureAccessor < SpectrumFeature > accessor , IProgress < int > progress = null ) {
26+ return new GcmsRTPeakJoiner ( parameter . RiCompoundType , parameter , evaluator , refer , accessor , progress ) ;
2727 }
2828
29- public static GcmsPeakJoiner CreateRIJoiner ( MsRefSearchParameterBase msMatchParam , double riTol , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer , IFeatureAccessor < SpectrumFeature > accessor , IProgress < int > progress = null ) {
30- return new GcmsRIPeakJoiner ( parameter . RiCompoundType , msMatchParam , riTol , parameter , evaluator , refer , accessor , progress ) ;
29+ public static GcmsPeakJoiner CreateRIJoiner ( double riTol , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer , IFeatureAccessor < SpectrumFeature > accessor , IProgress < int > progress = null ) {
30+ return new GcmsRIPeakJoiner ( parameter . RiCompoundType , riTol , parameter , evaluator , refer , accessor , progress ) ;
3131 }
3232
3333 protected readonly AlignmentIndexType _indextype ;
@@ -40,7 +40,7 @@ public static GcmsPeakJoiner CreateRIJoiner(MsRefSearchParameterBase msMatchPara
4040 private readonly IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > _refer ;
4141 private readonly int _binPrecision ;
4242
43- protected GcmsPeakJoiner ( AlignmentIndexType indextype , RiCompoundType riCompoundType , MsRefSearchParameterBase msMatchParam , IComparer < IMSScanProperty > comparer , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer ) {
43+ protected GcmsPeakJoiner ( AlignmentIndexType indextype , RiCompoundType riCompoundType , IComparer < IMSScanProperty > comparer , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer ) {
4444 _indextype = indextype ;
4545 _comparer = comparer ;
4646 _alignmentParameter = parameter . AlignmentBaseParam ;
@@ -201,8 +201,8 @@ internal sealed class GcmsRTPeakJoiner : GcmsPeakJoiner
201201 private readonly IMatchResultEvaluator < MsScanMatchResult > _evaluator ;
202202 private readonly AlignmentBaseParameter _alignmentParameter ;
203203
204- public GcmsRTPeakJoiner ( RiCompoundType riCompoundType , MsRefSearchParameterBase msMatchParam , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer , IFeatureAccessor < SpectrumFeature > accessor , IProgress < int > progress = null )
205- : base ( AlignmentIndexType . RT , riCompoundType , msMatchParam , ChromXsComparer . RTComparer , parameter , evaluator , refer ) {
204+ public GcmsRTPeakJoiner ( RiCompoundType riCompoundType , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer , IFeatureAccessor < SpectrumFeature > accessor , IProgress < int > progress = null )
205+ : base ( AlignmentIndexType . RT , riCompoundType , ChromXsComparer . RTComparer , parameter , evaluator , refer ) {
206206 _alignmentParameter = parameter . AlignmentBaseParam ;
207207 _rtTol = parameter . AlignmentBaseParam . RetentionTimeAlignmentTolerance ;
208208 _rtBucket = parameter . AlignmentBaseParam . RetentionTimeAlignmentTolerance * 2 ;
@@ -324,8 +324,8 @@ internal sealed class GcmsRIPeakJoiner : GcmsPeakJoiner
324324 private readonly IMatchResultEvaluator < MsScanMatchResult > _evaluator ;
325325 private readonly AlignmentBaseParameter _alignmentParameter ;
326326
327- public GcmsRIPeakJoiner ( RiCompoundType riCompoundType , MsRefSearchParameterBase msMatchParam , double riTol , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer , IFeatureAccessor < SpectrumFeature > accessor , IProgress < int > progress = null )
328- : base ( AlignmentIndexType . RI , riCompoundType , msMatchParam , ChromXsComparer . RIComparer , parameter , evaluator , refer ) {
327+ public GcmsRIPeakJoiner ( RiCompoundType riCompoundType , double riTol , MsdialGcmsParameter parameter , IMatchResultEvaluator < MsScanMatchResult > evaluator , IMatchResultRefer < MoleculeMsReference , MsScanMatchResult > refer , IFeatureAccessor < SpectrumFeature > accessor , IProgress < int > progress = null )
328+ : base ( AlignmentIndexType . RI , riCompoundType , ChromXsComparer . RIComparer , parameter , evaluator , refer ) {
329329 _alignmentParameter = parameter . AlignmentBaseParam ;
330330 _evaluator = evaluator ;
331331 _riTol = riTol ;
0 commit comments