Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12121


Ignore:
Timestamp:
03/04/15 14:17:09 (8 years ago)
Author:
mkommend
Message:

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

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable

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

    r12009 r12121  
    111111    }
    112112
    113     public bool IsBetter(double quality, double bestQuality) {
     113    public override bool IsBetter(double quality, double bestQuality) {
    114114      return problem.IsBetter(quality, bestQuality);
    115115    }
  • stable/HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs

    r11159 r12121  
    8181    public string GetCellAsString(int columnIndex, int rowIndex) {
    8282      return ActiveData.GetCellAsString(columnIndex, rowIndex);
    83     }
    84 
    85     public IList<T> GetValues<T>(string variableName, bool considerSelection) {
    86       return ActiveData.GetValues<T>(variableName, considerSelection);
    8783    }
    8884
  • stable/HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs

    r12009 r12121  
    3535    string GetCellAsString(int columnIndex, int rowIndex);
    3636
    37     [Obsolete("use the index based variant, is faster")]
    38     IList<T> GetValues<T>(string variableName, bool considerSelection = false);
    3937    IList<T> GetValues<T>(int columnIndex, bool considerSelection = false);
    4038
  • stable/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

    r12009 r12121  
    164164      ScheduleEvaluatorParameter.ValueChanged += ScheduleEvaluatorParameter_ValueChanged;
    165165      ScheduleEvaluator.QualityParameter.ActualNameChanged += ScheduleEvaluator_QualityParameter_ActualNameChanged;
    166       SolutionCreatorParameter.ValueChanged += SolutionCreatorParameter_ValueChanged;
    167166      SolutionCreator.ScheduleEncodingParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
    168167      ScheduleDecoderParameter.ValueChanged += ScheduleDecoderParameter_ValueChanged;
     
    172171    #region Events
    173172    protected override void OnSolutionCreatorChanged() {
     173      SolutionCreator.ScheduleEncodingParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
    174174      InitializeOperators();
    175175    }
     
    185185      ParameterizeOperators();
    186186    }
    187     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs eventArgs) {
    188       SolutionCreator.ScheduleEncodingParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
    189       ParameterizeOperators();
    190     }
     187
    191188    private void SolutionCreator_SchedulingEncodingParameter_ActualNameChanged(object sender, EventArgs eventArgs) {
    192189      ParameterizeOperators();
Note: See TracChangeset for help on using the changeset viewer.