Changeset 4252


Ignore:
Timestamp:
08/18/10 15:11:52 (12 years ago)
Author:
mkommend
Message:

Updated grammars in DataAnalysis branch (ticket #1028).

Location:
branches/DataAnalysis
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/SymbolicTimeSeriesPrognosisGrammar.cs

    r4113 r4252  
    2020#endregion
    2121
    22 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2322using System.Collections.Generic;
    24 using System;
    25 using System.Linq;
    2623using HeuristicLab.Common;
    2724using HeuristicLab.Core;
     25using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
     26using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
    30 using HeuristicLab.Data;
     28using HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Symbolic.Symbols;
    3129using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
    32 using HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Symbolic.Symbols;
    3330
    3431namespace HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Symbolic {
     
    4643      this.dimension = dimension;
    4744      Initialize();
    48     }
    49 
    50     protected SymbolicTimeSeriesPrognosisGrammar(SymbolicTimeSeriesPrognosisGrammar original)
    51       : base(original) {
    52       this.dimension = original.dimension;
    5345    }
    5446
     
    140132
    141133    public override IDeepCloneable Clone(Cloner cloner) {
    142       return new SymbolicTimeSeriesPrognosisGrammar(this);
     134      SymbolicTimeSeriesPrognosisGrammar clone = (SymbolicTimeSeriesPrognosisGrammar)base.Clone(cloner);
     135      clone.dimension = this.dimension;
     136      return clone;
    143137    }
    144138  }
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/Symbolic/MultiVariateExpressionGrammar.cs

    r4068 r4252  
    4444    }
    4545
    46     protected MultiVariateExpressionGrammar(MultiVariateExpressionGrammar original)
    47       : base(original) {
    48       this.dimension = original.dimension;
    49     }
    50 
    5146    public void SetDimension(int n) {
    5247      dimension = n;
     
    6358
    6459    public override IDeepCloneable Clone(Cloner cloner) {
    65       var clone = new MultiVariateExpressionGrammar(this);
    66       cloner.RegisterClonedObject(this, clone);
     60      MultiVariateExpressionGrammar clone = (MultiVariateExpressionGrammar)base.Clone(cloner);
     61      clone.dimension = this.dimension;
    6762      return clone;
    6863    }
Note: See TracChangeset for help on using the changeset viewer.