Changeset 13456

Timestamp:

12/14/15 13:48:21 (9 years ago)

Author:

abeham

Message:

#2530: merged r13406 to stable (also recording mergeinfo as well for previous commits)

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ALPS (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis.Views (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) (1 prop)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (1 prop)
• HeuristicLab.Data.Views (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.Encodings.BinaryVectorEncoding (modified) (1 prop)
• HeuristicLab.Encodings.IntegerVectorEncoding (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
• HeuristicLab.Encodings.RealVectorEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (1 diff)
• HeuristicLab.Persistence (modified) (1 prop)
• HeuristicLab.Problems.ArtificialAnt (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.GrammaticalEvolution (modified) (1 prop)
• HeuristicLab.Problems.Instances (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.Instances.TSPLIB.Views (modified) (1 prop)
• HeuristicLab.Problems.LawnMower (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment.Views (modified) (1 prop)
• HeuristicLab.Problems.TestFunctions (modified) (1 prop)
• HeuristicLab.Problems.TravelingSalesman.Views (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting.Views (modified) (1 prop)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive.DataAccess (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)

stable/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -883 +883 @@
                 && typeof(EnumValue<>).IsAssignableFrom(m.Key.Value.GetType().GetGenericTypeDefinition())) {
               var valueParam = (IValueParameter)variant.Parameters[m.Key.Name];
-              valueParam.Value = m.Value;
+              dynamic targetEnumValue = valueParam.Value;
+              dynamic sourceEnumValue = m.Value;
+              targetEnumValue.Value = sourceEnumValue.Value;
               variant.Name += m.Key.Name + "=" + m.Value + ", ";
             } else {