Context Navigation

ProblemInstances

Timestamp:

11/09/10 09:55:31 (14 years ago)

Author:

svonolfe

Message:

Merged relevant changes from the trunk into the branch (cloning,...) (#1177)

Location:

Files:

-                      r4520
+                      r4752
 using HeuristicLab.Problems.VehicleRouting.Variants;
 using HeuristicLab.Problems.VehicleRouting.Encodings;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
 …
       Parameters.Add(new LookupParameter<DoubleValue>("Overload", "The overload."));
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CVRPEvaluator(this, cloner);
+    }
+    protected CVRPEvaluator(CVRPEvaluator original, Cloner cloner)
+      : base(original, cloner) {
+    }
+  }
+}

-                      r4376
+                      r4752
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
 …
       Parameters.Add(new ValueParameter<DoubleValue>("EvalOverloadPenalty", "The overload penalty considered in the evaluation.", new DoubleValue(100)));
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CVRPProblemInstance(this, cloner);
+    }
+    protected CVRPProblemInstance(CVRPProblemInstance original, Cloner cloner)
+      : base(original, cloner) {
+    }
+  }
+}

-                      r4520
+                      r4752
 using HeuristicLab.Problems.VehicleRouting.Variants;
 using HeuristicLab.Problems.VehicleRouting.Encodings;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
 …
       Parameters.Add(new LookupParameter<DoubleValue>("TravelTime", "The travel time."));
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CVRPTWEvaluator(this, cloner);
+    }
+    protected CVRPTWEvaluator(CVRPTWEvaluator original, Cloner cloner)
+      : base(original, cloner) {
+    }
+  }
+}

-                      r4454
+                      r4752
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
 …
       Parameters.Add(new ValueParameter<DoubleValue>("EvalTardinessPenalty", "The tardiness penalty considered in the evaluation.", new DoubleValue(100)));
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CVRPTWProblemInstance(this, cloner);
+    }
+    protected CVRPTWProblemInstance(CVRPTWProblemInstance original, Cloner cloner)
+      : base(original, cloner) {
+    }
+  }
+}

-                      r4378
+                      r4752
 using HeuristicLab.Problems.VehicleRouting.Variants;
 using HeuristicLab.Problems.VehicleRouting.Encodings;
+using HeuristicLab.Common;
 …
     public SingleDepotVRPEvaluator() {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SingleDepotVRPEvaluator(this, cloner);
+    }
+    protected SingleDepotVRPEvaluator(SingleDepotVRPEvaluator original, Cloner cloner)
+      : base(original, cloner) {
+    }
+  }
+}

-                      r4374
+                      r4752
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
 …
     public SingleDepotVRPProblemInstance() {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SingleDepotVRPProblemInstance(this, cloner);
+    }
+    protected SingleDepotVRPProblemInstance(SingleDepotVRPProblemInstance original, Cloner cloner)
+      : base(original, cloner) {
+    }
+  }
+}

-                      r4520
+                      r4752
 using HeuristicLab.Problems.VehicleRouting.Variants;
 using HeuristicLab.Problems.VehicleRouting.Encodings;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
 …
       Parameters.Add(new LookupParameter<DoubleValue>("Distance", "The distance."));
       Parameters.Add(new LookupParameter<DoubleValue>("VehiclesUtilized", "The number of vehicles utilized."));
+    }
+    protected VRPEvaluator(VRPEvaluator original, Cloner cloner)
+      : base(original, cloner) {
+    }

r4380	r4752
31	31	using HeuristicLab.Optimization;
32	32	using HeuristicLab.PluginInfrastructure;
	33	using HeuristicLab.Common;
33	34
34	35	namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
…	…
192	193	Parameters.Add(new ValueParameter<IVRPEvaluator>("Evaluator", "The operator which should be used to evaluate VRP solutions.", Evaluator));
193	194	}
	195
	196	protected VRPProblemInstance(VRPProblemInstance original, Cloner cloner)
	197	: base(original, cloner) {
	198	}
194	199	}
195	200	}

Note: See TracChangeset for help on using the changeset viewer.