Changeset 17359

Timestamp:

11/20/19 15:01:31 (5 years ago)

Author:

abeham

Message:

#2521: fix bugs in unit tests, add vns_tsp sample

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
@@ -54 +54 @@
 
     [StorableConstructor]
-    private Schedule(StorableConstructorFlag _) : base(_) { }
+    protected Schedule(StorableConstructorFlag _) : base(_) { }
     private Schedule(Schedule original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -138 +138 @@
       var standardProblems = new List<string> { "ALPSGA_TSP", "ES_Griewank", "OSES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
                 "IslandGA_TSP", "PSO_Rastrigin",
-                "SGP_SantaFe", "GP_Multiplexer", "SGP_Robocode", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP"
+                "SGP_SantaFe", "GP_Multiplexer", "SGP_Robocode", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP", "VNS_TSP"
         };
       groupLookup[standardProblemsGroup] = standardProblems;

branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Problems.TravelingSalesman;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -48 +48 @@
         typeof (HeuristicLab.Problems.DataAnalysis.ClassificationEnsembleSolution),
         typeof (HeuristicLab.Problems.DataAnalysis.RegressionEnsembleSolution),
-        typeof (HeuristicLab.Problems.Orienteering.DistanceMatrix)
+        typeof (HeuristicLab.Problems.Orienteering.DistanceMatrix),
+        typeof (HeuristicLab.Problems.TravelingSalesman.EuclideanTSPData),
       };
       excludedTypes.Add(typeof(SymbolicExpressionGrammar).Assembly.GetType("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.EmptySymbolicExpressionTreeGrammar"));
-
-      foreach (var tspData in ApplicationManager.Manager.GetTypes(typeof(ITSPData)))
-        excludedTypes.Add(tspData);
 
       foreach (var symbolType in ApplicationManager.Manager.GetTypes(typeof(Symbol)))
@@ -129 +127 @@
 
       foreach (object o in intersections) {
+        // check if the object is an immutable value, array, or matrix
+        if (o is IStringConvertibleMatrix m && m.ReadOnly
+          || o is IStringConvertibleValue v && v.ReadOnly
+          || o is IStringConvertibleArray a && a.ReadOnly) {
+          continue;
+        }
         string typeName = o.GetType().FullName;
         if (excludedTypes.Contains(o.GetType())) {