Changeset 12121

Timestamp:

03/04/15 14:17:09 (9 years ago)

Author:

mkommend

Message:

#2337: Merged r12057, r12059 and r12060 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs (modified) (1 diff)
• HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs (modified) (3 diffs)

stable/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs

@@ -111 +111 @@
     }
 
-    public bool IsBetter(double quality, double bestQuality) {
+    public override bool IsBetter(double quality, double bestQuality) {
       return problem.IsBetter(quality, bestQuality);
     }

stable/HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs

@@ -81 +81 @@
     public string GetCellAsString(int columnIndex, int rowIndex) {
       return ActiveData.GetCellAsString(columnIndex, rowIndex);
-    }
-
-    public IList<T> GetValues<T>(string variableName, bool considerSelection) {
-      return ActiveData.GetValues<T>(variableName, considerSelection);
     }
 

stable/HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs

@@ -35 +35 @@
     string GetCellAsString(int columnIndex, int rowIndex);
 
-    [Obsolete("use the index based variant, is faster")]
-    IList<T> GetValues<T>(string variableName, bool considerSelection = false);
     IList<T> GetValues<T>(int columnIndex, bool considerSelection = false);
 

stable/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

@@ -164 +164 @@
       ScheduleEvaluatorParameter.ValueChanged += ScheduleEvaluatorParameter_ValueChanged;
       ScheduleEvaluator.QualityParameter.ActualNameChanged += ScheduleEvaluator_QualityParameter_ActualNameChanged;
-      SolutionCreatorParameter.ValueChanged += SolutionCreatorParameter_ValueChanged;
       SolutionCreator.ScheduleEncodingParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
       ScheduleDecoderParameter.ValueChanged += ScheduleDecoderParameter_ValueChanged;
@@ -172 +171 @@
     #region Events
     protected override void OnSolutionCreatorChanged() {
+      SolutionCreator.ScheduleEncodingParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
       InitializeOperators();
     }
@@ -185 +185 @@
       ParameterizeOperators();
     }
-    private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs eventArgs) {
-      SolutionCreator.ScheduleEncodingParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
-      ParameterizeOperators();
-    }
+
     private void SolutionCreator_SchedulingEncodingParameter_ActualNameChanged(object sender, EventArgs eventArgs) {
       ParameterizeOperators();