Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/15/15 15:16:24 (9 years ago)
Author:
mkommend
Message:

#2521: Refactored problem base classes and adapted scheduling encoding, scheduling problem and unit tests.

Location:
branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/HeuristicLab.Problems.Scheduling-3.3.csproj

    r13443 r13469  
    158158      <Private>False</Private>
    159159    </ProjectReference>
    160     <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
    161       <Project>{DDFB14DD-2A85-493C-A52D-E69729BBAEB0}</Project>
    162       <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
    163       <Private>False</Private>
    164     </ProjectReference>
    165160    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    166161      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     
    201196      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    202197      <Name>HeuristicLab.Problems.Instances-3.3</Name>
    203       <Private>False</Private>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    206       <Project>{f4539fb6-4708-40c9-be64-0a1390aea197}</Project>
    207       <Name>HeuristicLab.Random-3.3</Name>
    208198      <Private>False</Private>
    209199    </ProjectReference>
  • branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem new.cs

    r13449 r13469  
    9696
    9797    #region Properties
     98
    9899    public ItemList<Job> JobData {
    99100      get { return JobDataParameter.Value; }
     
    166167
    167168    #region Events
    168     protected override void OnSolutionCreatorChanged() {
    169       //SolutionCreator.ScheduleParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
    170       //InitializeOperators();
    171     }
     169    //protected override void OnSolutionCreatorChanged() {
     170    //SolutionCreator.ScheduleParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
     171    //InitializeOperators();
     172    //}
    172173    protected override void OnEvaluatorChanged() {
    173174      base.OnEvaluatorChanged();
     
    196197    #region Helpers
    197198    private void InitializeOperators() {
    198       Operators.Clear();
    199       ApplyEncoding();
     199      //ApplyEncoding();
    200200      Operators.Add(new BestSchedulingSolutionAnalyzer());
    201201      ParameterizeOperators();
     
    289289          }
    290290        }
    291         BestKnownSolution = JSMDecoder.DecodeSchedule(enc, jobData, JSMDecodingErrorPolicy.RandomPolicy, JSMForcingStrategy.SwapForcing);
     291        BestKnownSolution = JSMDecoder.Decode(enc, jobData, JSMDecodingErrorPolicy.RandomPolicy, JSMForcingStrategy.SwapForcing);
    292292        //if (ScheduleEvaluator is MeanTardinessEvaluator)
    293293        //  BestKnownQuality = MeanTardinessEvaluator.GetMeanTardiness(BestKnownSolution, jobData);
  • branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Plugin.cs.frame

    r13321 r13469  
    3030  [PluginDependency("HeuristicLab.Core", "3.3")]
    3131  [PluginDependency("HeuristicLab.Data", "3.3")]
    32   [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
    3332  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
    3433  [PluginDependency("HeuristicLab.Encodings.ScheduleEncoding", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.