Changeset 14610 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting

Timestamp:

01/26/17 14:12:39 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added abstract base classes for ttp networks/orchestrators
• removed ttp networks/orchestrators from HeuristicLab.Networks.IntegratedOptimization
• runs can now be cleared when preparing OrchestratedAlgorithmNodes

Location:

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3

Files:

• LrpNetwork1.cs (modified) (1 diff)
• LrpOrchestratorNode1.cs (modified) (6 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpNetwork1.cs

@@ -130 +130 @@
     public TimeSpan ExecutionTime { get { return MetaSolver.Algorithm.ExecutionTime; } }
 
-    public void Prepare(bool clearRuns) { Prepare(); }
-    public void Prepare() { Orchestrator.Prepare(); }
-    public void Start() {
-      if (MetaSolver.Algorithm.ExecutionState == ExecutionState.Prepared)
-        Orchestrator.Prepare();
-      Orchestrator.StartAsync();
-    }
+    public void Prepare() { Prepare(false); }
+    public void Prepare(bool clearRuns) { Orchestrator.Prepare(clearRuns); }
+    public void Start() { Orchestrator.StartAsync(); }
     public void Pause() { Orchestrator.Pause(); }
     public void Stop() { Orchestrator.Stop(); }

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode1.cs

@@ -61 +61 @@
     int nrOfDepots, nrOfCustomers;
     [Storable]
-    double[,] depotCoordinates, customerCoordinates;
+    double[,] depotCoordinates = new double[0, 0], customerCoordinates = new double[0, 0];
     [Storable]
     LrpUtils.DistanceType distanceType;
     [Storable]
-    double[] depotCapacities, customerDemands, depotCosts;
+    double[] depotCapacities = new double[0], customerDemands = new double[0], depotCosts = new double[0];
     [Storable]
     double vehicleCapacity, vehicleCost;
@@ -187 +187 @@
       foreach (var m in mutator.Operators)
         mutator.Operators.SetItemCheckedState(m, Regex.IsMatch(m.Name, @"Potvin(One|Two).*"));
-    }
-
-    public override void Prepare() {
+
+      Prepare();
+    }
+
+    public override void Prepare(bool clearRuns = false) {
       Results.Clear();
 
       var metaMsg = MetaSolverOrchestrationPort.PrepareMessage();
-      metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.QualityAdaption);
+      var msgFlags = OrchestrationMessage.Prepare | OrchestrationMessage.SetEvalHook;
+      if (clearRuns) msgFlags |= OrchestrationMessage.ClearRuns;
+      metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(msgFlags);
       var problem = new VariegationProblem();
       problem.Encoding.Length = FlpParameter.Value.Encoding.Length * 2;
@@ -204 +208 @@
       cts = new CancellationTokenSource();
 
-      try {
-        var metaMsg = MetaSolverOrchestrationPort.PrepareMessage();
-        metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Start);
-        MetaSolverOrchestrationPort.SendMessage(metaMsg);
-      } catch (Exception e) { }
+      var metaMsg = MetaSolverOrchestrationPort.PrepareMessage();
+      metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Start);
+      MetaSolverOrchestrationPort.SendMessage(metaMsg);
     }
 
@@ -272 +274 @@
 
       var flpMsg = FlpSolverOrchestrationPort.PrepareMessage();
-      flpMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.Start);
+      flpMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.ClearRuns | OrchestrationMessage.Start);
       flpMsg["Problem"] = flp;
       FlpSolverOrchestrationPort.SendMessage(flpMsg);
@@ -279 +281 @@
       var bestFlpSolution = (IntegerVector)flpResults["Best Solution"].Value;
       var flpSolution = FlpParameter.Value.GetSolution(bestFlpSolution);
-      
+
       var depots = bestFlpSolution.Select((x, i) => Tuple.Create(x, i)).GroupBy(x => x.Item1, x => x.Item2);
       var vrpSolutions = new ResultCollection(depots.Count());
@@ -296 +298 @@
 
         var vrpMsg = VrpSolverOrchestrationPort.PrepareMessage();
-        vrpMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.Start);
+        vrpMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.ClearRuns | OrchestrationMessage.Start);
         vrpMsg["Problem"] = vrp;
         VrpSolverOrchestrationPort.SendMessage(vrpMsg);