fix merge problem in CModelParams initialization

Hendrik Muhs · Hendrik Muhs · commit d89d6b599141 · 2018-05-14T11:04:19.000+02:00
diff --git a/lib/model/CForecastModelPersist.cc b/lib/model/CForecastModelPersist.cc
@@ -133,10 +133,13 @@ bool CForecastModelPersist::CRestore::restoreOneModel(core::CStateRestoreTravers
 
             maths::SModelRestoreParams params{
                 maths::CModelParams(modelParams.s_BucketLength, modelParams.s_LearnRate,
-                                    modelParams.s_DecayRate, minimumSeasonalVarianceScale),
+                                    modelParams.s_DecayRate, minimumSeasonalVarianceScale,
+                                    modelParams.s_MinimumTimeToDetectChange,
+                                    modelParams.s_MaximumTimeToTestForChange),
                 maths::STimeSeriesDecompositionRestoreParams{
                     modelParams.s_DecayRate, modelParams.s_BucketLength,
-                    modelParams.s_ComponentSize},
+                    modelParams.s_ComponentSize,
+                    modelParams.distributionRestoreParams(dataType)},
                 modelParams.distributionRestoreParams(dataType)};
 
             if (!traverser.traverseSubLevel(
