Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/29/10 20:21:04 (13 years ago)
Author:
mkommend
Message:

Refactored VRP Encodings.General and Zhu (ticket #922).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/ZhuEncoding.cs

    r4352 r4687  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.Core;
     
    2527using HeuristicLab.Encodings.PermutationEncoding;
    2628using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using System.Collections.Generic;
    2829using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    29 using System;
    3030
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
     
    4444    [Storable]
    4545    DoubleArray dueTimeArray;
    46    
     46
    4747    [Storable]
    4848    DoubleArray serviceTimeArray;
     
    5050    [Storable]
    5151    DoubleArray readyTimeArray;
    52    
     52
    5353    [Storable]
    5454    DoubleArray demandArray;
     
    7575          distanceMatrix,
    7676          useDistanceMatrix)) {
    77             newTour.Cities.Remove(city);
    78             if (newTour.Cities.Count > 0)
    79               result.Add(newTour);
     77          newTour.Cities.Remove(city);
     78          if (newTour.Cities.Count > 0)
     79            result.Add(newTour);
    8080
    81             newTour = new Tour();
    82             newTour.Cities.Add(city);
     81          newTour = new Tour();
     82          newTour.Cities.Add(city);
    8383        }
    8484      }
     
    124124    #endregion
    125125
    126     public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
    127       ZhuEncoding clone = new ZhuEncoding(
    128         new Permutation(this.PermutationType, this.array), cities,
    129         dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
    130         coordinates, useDistanceMatrix);
    131 
    132       cloner.RegisterClonedObject(this, clone);
    133       clone.readOnly = readOnly;
    134       return clone;
    135     }
    136 
    137     public ZhuEncoding(Permutation permutation, int cities,
    138       DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
    139       DoubleMatrix coordinates, BoolValue useDistanceMatrix)
    140       : base(permutation) {
    141         this.cities = cities;
    142         this.dueTimeArray = dueTimeArray;
    143         this.serviceTimeArray = serviceTimeArray;
    144         this.readyTimeArray = readyTimeArray;
    145         this.demandArray = demandArray;
    146         this.capacity = capacity;
    147         this.coordinates = coordinates;
    148         this.useDistanceMatrix = useDistanceMatrix;
    149     }
    150 
    151126    [StorableConstructor]
    152127    private ZhuEncoding(bool serializing)
    153128      : base(serializing) {
     129    }
     130
     131    protected ZhuEncoding(ZhuEncoding original, Cloner cloner)
     132      : base(original, cloner) {
     133      this.cities = original.cities;
     134      this.dueTimeArray = original.dueTimeArray;
     135      this.serviceTimeArray = original.serviceTimeArray;
     136      this.readyTimeArray = original.readyTimeArray;
     137      this.demandArray = original.demandArray;
     138      this.capacity = original.capacity;
     139      this.coordinates = original.coordinates;
     140      this.useDistanceMatrix = original.useDistanceMatrix;
     141    }
     142    public override IDeepCloneable Clone(Cloner cloner) {
     143      return new ZhuEncoding(this, cloner);
    154144    }
    155145
     
    171161    }
    172162
    173     public static ZhuEncoding ConvertFrom(List<int> routeParam, int cities, 
     163    public static ZhuEncoding ConvertFrom(List<int> routeParam, int cities,
    174164      DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
    175165      DoubleMatrix coordinates, BoolValue useDistanceMatrix) {
     
    183173
    184174      return new ZhuEncoding(
    185         new Permutation(PermutationTypes.RelativeUndirected, route.ToArray()), cities, 
     175        new Permutation(PermutationTypes.RelativeUndirected, route.ToArray()), cities,
    186176        dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
    187177        coordinates, useDistanceMatrix);
Note: See TracChangeset for help on using the changeset viewer.