Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/06/10 01:56:04 (14 years ago)
Author:
swagner
Message:

Merged cloning refactoring branch back into trunk (#922)

Location:
trunk/sources
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPMoveEvaluator.cs

    r4068 r4722  
    2121
    2222using System;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Data;
    … …  
    4849    }
    4950
     51    [StorableConstructor]
     52    protected TSPMoveEvaluator(bool deserializing) : base(deserializing) { }
     53    protected TSPMoveEvaluator(TSPMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    5054    protected TSPMoveEvaluator()
    5155      : base() {

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPPathMoveEvaluator.cs

    r4068 r4722  
    2020#endregion
    2121
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    2324using HeuristicLab.Data;
    … …  
    4647    }
    4748
     49    [StorableConstructor]
     50    protected TSPPathMoveEvaluator(bool deserializing) : base(deserializing) { }
     51    protected TSPPathMoveEvaluator(TSPPathMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4852    protected TSPPathMoveEvaluator()
    4953      : base() {

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveEuclideanPathEvaluator.cs

    r4068 r4722  
    2121
    2222using System;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3132  [StorableClass]
    3233  public class TSPTranslocationMoveEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
     34    [StorableConstructor]
     35    protected TSPTranslocationMoveEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     36    protected TSPTranslocationMoveEuclideanPathEvaluator(TSPTranslocationMoveEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
     37    public TSPTranslocationMoveEuclideanPathEvaluator() : base() { }
     38
     39    public override IDeepCloneable Clone(Cloner cloner) {
     40      return new TSPTranslocationMoveEuclideanPathEvaluator(this, cloner);
     41    }
     42   
    3343    public override Type EvaluatorType {
    3444      get { return typeof(TSPEuclideanPathEvaluator); }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveGeoPathEvaluator.cs

    r4068 r4722  
    2121
    2222using System;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3738    private const double PI = 3.141592;
    3839    private const double RADIUS = 6378.388;
     40
     41    [StorableConstructor]
     42    protected TSPTranslocationMoveGeoPathEvaluator(bool deserializing) : base(deserializing) { }
     43    protected TSPTranslocationMoveGeoPathEvaluator(TSPTranslocationMoveGeoPathEvaluator original, Cloner cloner) : base(original, cloner) { }
     44    public TSPTranslocationMoveGeoPathEvaluator() : base() { }
     45
     46    public override IDeepCloneable Clone(Cloner cloner) {
     47      return new TSPTranslocationMoveGeoPathEvaluator(this, cloner);
     48    }
     49   
    3950
    4051    /// <summary>

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs

    r4068 r4722  
    2020#endregion
    2121
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    2324using HeuristicLab.Data;
    … …  
    3738    }
    3839
     40    [StorableConstructor]
     41    protected TSPTranslocationMovePathEvaluator(bool deserializing) : base(deserializing) { }
     42    protected TSPTranslocationMovePathEvaluator(TSPTranslocationMovePathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3943    public TSPTranslocationMovePathEvaluator()
    4044      : base() {

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveRoundedEuclideanPathEvaluator.cs

    r4068 r4722  
    2121
    2222using System;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3132  [StorableClass]
    3233  public class TSPTranslocationMoveRoundedEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
     34    [StorableConstructor]
     35    protected TSPTranslocationMoveRoundedEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     36    protected TSPTranslocationMoveRoundedEuclideanPathEvaluator(TSPTranslocationMoveRoundedEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
     37    public TSPTranslocationMoveRoundedEuclideanPathEvaluator() : base() { }
     38
     39    public override IDeepCloneable Clone(Cloner cloner) {
     40      return new TSPTranslocationMoveRoundedEuclideanPathEvaluator(this, cloner);
     41    }
     42   
    3343    public override Type EvaluatorType {
    3444      get { return typeof(TSPRoundedEuclideanPathEvaluator); }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveEuclideanPathEvaluator.cs

    r4068 r4722  
    2121
    2222using System;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3132  [StorableClass]
    3233  public class TSPInversionMoveEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
     34    [StorableConstructor]
     35    protected TSPInversionMoveEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     36    protected TSPInversionMoveEuclideanPathEvaluator(TSPInversionMoveEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
     37    public TSPInversionMoveEuclideanPathEvaluator() : base() { }
     38
     39    public override IDeepCloneable Clone(Cloner cloner) {
     40      return new TSPInversionMoveEuclideanPathEvaluator(this, cloner);
     41    }
     42   
    3343    public override Type EvaluatorType {
    3444      get { return typeof(TSPEuclideanPathEvaluator); }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveGeoPathEvaluator.cs

    r4068 r4722  
    2121
    2222using System;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3839    private const double RADIUS = 6378.388;
    3940
     41    [StorableConstructor]
     42    protected TSPInversionMoveGeoPathEvaluator(bool deserializing) : base(deserializing) { }
     43    protected TSPInversionMoveGeoPathEvaluator(TSPInversionMoveGeoPathEvaluator original, Cloner cloner) : base(original, cloner) { }
     44    public TSPInversionMoveGeoPathEvaluator() : base() { }
     45
     46    public override IDeepCloneable Clone(Cloner cloner) {
     47      return new TSPInversionMoveGeoPathEvaluator(this, cloner);
     48    }
     49   
    4050    /// <summary>
    4151    /// Calculates the distance between two points using the GEO distance metric (globe coordinates).

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMovePathEvaluator.cs

    r4068 r4722  
    2020#endregion
    2121
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    2324using HeuristicLab.Data;
    … …  
    3738    }
    3839
     40    [StorableConstructor]
     41    protected TSPInversionMovePathEvaluator(bool deserializing) : base(deserializing) { }
     42    protected TSPInversionMovePathEvaluator(TSPInversionMovePathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3943    public TSPInversionMovePathEvaluator()
    4044      : base() {

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveRoundedEuclideanPathEvaluator.cs

    r4068 r4722  
    2121
    2222using System;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3132  [StorableClass]
    3233  public class TSPInversionMoveRoundedEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
     34    [StorableConstructor]
     35    protected TSPInversionMoveRoundedEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     36    protected TSPInversionMoveRoundedEuclideanPathEvaluator(TSPInversionMoveRoundedEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
     37    public TSPInversionMoveRoundedEuclideanPathEvaluator() : base() { }
     38
     39    public override IDeepCloneable Clone(Cloner cloner) {
     40      return new TSPInversionMoveRoundedEuclideanPathEvaluator(this, cloner);
     41    }
     42   
    3343    public override Type EvaluatorType {
    3444      get { return typeof(TSPRoundedEuclideanPathEvaluator); }
Note: See TracChangeset for help on using the changeset viewer.