Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4662


Ignore:
Timestamp:
10/29/10 15:59:12 (12 years ago)
Author:
abeham
Message:

#922

  • Refactored HeuristicLab.Data
  • Refactored HeuristicLab.Operators
Location:
branches/CloningRefactoring
Files:
43 edited

Legend:

Unmodified
Added
Removed
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/BoolArray.cs

    r3431 r4662  
    2929  [StorableClass]
    3030  public class BoolArray : ValueTypeArray<bool>, IStringConvertibleArray {
     31    [StorableConstructor]
     32    protected BoolArray(bool deserializing) : base(deserializing) { }
     33    protected BoolArray(BoolArray original, Cloner cloner)
     34      : base(original, cloner) {
     35    }
    3136    public BoolArray() : base() { }
    3237    public BoolArray(int length) : base(length) { }
     
    3439
    3540    public override IDeepCloneable Clone(Cloner cloner) {
    36       BoolArray clone = new BoolArray(array);
    37       cloner.RegisterClonedObject(this, clone);
    38       clone.readOnly = readOnly;
    39       return clone;
     41      return new BoolArray(this, cloner);
    4042    }
    4143
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/BoolMatrix.cs

    r3431 r4662  
    3030  [StorableClass]
    3131  public class BoolMatrix : ValueTypeMatrix<bool>, IStringConvertibleMatrix {
     32    [StorableConstructor]
     33    protected BoolMatrix(bool deserializing) : base(deserializing) { }
     34    protected BoolMatrix(BoolMatrix original, Cloner cloner)
     35      : base(original, cloner) {
     36    }
    3237    public BoolMatrix() : base() { }
    3338    public BoolMatrix(int rows, int columns) : base(rows, columns) { }
     
    3944
    4045    public override IDeepCloneable Clone(Cloner cloner) {
    41       BoolMatrix clone = new BoolMatrix();
    42       cloner.RegisterClonedObject(this, clone);
    43       clone.matrix = (bool[,])matrix.Clone();
    44       clone.columnNames = new List<string>(columnNames);
    45       clone.rowNames = new List<string>(rowNames);
    46       clone.sortableView = sortableView;
    47       clone.readOnly = readOnly;
    48       return clone;
     46      return new BoolMatrix(this, cloner);
    4947    }
    5048
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/BoolValue.cs

    r4477 r4662  
    3535    }
    3636
     37    [StorableConstructor]
     38    protected BoolValue(bool deserializing) : base(deserializing) { }
     39    protected BoolValue(BoolValue original, Cloner cloner)
     40      : base(original, cloner) {
     41    }
    3742    public BoolValue() : base() { }
    3843    public BoolValue(bool value) : base(value) { }
    3944
    4045    public override IDeepCloneable Clone(Cloner cloner) {
    41       BoolValue clone = new BoolValue(value);
    42       cloner.RegisterClonedObject(this, clone);
    43       clone.readOnly = readOnly;
    44       return clone;
     46      return new BoolValue(this, cloner);
    4547    }
    4648
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/Comparison.cs

    r3431 r4662  
    3434    }
    3535
     36    [StorableConstructor]
     37    protected Comparison(bool deserializing) : base(deserializing) { }
     38    protected Comparison(Comparison original, Cloner cloner)
     39      : base(original, cloner) {
     40    }
    3641    public Comparison() : base() { }
    3742    public Comparison(ComparisonType value) : base(value) { }
    3843
    3944    public override IDeepCloneable Clone(Cloner cloner) {
    40       Comparison clone = new Comparison(value);
    41       cloner.RegisterClonedObject(this, clone);
    42       clone.readOnly = readOnly;
    43       return clone;
     45      return new Comparison(this, cloner);
    4446    }
    4547
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/DateTimeValue.cs

    r3431 r4662  
    2929  [StorableClass]
    3030  public class DateTimeValue : ValueTypeValue<DateTime>, IComparable, IStringConvertibleValue {
     31    [StorableConstructor]
     32    protected DateTimeValue(bool deserializing) : base(deserializing) { }
     33    protected DateTimeValue(DateTimeValue original, Cloner cloner)
     34      : base(original, cloner) {
     35    }
    3136    public DateTimeValue() : base() { }
    3237    public DateTimeValue(DateTime value) : base(value) { }
    3338
    3439    public override IDeepCloneable Clone(Cloner cloner) {
    35       DateTimeValue clone = new DateTimeValue(value);
    36       cloner.RegisterClonedObject(this, clone);
    37       clone.readOnly = readOnly;
    38       return clone;
     40      return new DateTimeValue(this, cloner);
    3941    }
    4042
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/DoubleArray.cs

    r3431 r4662  
    2929  [StorableClass]
    3030  public class DoubleArray : ValueTypeArray<double>, IStringConvertibleArray {
     31    [StorableConstructor]
     32    protected DoubleArray(bool deserializing) : base(deserializing) { }
     33    protected DoubleArray(DoubleArray original, Cloner cloner)
     34      : base(original, cloner) {
     35    }
    3136    public DoubleArray() : base() { }
    3237    public DoubleArray(int length) : base(length) { }
     
    3439
    3540    public override IDeepCloneable Clone(Cloner cloner) {
    36       DoubleArray clone = new DoubleArray(array);
    37       cloner.RegisterClonedObject(this, clone);
    38       clone.readOnly = readOnly;
    39       return clone;
     41      return new DoubleArray(this, cloner);
    4042    }
    4143
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/DoubleMatrix.cs

    r3431 r4662  
    3030  [StorableClass]
    3131  public class DoubleMatrix : ValueTypeMatrix<double>, IStringConvertibleMatrix {
     32    [StorableConstructor]
     33    protected DoubleMatrix(bool deserializing) : base(deserializing) { }
     34    protected DoubleMatrix(DoubleMatrix original, Cloner cloner)
     35      : base(original, cloner) {
     36    }
    3237    public DoubleMatrix() : base() { }
    3338    public DoubleMatrix(int rows, int columns) : base(rows, columns) { }
     
    3944
    4045    public override IDeepCloneable Clone(Cloner cloner) {
    41       DoubleMatrix clone = new DoubleMatrix();
    42       cloner.RegisterClonedObject(this, clone);
    43       clone.matrix = (double[,])matrix.Clone();
    44       clone.columnNames = new List<string>(columnNames);
    45       clone.rowNames = new List<string>(rowNames);
    46       clone.sortableView = sortableView;
    47       clone.readOnly = readOnly;
    48       return clone;
     46      return new DoubleMatrix(this, cloner);
    4947    }
    5048
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/DoubleValue.cs

    r4477 r4662  
    3535    }
    3636
     37    [StorableConstructor]
     38    protected DoubleValue(bool deserializing) : base(deserializing) { }
     39    protected DoubleValue(DoubleValue original, Cloner cloner)
     40      : base(original, cloner) {
     41    }
    3742    public DoubleValue() : base() { }
    3843    public DoubleValue(double value) : base(value) { }
    3944
    4045    public override IDeepCloneable Clone(Cloner cloner) {
    41       DoubleValue clone = new DoubleValue(value);
    42       cloner.RegisterClonedObject(this, clone);
    43       clone.readOnly = readOnly;
    44       return clone;
     46      return new DoubleValue(this, cloner);
    4547    }
    4648
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/IntArray.cs

    r4477 r4662  
    2929  [StorableClass]
    3030  public class IntArray : ValueTypeArray<int>, IStringConvertibleArray {
     31    [StorableConstructor]
     32    protected IntArray(bool deserializing) : base(deserializing) { }
     33    protected IntArray(IntArray original, Cloner cloner)
     34      : base(original, cloner) {
     35    }
    3136    public IntArray() : base() { }
    3237    public IntArray(int length) : base(length) { }
     
    3439
    3540    public override IDeepCloneable Clone(Cloner cloner) {
    36       IntArray clone = new IntArray(array);
    37       cloner.RegisterClonedObject(this, clone);
    38       clone.readOnly = readOnly;
    39       return clone;
     41      return new IntArray(this, cloner);
    4042    }
    4143
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/IntMatrix.cs

    r4477 r4662  
    3030  [StorableClass]
    3131  public class IntMatrix : ValueTypeMatrix<int>, IStringConvertibleMatrix {
     32    [StorableConstructor]
     33    protected IntMatrix(bool deserializing) : base(deserializing) { }
     34    protected IntMatrix(IntMatrix original, Cloner cloner)
     35      : base(original, cloner) {
     36    }
    3237    public IntMatrix() : base() { }
    3338    public IntMatrix(int rows, int columns) : base(rows, columns) { }
     
    3944
    4045    public override IDeepCloneable Clone(Cloner cloner) {
    41       IntMatrix clone = new IntMatrix();
    42       cloner.RegisterClonedObject(this, clone);
    43       clone.matrix = (int[,])matrix.Clone();
    44       clone.columnNames = new List<string>(columnNames);
    45       clone.rowNames = new List<string>(rowNames);
    46       clone.sortableView = sortableView;
    47       clone.readOnly = readOnly;
    48       return clone;
     46      return new IntMatrix(this, cloner);
    4947    }
    5048
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/IntValue.cs

    r4477 r4662  
    3535    }
    3636
     37    [StorableConstructor]
     38    protected IntValue(bool deserializing) : base(deserializing) { }
     39    protected IntValue(IntValue original, Cloner cloner)
     40      : base(original, cloner) {
     41    }
    3742    public IntValue() : base() { }
    3843    public IntValue(int value) : base(value) { }
    3944
    4045    public override IDeepCloneable Clone(Cloner cloner) {
    41       IntValue clone = new IntValue(value);
    42       cloner.RegisterClonedObject(this, clone);
    43       clone.readOnly = readOnly;
    44       return clone;
     46      return new IntValue(this, cloner);
    4547    }
    4648
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/PercentValue.cs

    r4068 r4662  
    2828  [StorableClass]
    2929  public class PercentValue : DoubleValue {
     30    [StorableConstructor]
     31    protected PercentValue(bool deserializing) : base(deserializing) { }
     32    protected PercentValue(PercentValue original, Cloner cloner)
     33      : base(original, cloner) {
     34    }
    3035    public PercentValue() : base() { }
    3136    public PercentValue(double value) : base(value) { }
    3237
    3338    public override IDeepCloneable Clone(Cloner cloner) {
    34       PercentValue clone = new PercentValue(value);
    35       cloner.RegisterClonedObject(this, clone);
    36       clone.readOnly = readOnly;
    37       return clone;
     39      return new PercentValue(this, cloner);
    3840    }
    3941
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/StringArray.cs

    r4068 r4662  
    7070    }
    7171
     72    [StorableConstructor]
     73    protected StringArray(bool deserializing) : base(deserializing) { }
     74    protected StringArray(StringArray original, Cloner cloner)
     75      : base(original, cloner) {
     76      this.array = (string[])original.array.Clone();
     77      this.readOnly = original.readOnly;
     78    }
    7279    public StringArray() {
    7380      array = new string[0];
     
    8996
    9097    public override IDeepCloneable Clone(Cloner cloner) {
    91       StringArray clone = new StringArray();
    92       cloner.RegisterClonedObject(this, clone);
    93       clone.array = (string[])array.Clone();
    94       clone.readOnly = readOnly;
    95       return clone;
     98      return new StringArray(this, cloner);
    9699    }
    97100
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/StringMatrix.cs

    r3431 r4662  
    134134    }
    135135
     136    [StorableConstructor]
     137    protected StringMatrix(bool deserializing) : base(deserializing) { }
     138    protected StringMatrix(StringMatrix original, Cloner cloner)
     139      : base(original, cloner) {
     140      this.matrix = (string[,])original.matrix.Clone();
     141      this.columnNames = new List<string>(original.columnNames);
     142      this.rowNames = new List<string>(original.rowNames);
     143      this.sortableView = original.sortableView;
     144      this.readOnly = original.readOnly;
     145    }
    136146    public StringMatrix() {
    137147      matrix = new string[0, 0];
     
    182192
    183193    public override IDeepCloneable Clone(Cloner cloner) {
    184       StringMatrix clone = new StringMatrix();
    185       cloner.RegisterClonedObject(this, clone);
    186       clone.matrix = (string[,])matrix.Clone();
    187       clone.columnNames = new List<string>(columnNames);
    188       clone.rowNames = new List<string>(rowNames);
    189       clone.sortableView = sortableView;
    190       clone.readOnly = readOnly;
    191       return clone;
     194      return new StringMatrix(this, cloner);
    192195    }
    193196
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/StringValue.cs

    r4477 r4662  
    5555    }
    5656
     57    [StorableConstructor]
     58    protected StringValue(bool deserializing) : base(deserializing) { }
     59    protected StringValue(StringValue original, Cloner cloner)
     60      : base(original, cloner) {
     61      this.value = original.value != null ? original.value : string.Empty;
     62      this.readOnly = original.readOnly;
     63    }
    5764    public StringValue() {
    5865      this.value = string.Empty;
     
    6572
    6673    public override IDeepCloneable Clone(Cloner cloner) {
    67       StringValue clone = new StringValue(value);
    68       cloner.RegisterClonedObject(this, clone);
    69       clone.readOnly = readOnly;
    70       return clone;
     74      return new StringValue(this, cloner);
    7175    }
    7276
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/TimeSpanValue.cs

    r3431 r4662  
    3030  [StorableClass]
    3131  public class TimeSpanValue : ValueTypeValue<TimeSpan>, IComparable, IStringConvertibleValue {
     32    [StorableConstructor]
     33    protected TimeSpanValue(bool deserializing) : base(deserializing) { }
     34    protected TimeSpanValue(TimeSpanValue original, Cloner cloner)
     35      : base(original, cloner) {
     36    }
    3237    public TimeSpanValue() : base() { }
    3338    public TimeSpanValue(TimeSpan value) : base(value) { }
    3439
    3540    public override IDeepCloneable Clone(Cloner cloner) {
    36       TimeSpanValue clone = new TimeSpanValue(value);
    37       cloner.RegisterClonedObject(this, clone);
    38       clone.readOnly = readOnly;
    39       return clone;
     41      return new TimeSpanValue(this, cloner);
    4042    }
    4143
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/ValueTypeArray.cs

    r3822 r4662  
    6868    }
    6969
     70    [StorableConstructor]
     71    protected ValueTypeArray(bool deserializing) : base(deserializing) { }
     72    protected ValueTypeArray(ValueTypeArray<T> original, Cloner cloner)
     73      : base(original, cloner) {
     74      this.array = (T[])original.array.Clone();
     75      this.readOnly = original.readOnly;
     76    }
    7077    protected ValueTypeArray() {
    7178      array = new T[0];
     
    8087      array = (T[])elements.Clone();
    8188      readOnly = false;
    82     }
    83 
    84     public override IDeepCloneable Clone(Cloner cloner) {
    85       ValueTypeArray<T> clone = (ValueTypeArray<T>)base.Clone(cloner);
    86       clone.array = (T[])array.Clone();
    87       clone.readOnly = readOnly;
    88       return clone;
    8989    }
    9090
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/ValueTypeMatrix.cs

    r3822 r4662  
    132132    }
    133133
     134    [StorableConstructor]
     135    protected ValueTypeMatrix(bool deserializing) : base(deserializing) { }
     136    protected ValueTypeMatrix(ValueTypeMatrix<T> original, Cloner cloner)
     137      : base(original, cloner) {
     138      this.matrix = (T[,])original.matrix.Clone();
     139      this.columnNames = new List<string>(original.columnNames);
     140      this.rowNames = new List<string>(original.rowNames);
     141      this.sortableView = original.sortableView;
     142      this.readOnly = original.readOnly;
     143    }
    134144    protected ValueTypeMatrix() {
    135145      matrix = new T[0, 0];
     
    169179      : this(elements,columnNames) {
    170180      RowNames = rowNames;
    171     }
    172 
    173     public override IDeepCloneable Clone(Cloner cloner) {
    174       ValueTypeMatrix<T> clone = (ValueTypeMatrix<T>)base.Clone(cloner);
    175       clone.matrix = (T[,])matrix.Clone();
    176       clone.columnNames = new List<string>(columnNames);
    177       clone.rowNames = new List<string>(rowNames);
    178       clone.sortableView = sortableView;
    179       clone.readOnly = readOnly;
    180       return clone;
    181181    }
    182182
  • branches/CloningRefactoring/HeuristicLab.Data/3.3/ValueTypeValue.cs

    r3822 r4662  
    5353    }
    5454
     55    [StorableConstructor]
     56    protected ValueTypeValue(bool deserializing) : base(deserializing) { }
     57    protected ValueTypeValue(ValueTypeValue<T> original, Cloner cloner)
     58      : base(original, cloner) {
     59      this.value = original.value;
     60      this.readOnly = original.readOnly;
     61    }
    5562    protected ValueTypeValue() {
    5663      this.value = default(T);
     
    6067      this.value = value;
    6168      this.readOnly = false;
    62     }
    63 
    64     public override IDeepCloneable Clone(Cloner cloner) {
    65       ValueTypeValue<T> clone = (ValueTypeValue<T>)base.Clone(cloner);
    66       clone.value = value;
    67       clone.readOnly = readOnly;
    68       return clone;
    6969    }
    7070
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/AlgorithmOperator.cs

    r3376 r4662  
    4444    }
    4545
     46    [StorableConstructor]
     47    protected AlgorithmOperator(bool deserializing) : base(deserializing) { }
     48    protected AlgorithmOperator(AlgorithmOperator original, Cloner cloner)
     49      : base(original, cloner) {
     50      this.operatorGraph = cloner.Clone<OperatorGraph>(original.operatorGraph);
     51    }
    4652    protected AlgorithmOperator()
    4753      : base() {
    4854      operatorGraph = new OperatorGraph();
    49     }
    50 
    51     public override IDeepCloneable Clone(Cloner cloner) {
    52       AlgorithmOperator clone = (AlgorithmOperator)base.Clone(cloner);
    53       clone.operatorGraph = (OperatorGraph)cloner.Clone(operatorGraph);
    54       return clone;
    5555    }
    5656
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/Assigner.cs

    r4068 r4662  
    2323using HeuristicLab.Parameters;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Common;
    2526
    2627namespace HeuristicLab.Operators {
     
    3839    }
    3940
     41    [StorableConstructor]
     42    private Assigner(bool deserializing) : base(deserializing) { }
     43    private Assigner(Assigner original, Cloner cloner)
     44      : base(original, cloner) {
     45    }
    4046    public Assigner()
    4147      : base() {
    4248      Parameters.Add(new LookupParameter<IItem>("LeftSide", "The parameter whose value gets assigned with a clone of the other parameter's value."));
    4349      Parameters.Add(new ValueLookupParameter<IItem>("RightSide", "The parameter whose value is cloned and assigned to the value of the other parameter."));
     50    }
     51
     52    public override IDeepCloneable Clone(Cloner cloner) {
     53      return new Assigner(this, cloner);
    4454    }
    4555
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/CheckedMultiOperator.cs

    r4068 r4662  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Common;
    2425
    2526namespace HeuristicLab.Operators {
     
    3738      protected set { base.Operators = value; }
    3839    }
     40
     41    [StorableConstructor]
     42    protected CheckedMultiOperator(bool deserializing) : base(deserializing) { }
     43    protected CheckedMultiOperator(CheckedMultiOperator<T> original, Cloner cloner)
     44      : base(original, cloner) {
     45    }
    3946    /// <summary>
    4047    /// Creates a new instance of CheckedMultiOperator
     
    4451      Operators = new CheckedItemList<T>();
    4552    }
    46     [StorableConstructor]
    47     protected CheckedMultiOperator(bool deserializing) : base(deserializing) { }
    4853  }
    4954}
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/CombinedOperator.cs

    r4477 r4662  
    4343    }
    4444
     45    [StorableConstructor]
     46    private CombinedOperator(bool deserializing) : base(deserializing) { }
     47    private CombinedOperator(CombinedOperator original, Cloner cloner)
     48      : base(original, cloner) {
     49    }
    4550    public CombinedOperator() : base() { }
     51
     52    public override IDeepCloneable Clone(Cloner cloner) {
     53      return new CombinedOperator(this, cloner);
     54    }
    4655  }
    4756}
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/Comparator.cs

    r4068 r4662  
    2525using HeuristicLab.Parameters;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Common;
    2728
    2829namespace HeuristicLab.Operators {
     
    5051    }
    5152
     53    [StorableConstructor]
     54    private Comparator(bool deserializing) : base(deserializing) { }
     55    private Comparator(Comparator original, Cloner cloner)
     56      : base(original, cloner) {
     57    }
    5258    public Comparator()
    5359      : base() {
     
    5662      Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(Data.ComparisonType.Equal)));
    5763      Parameters.Add(new LookupParameter<BoolValue>("Result", "The result of the comparison."));
     64    }
     65
     66    public override IDeepCloneable Clone(Cloner cloner) {
     67      return new Comparator(this, cloner);
    5868    }
    5969
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/ConditionalBranch.cs

    r4477 r4662  
    2424using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Common;
    2627
    2728namespace HeuristicLab.Operators {
     
    5051    }
    5152
     53    [StorableConstructor]
     54    protected ConditionalBranch(bool deserializing) : base(deserializing) { }
     55    protected ConditionalBranch(ConditionalBranch original, Cloner cloner)
     56      : base(original, cloner) {
     57    }
    5258    public ConditionalBranch()
    5359      : base() {
     
    5561      Parameters.Add(new OperatorParameter("TrueBranch", "The operator which is executed if the condition is true."));
    5662      Parameters.Add(new OperatorParameter("FalseBranch", "The operator which is executed if the condition is false."));
     63    }
     64
     65    public override IDeepCloneable Clone(Cloner cloner) {
     66      return new ConditionalBranch(this, cloner);
    5767    }
    5868
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/DoubleCounter.cs

    r4477 r4662  
    2424using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Common;
    2627
    2728namespace HeuristicLab.Operators {
     
    4344    }
    4445
     46    [StorableConstructor]
     47    private DoubleCounter(bool deserializing) : base(deserializing) { }
     48    private DoubleCounter(DoubleCounter original, Cloner cloner)
     49      : base(original, cloner) {
     50    }
    4551    public DoubleCounter()
    4652      : base() {
    4753      Parameters.Add(new LookupParameter<DoubleValue>("Value", "The value which should be incremented."));
    4854      Parameters.Add(new ValueLookupParameter<DoubleValue>("Increment", "The increment which is added to the value.", new DoubleValue(1)));
     55    }
     56
     57    public override IDeepCloneable Clone(Cloner cloner) {
     58      return new DoubleCounter(this, cloner);
    4959    }
    5060
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/EmptyOperator.cs

    r4477 r4662  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Common;
    2425
    2526namespace HeuristicLab.Operators {
     
    3031  [StorableClass]
    3132  public sealed class EmptyOperator : SingleSuccessorOperator {
     33    [StorableConstructor]
     34    private EmptyOperator(bool deserializing) : base(deserializing) { }
     35    private EmptyOperator(EmptyOperator original, Cloner cloner)
     36      : base(original, cloner) {
     37    }
    3238    public EmptyOperator()
    3339      : base() {
    3440    }
     41
     42    public override IDeepCloneable Clone(Cloner cloner) {
     43      return new EmptyOperator(this, cloner);
     44    }
    3545  }
    3646}
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/IntCounter.cs

    r4477 r4662  
    2424using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Common;
    2627
    2728namespace HeuristicLab.Operators {
     
    4344    }
    4445
     46    [StorableConstructor]
     47    private IntCounter(bool deserializing) : base(deserializing) { }
     48    private IntCounter(IntCounter original, Cloner cloner)
     49      : base(original, cloner) {
     50    }
    4551    public IntCounter()
    4652      : base() {
    4753      Parameters.Add(new LookupParameter<IntValue>("Value", "The value which should be incremented."));
    4854      Parameters.Add(new ValueLookupParameter<IntValue>("Increment", "The increment which is added to the value.", new IntValue(1)));
     55    }
     56
     57    public override IDeepCloneable Clone(Cloner cloner) {
     58      return new IntCounter(this, cloner);
    4959    }
    5060
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/MultiOperator.cs

    r4068 r4662  
    5151    }
    5252
     53    [StorableConstructor]
     54    protected MultiOperator(bool deserializing) : base(deserializing) { }
     55    protected MultiOperator(MultiOperator<T> original, Cloner cloner)
     56      : base(original, cloner) {
     57      this.operators = cloner.Clone<IItemList<T>>(original.operators);
     58      Initialize();
     59    }
    5360    public MultiOperator()
    5461      : base() {
     
    5764    }
    5865
    59     [StorableConstructor]
    60     protected MultiOperator(bool deserializing) : base(deserializing) { }
    61 
    6266    [StorableHook(HookType.AfterDeserialization)]
     67    private void AfterDeserialization() {
     68      Initialize();
     69    }
     70   
    6371    private void Initialize() {
    6472      if (operators != null) RegisterOperatorsEvents();
     
    6977        opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
    7078      }
    71     }
    72 
    73     public override IDeepCloneable Clone(Cloner cloner) {
    74       MultiOperator<T> clone = (MultiOperator<T>)base.Clone(cloner);
    75       clone.operators = (IItemList<T>)cloner.Clone(operators);
    76       clone.Initialize();
    77       return clone;
    7879    }
    7980
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/Operator.cs

    r4477 r4662  
    8585    }
    8686
     87    [StorableConstructor]
     88    protected Operator(bool deserializing) : base(deserializing) { }
     89    protected Operator(Operator original, Cloner cloner)
     90      : base(original, cloner) {
     91      this.canceled = original.canceled;
     92      this.breakpoint = original.breakpoint;
     93      this.executionContext = cloner.Clone<IExecutionContext>(original.executionContext);
     94    }
    8795    /// <summary>
    8896    /// Initializes a new instance of <see cref="OperatorBase"/> setting the breakpoint flag and
     
    113121      canceled = false;
    114122      breakpoint = false;
    115     }
    116     [StorableConstructor]
    117     protected Operator(bool deserializing) : base(deserializing) { }
    118 
    119     /// <summary>
    120     /// Clones the current instance (deep clone).
    121     /// </summary>
    122     /// <remarks>Clones also sub operators, variables and variable infos.</remarks>
    123     /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
    124     /// <returns>The cloned object as <see cref="OperatorBase"/>.</returns>
    125     public override IDeepCloneable Clone(Cloner cloner) {
    126       Operator clone = (Operator)base.Clone(cloner);
    127       clone.canceled = canceled;
    128       clone.breakpoint = breakpoint;
    129       clone.executionContext = (IExecutionContext)cloner.Clone(executionContext);
    130       return clone;
    131123    }
    132124
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/Placeholder.cs

    r4477 r4662  
    2323using HeuristicLab.Parameters;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Common;
    2526
    2627namespace HeuristicLab.Operators {
     
    3536    }
    3637
     38    [StorableConstructor]
     39    private Placeholder(bool deserializing) : base(deserializing) { }
     40    private Placeholder(Placeholder original, Cloner cloner)
     41      : base(original, cloner) {
     42    }
    3743    public Placeholder()
    3844      : base() {
    3945      Parameters.Add(new LookupParameter<IOperator>("Operator", "The operator which is retrieved from the scope or a parent execution context and applied on the current scope."));
     46    }
     47
     48    public override IDeepCloneable Clone(Cloner cloner) {
     49      return new Placeholder(this, cloner);
    4050    }
    4151
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/ScopeCleaner.cs

    r4477 r4662  
    2323using HeuristicLab.Parameters;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Common;
    2526
    2627namespace HeuristicLab.Operators {
     
    3839    }
    3940
     41    [StorableConstructor]
     42    private ScopeCleaner(bool deserializing) : base(deserializing) { }
     43    private ScopeCleaner(ScopeCleaner original, Cloner cloner)
     44      : base(original, cloner) {
     45    }
    4046    public ScopeCleaner()
    4147      : base() {
    4248      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope whose variables and sub-scopes should be removed."));
     49    }
     50
     51    public override IDeepCloneable Clone(Cloner cloner) {
     52      return new ScopeCleaner(this, cloner);
    4353    }
    4454
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs

    r4477 r4662  
    2323using HeuristicLab.Parameters;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Common;
    2526
    2627namespace HeuristicLab.Operators {
     
    3940    }
    4041
     42    [StorableConstructor]
     43    protected SingleSuccessorOperator(bool deserializing) : base(deserializing) { }
     44    protected SingleSuccessorOperator(SingleSuccessorOperator original, Cloner cloner)
     45      : base(original, cloner) {
     46    }
    4147    public SingleSuccessorOperator()
    4248      : base() {
    4349      Parameters.Add(new OperatorParameter("Successor", "Operator which is executed next."));
    4450    }
    45     [StorableConstructor]
    46     protected SingleSuccessorOperator(bool deserializing) : base(deserializing) { }
    47 
     51   
    4852    public override IOperation Apply() {
    4953      if (Successor != null)
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/StochasticBranch.cs

    r4477 r4662  
    2424using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Common;
    2627
    2728namespace HeuristicLab.Operators {
     
    5354    }
    5455
     56    [StorableConstructor]
     57    protected StochasticBranch(bool deserializing) : base(deserializing) { }
     58    protected StochasticBranch(StochasticBranch original, Cloner cloner)
     59      : base(original, cloner) {
     60    }
    5561    public StochasticBranch()
    5662      : base() {
     
    5965      Parameters.Add(new OperatorParameter("FirstBranch", "The operator which is executed with the given probability."));
    6066      Parameters.Add(new OperatorParameter("SecondBranch", "The operator which is executed if the first branch is not executed."));
     67    }
     68
     69    public override IDeepCloneable Clone(Cloner cloner) {
     70      return new StochasticBranch(this, cloner);
    6171    }
    6272
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs

    r4477 r4662  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Common;
    3031
    3132namespace HeuristicLab.Operators {
     
    5657    [StorableConstructor]
    5758    protected StochasticMultiBranch(bool deserializing) : base(deserializing) { }
     59    protected StochasticMultiBranch(StochasticMultiBranch<T> original, Cloner cloner)
     60      : base(original, cloner) {
     61    }
    5862    /// <summary>
    5963    /// Initializes a new instance of <see cref="StochasticMultiOperator"/> with two parameters
     
    143147  [StorableClass]
    144148  public class StochasticMultiBranch : StochasticMultiBranch<IOperator> {
     149    [StorableConstructor]
     150    protected StochasticMultiBranch(bool deserializing) : base(deserializing) { }
     151    protected StochasticMultiBranch(StochasticMultiBranch original, Cloner cloner)
     152      : base(original, cloner) {
     153    }
     154    public StochasticMultiBranch() { }
     155
     156    public override IDeepCloneable Clone(Cloner cloner) {
     157      return new StochasticMultiBranch(this, cloner);
     158    }
     159
    145160    protected override bool CreateChildOperation {
    146161      get { return false; }
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/SubScopesCreator.cs

    r4477 r4662  
    2424using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Common;
    2627
    2728namespace HeuristicLab.Operators {
     
    4243    }
    4344
     45    [StorableConstructor]
     46    protected SubScopesCreator(bool deserializing) : base(deserializing) { }
     47    protected SubScopesCreator(SubScopesCreator original, Cloner cloner)
     48      : base(original, cloner) {
     49    }
    4450    public SubScopesCreator()
    4551      : base() {
    4652      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSubScopes", "The number of new and empty sub-scopes which should be added to the current scope."));
    4753      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new and empty sub-scopes are added."));
     54    }
     55
     56    public override IDeepCloneable Clone(Cloner cloner) {
     57      return new SubScopesCreator(this, cloner);
    4858    }
    4959
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/SubScopesMixer.cs

    r4477 r4662  
    2525using HeuristicLab.Parameters;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Common;
    2728
    2829namespace HeuristicLab.Operators {
     
    4243    }
    4344
     45    [StorableConstructor]
     46    protected SubScopesMixer(bool deserializing) : base(deserializing) { }
     47    protected SubScopesMixer(SubScopesMixer original, Cloner cloner)
     48      : base(original, cloner) {
     49    }
    4450    /// <summary>
    4551    /// Initializes a new instance of <see cref="SubScopesMixer"/> with one variable infos
     
    4955      : base() {
    5056      Parameters.Add(new ValueParameter<IntValue>("Partitions", "The number of equal-sized partitions.", new IntValue(2)));
     57    }
     58
     59    public override IDeepCloneable Clone(Cloner cloner) {
     60      return new SubScopesMixer(this, cloner);
    5161    }
    5262
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/SubScopesProcessor.cs

    r4477 r4662  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Common;
    2930
    3031namespace HeuristicLab.Operators {
     
    5152    }
    5253
     54    [StorableConstructor]
     55    private SubScopesProcessor(bool deserializing) : base(deserializing) { }
     56    private SubScopesProcessor(SubScopesProcessor original, Cloner cloner)
     57      : base(original, cloner) {
     58    }
    5359    public SubScopesProcessor()
    5460      : base() {
    5561      Parameters.Add(new ValueLookupParameter<BoolValue>("Parallel", "True if the operators should be applied in parallel on the sub-scopes, otherwise false.", new BoolValue(false)));
    5662      Parameters.Add(new ValueParameter<IntValue>("Depth", "The number of steps to descend in the scope tree before applying operator.", new IntValue(1)));
     63    }
     64
     65    public override IDeepCloneable Clone(Cloner cloner) {
     66      return new SubScopesProcessor(this, cloner);
    5767    }
    5868
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/SubScopesRemover.cs

    r4477 r4662  
    2424using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Common;
    2627
    2728namespace HeuristicLab.Operators {
     
    5051    }
    5152
     53    [StorableConstructor]
     54    private SubScopesRemover(bool deserializing) : base(deserializing) { }
     55    private SubScopesRemover(SubScopesRemover original, Cloner cloner)
     56      : base(original, cloner) {
     57    }
    5258    public SubScopesRemover()
    5359      : base() {
     
    5561      Parameters.Add(new ValueLookupParameter<IntValue>("SubScopeIndex", "The index of the sub-scope which should be removed. This parameter is ignored, if RemoveAllSubScopes is true."));
    5662      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope from which one or all sub-scopes should be removed."));
     63    }
     64
     65    public override IDeepCloneable Clone(Cloner cloner) {
     66      return new SubScopesRemover(this, cloner);
    5767    }
    5868
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/SubScopesSorter.cs

    r4068 r4662  
    2424using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Common;
    2627
    2728namespace HeuristicLab.Operators {
     
    4849    }
    4950
     51    [StorableConstructor]
     52    private SubScopesSorter(bool deserializing) : base(deserializing) { }
     53    private SubScopesSorter(SubScopesSorter original, Cloner cloner)
     54      : base(original, cloner) {
     55    }
    5056    public SubScopesSorter()
    5157      : base() {
     
    5359      Parameters.Add(new ValueLookupParameter<BoolValue>("Descending", "True if the sub-scopes should be sorted in descending order, otherwise false."));
    5460      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope whose sub-scopes are sorted."));
     61    }
     62
     63    public override IDeepCloneable Clone(Cloner cloner) {
     64      return new SubScopesSorter(this, cloner);
    5565    }
    5666
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/UniformSubScopesProcessor.cs

    r4477 r4662  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Common;
    2829
    2930namespace HeuristicLab.Operators {
     
    5758    }
    5859
     60    [StorableConstructor]
     61    private UniformSubScopesProcessor(bool deserializing) : base(deserializing) { }
     62    private UniformSubScopesProcessor(UniformSubScopesProcessor original, Cloner cloner)
     63      : base(original, cloner) {
     64    }
    5965    public UniformSubScopesProcessor()
    6066      : base() {
     
    6268      Parameters.Add(new ValueLookupParameter<BoolValue>("Parallel", "True if the operator should be applied in parallel on all sub-scopes, otherwise false.", new BoolValue(false)));
    6369      Parameters.Add(new ValueParameter<IntValue>("Depth", "The number of steps to descend in the scope tree before applying operator.", new IntValue(1)));
     70    }
     71
     72    public override IDeepCloneable Clone(Cloner cloner) {
     73      return new UniformSubScopesProcessor(this, cloner);
    6474    }
    6575
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/ValuesCollector.cs

    r3376 r4662  
    3838    }
    3939
     40    [StorableConstructor]
     41    protected ValuesCollector(bool deserializing) : base(deserializing) { }
     42    protected ValuesCollector(ValuesCollector original, Cloner cloner)
     43      : base(original, cloner) {
     44      this.collectedValues = cloner.Clone<ParameterCollection>(original.collectedValues);
     45      Initialize();
     46    }
    4047    public ValuesCollector()
    4148      : base() {
     
    4350      Initialize();
    4451    }
    45     [StorableConstructor]
    46     protected ValuesCollector(bool deserializing) : base(deserializing) { }
    4752
    4853    [StorableHook(HookType.AfterDeserialization)]
     54    private void AfterDeserialization() {
     55      Initialize();
     56    }
     57
    4958    private void Initialize() {
    5059      collectedValues.ItemsAdded += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_ItemsAdded);
    5160      collectedValues.ItemsRemoved += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_ItemsRemoved);
    5261      collectedValues.CollectionReset += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_CollectionReset);
    53     }
    54 
    55     public override IDeepCloneable Clone(Cloner cloner) {
    56       ValuesCollector clone = (ValuesCollector)base.Clone(cloner);
    57       clone.collectedValues = (ParameterCollection)cloner.Clone(collectedValues);
    58       clone.Initialize();
    59       return clone;
    6062    }
    6163
  • branches/CloningRefactoring/HeuristicLab.Operators/3.3/VariableCreator.cs

    r4477 r4662  
    2323using HeuristicLab.Parameters;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Common;
    2526
    2627namespace HeuristicLab.Operators {
     
    3839    }
    3940
     41    [StorableConstructor]
     42    protected VariableCreator(bool deserializing) : base(deserializing) { }
     43    protected VariableCreator(VariableCreator original, Cloner cloner)
     44      : base(original, cloner) {
     45    }
    4046    public VariableCreator()
    4147      : base() {
    4248      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope into which the parameter values are cloned."));
     49    }
     50
     51    public override IDeepCloneable Clone(Cloner cloner) {
     52      return new VariableCreator(this, cloner);
    4353    }
    4454
Note: See TracChangeset for help on using the changeset viewer.