Changeset 17359 for branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

Timestamp:

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

Author:

abeham

Message:

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

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs (modified) (3 diffs)

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())) {