Changeset 4722 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators
- Timestamp:
- 11/06/10 01:56:04 (14 years ago)
- Location:
- trunk/sources
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:mergeinfo changed
/branches/CloningRefactoring (added) merged: 4656-4693,4696-4697,4711-4714,4718-4719
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting (added) merged: 4686-4687,4689-4693,4696-4697
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators/DefaultRepresentationCreator.cs
r4183 r4722 20 20 #endregion 21 21 22 using System.Collections.Generic; 23 using HeuristicLab.Common; 22 24 using HeuristicLab.Core; 23 using HeuristicLab.Data;24 using HeuristicLab.Operators;25 using HeuristicLab.Parameters;26 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using System.Collections.Generic;28 using HeuristicLab.Problems.VehicleRouting.Encodings;29 using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;30 26 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin; 31 27 … … 38 34 [StorableConstructor] 39 35 protected DefaultRepresentationCreator(bool deserializing) : base(deserializing) { } 36 protected DefaultRepresentationCreator(DefaultRepresentationCreator original, Cloner cloner) : base(original, cloner) { } 40 37 41 38 public DefaultRepresentationCreator() : base() { } … … 46 43 47 44 return base.Apply(); 48 } 45 } 49 46 } 50 47 } -
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators/MultiVRPSolutionCreator.cs
r4352 r4722 23 23 using System.Linq; 24 24 using HeuristicLab.Collections; 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; 27 using HeuristicLab.Data; 26 28 using HeuristicLab.Operators; 27 29 using HeuristicLab.Optimization; … … 29 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 32 using HeuristicLab.PluginInfrastructure; 31 using HeuristicLab.Data;32 33 33 34 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General { … … 78 79 79 80 [StorableConstructor] 80 private MultiVRPSolutionCreator(bool deserializing) : base(deserializing) { } 81 protected MultiVRPSolutionCreator(bool deserializing) : base(deserializing) { } 82 protected MultiVRPSolutionCreator(MultiVRPSolutionCreator original, Cloner cloner) : base(original, cloner) { } 83 public override IDeepCloneable Clone(Cloner cloner) { 84 return new MultiVRPSolutionCreator(this, cloner); 85 } 86 81 87 public MultiVRPSolutionCreator() 82 88 : base() { 83 89 Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The new VRP tours.")); 84 90 85 86 87 88 89 90 91 92 93 94 91 Parameters.Add(new ValueLookupParameter<IntValue>("Cities", "The city count.")); 92 Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The coordinates of the cities.")); 93 Parameters.Add(new LookupParameter<DoubleMatrix>("DistanceMatrix", "The matrix which contains the distances between the cities.")); 94 Parameters.Add(new LookupParameter<BoolValue>("UseDistanceMatrix", "True if a distance matrix should be calculated and used for evaluation, otherwise false.")); 95 Parameters.Add(new LookupParameter<IntValue>("Vehicles", "The number of vehicles.")); 96 Parameters.Add(new LookupParameter<DoubleValue>("Capacity", "The capacity of each vehicle.")); 97 Parameters.Add(new LookupParameter<DoubleArray>("Demand", "The demand of each customer.")); 98 Parameters.Add(new LookupParameter<DoubleArray>("ReadyTime", "The ready time of each customer.")); 99 Parameters.Add(new LookupParameter<DoubleArray>("DueTime", "The due time of each customer.")); 100 Parameters.Add(new LookupParameter<DoubleArray>("ServiceTime", "The service time of each customer.")); 95 101 96 97 98 102 foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCreator)).OrderBy(op => op.Name)) { 103 if (!typeof(MultiOperator<IVRPCreator>).IsAssignableFrom(type)) 104 Operators.Add((IVRPCreator)Activator.CreateInstance(type), true); 99 105 } 100 106 } -
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators/PushForwardInsertionCreator.cs
r4352 r4722 22 22 using System; 23 23 using System.Collections.Generic; 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; 25 26 using HeuristicLab.Data; 26 using HeuristicLab.Encodings.PermutationEncoding;27 27 using HeuristicLab.Optimization; 28 28 using HeuristicLab.Parameters; … … 60 60 [StorableConstructor] 61 61 private PushForwardCreator(bool deserializing) : base(deserializing) { } 62 private PushForwardCreator(PushForwardCreator original, Cloner cloner) : base(original, cloner) { } 63 public override IDeepCloneable Clone(Cloner cloner) { 64 return new PushForwardCreator(this, cloner); 65 } 62 66 63 67 public PushForwardCreator() -
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators/RandomCreator.cs
r4183 r4722 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using HeuristicLab.Data;26 using HeuristicLab.Encodings.PermutationEncoding;27 25 using HeuristicLab.Optimization; 28 26 using HeuristicLab.Parameters; … … 41 39 [StorableConstructor] 42 40 private RandomCreator(bool deserializing) : base(deserializing) { } 41 private RandomCreator(RandomCreator original, Cloner cloner) : base(original, cloner) { } 42 public override IDeepCloneable Clone(Cloner cloner) { 43 return new RandomCreator(this, cloner); 44 } 43 45 44 46 public RandomCreator()
Note: See TracChangeset
for help on using the changeset viewer.