Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/28/19 12:41:36 (6 years ago)
Author:
gkronber
Message:

#2971: made branch compile with current version of trunk

Location:
branches/2971_named_intervals
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/2971_named_intervals

    • Property svn:ignore set to
      packages

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/ConstantTimeSeriesPrognosisModel.cs

    r15583 r16628  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     31  [StorableType("F4C88360-FD99-430C-9BDF-822B2E87ABC4")]
    3132  [Item("Constant TimeSeries Model", "A time series model that returns for all prediciton the same constant value.")]
    3233  [Obsolete]
    3334  public class ConstantTimeSeriesPrognosisModel : ConstantRegressionModel, ITimeSeriesPrognosisModel {
    3435    [StorableConstructor]
    35     protected ConstantTimeSeriesPrognosisModel(bool deserializing) : base(deserializing) { }
     36    protected ConstantTimeSeriesPrognosisModel(StorableConstructorFlag _) : base(_) { }
    3637    protected ConstantTimeSeriesPrognosisModel(ConstantTimeSeriesPrognosisModel original, Cloner cloner) : base(original, cloner) { }
    3738    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/TimeSeriesPrognosisAutoRegressiveModel.cs

    r15583 r16628  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     31  [StorableType("D57F578F-F7C5-428E-B977-7DCEBD9CD521")]
    3132  [Item("Autoregressive TimeSeries Model", "A linear autoregressive time series model used to predict future values.")]
    3233  public class TimeSeriesPrognosisAutoRegressiveModel : RegressionModel, ITimeSeriesPrognosisModel {
    … …  
    4344
    4445    [StorableConstructor]
    45     protected TimeSeriesPrognosisAutoRegressiveModel(bool deserializing) : base(deserializing) { }
     46    protected TimeSeriesPrognosisAutoRegressiveModel(StorableConstructorFlag _) : base(_) { }
    4647    protected TimeSeriesPrognosisAutoRegressiveModel(TimeSeriesPrognosisAutoRegressiveModel original, Cloner cloner)
    4748      : base(original, cloner) {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblem.cs

    r15583 r16628  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     28  [StorableType("A63E7697-3C6D-4A6D-9D96-AF81F990D6BD")]
    2829  [Item("Time-series Prognosis Problem", "A general time-series prognosis problem.")]
    2930  public class TimeSeriesPrognosisProblem : DataAnalysisProblem<ITimeSeriesPrognosisProblemData>, ITimeSeriesPrognosisProblem {
    3031    [StorableConstructor]
    31     protected TimeSeriesPrognosisProblem(bool deserializing) : base(deserializing) { }
     32    protected TimeSeriesPrognosisProblem(StorableConstructorFlag _) : base(_) { }
    3233    protected TimeSeriesPrognosisProblem(TimeSeriesPrognosisProblem original, Cloner cloner) : base(original, cloner) { }
    3334    public override IDeepCloneable Clone(Cloner cloner) { return new TimeSeriesPrognosisProblem(this, cloner); }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

    r16244 r16628  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     33  [StorableType("677A3084-C878-4F1D-817E-B14E99F978E4")]
    3334  [Item("TimeSeriesPrognosisProblemData", "Represents an item containing all data defining a time series prognosis problem.")]
    3435  public class TimeSeriesPrognosisProblemData : RegressionProblemData, ITimeSeriesPrognosisProblemData {
    … …  
    15711572
    15721573    [StorableConstructor]
    1573     protected TimeSeriesPrognosisProblemData(bool deserializing) : base(deserializing) { }
     1574    protected TimeSeriesPrognosisProblemData(StorableConstructorFlag _) : base(_) { }
    15741575
    15751576    protected TimeSeriesPrognosisProblemData(TimeSeriesPrognosisProblemData original, Cloner cloner) : base(original, cloner) { }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisResults.cs

    r15583 r16628  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     33  [StorableType("D0D59DAD-81C2-42C4-B9B7-A8CFFB1CDD58")]
    3334  [Item("Prognosis Results", "Represents a collection of time series prognosis results.")]
    3435  public class TimeSeriesPrognosisResults : ResultCollection {
    … …  
    330331
    331332    [StorableConstructor]
    332     public TimeSeriesPrognosisResults(bool deserializing) : base(deserializing) { }
     333    public TimeSeriesPrognosisResults(StorableConstructorFlag _) : base(_) { }
    333334    protected TimeSeriesPrognosisResults(TimeSeriesPrognosisResults original, Cloner cloner)
    334335      : base(original, cloner) {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolution.cs

    r15583 r16628  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    2930  /// Represents a time series prognosis data analysis solution
    3031  /// </summary>
    31   [StorableClass]
     32  [StorableType("0843745A-936B-4370-B018-E1795C5FDCE8")]
    3233  public class TimeSeriesPrognosisSolution : TimeSeriesPrognosisSolutionBase {
    3334    [StorableConstructor]
    34     protected TimeSeriesPrognosisSolution(bool deserializing) : base(deserializing) { }
     35    protected TimeSeriesPrognosisSolution(StorableConstructorFlag _) : base(_) { }
    3536    protected TimeSeriesPrognosisSolution(TimeSeriesPrognosisSolution original, Cloner cloner) : base(original, cloner) { }
    3637    protected internal TimeSeriesPrognosisSolution(ITimeSeriesPrognosisModel model, ITimeSeriesPrognosisProblemData problemData)

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolutionBase.cs

    r15583 r16628  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     31  [StorableType("52A5D793-A9E4-407C-8394-BCE622666A85")]
    3132  public abstract class TimeSeriesPrognosisSolutionBase : RegressionSolutionBase, ITimeSeriesPrognosisSolution {
    3233    #region result names
    … …  
    128129
    129130    [StorableConstructor]
    130     protected TimeSeriesPrognosisSolutionBase(bool deserializing) : base(deserializing) { }
     131    protected TimeSeriesPrognosisSolutionBase(StorableConstructorFlag _) : base(_) { }
    131132    protected TimeSeriesPrognosisSolutionBase(TimeSeriesPrognosisSolutionBase original, Cloner cloner) : base(original, cloner) { }
    132133    protected TimeSeriesPrognosisSolutionBase(ITimeSeriesPrognosisModel model, ITimeSeriesPrognosisProblemData problemData)
Note: See TracChangeset for help on using the changeset viewer.