Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/06/15 15:33:25 (9 years ago)
Author:
mkommend
Message:

#2521: Added encodings for schedules.

Location:
branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecoder.cs

    r13435 r13437  
    2727using HeuristicLab.Encodings.PermutationEncoding;
    2828using HeuristicLab.Encodings.ScheduleEncoding;
    29 using HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix;
    3029using HeuristicLab.Optimization;
    3130using HeuristicLab.Parameters;
    … …  
    159158
    160159        //STEP 2 - Compute a conflict set of all operations that can be scheduled on the conflicted resource
    161         ItemList<Task> conflictSet = GTAlgorithmUtils.GetConflictSetForTask(minimal, earliestTasksList, jobs, resultingSchedule);
     160        ItemList<Task> conflictSet = GTAlgorithmUtils.GetConflictSetForTask(minimal, earliestTasksList, resultingSchedule);
    162161
    163162        //STEP 3 - Select a task from the conflict set

  • branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/PRVDecoder.cs

    r13435 r13437  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.ScheduleEncoding;
    26 using HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector;
    2726using HeuristicLab.Optimization;
    2827using HeuristicLab.Parameters;
    … …  
    225224
    226225        //STEP 2 - Compute a conflict set of all operations that can be scheduled on the machine the previously selected operation runs on
    227         ItemList<Task> conflictSet = GTAlgorithmUtils.GetConflictSetForTask(minimal, earliestTasksList, jobs, resultingSchedule);
     226        ItemList<Task> conflictSet = GTAlgorithmUtils.GetConflictSetForTask(minimal, earliestTasksList, resultingSchedule);
    228227
    229228        //STEP 3 - Select an operation from the conflict set (various methods depending on how the algorithm should work..)
    230229        //Task selectedTask = SelectTaskFromConflictSet(conflictSet, solution.PriorityRulesVector [currentDecisionIndex++], solution.NrOfRules.Value);
    231         Task selectedTask = SelectTaskFromConflictSet(conflictSet, solution.PriorityRulesVector[minimal.JobNr], solution.NrOfRules.Value, resultingSchedule, jobs);
     230        Task selectedTask = SelectTaskFromConflictSet(conflictSet, solution.PriorityRulesVector[minimal.JobNr], solution.NrOfRules, resultingSchedule, jobs);
    232231
    233232        //STEP 4 - Adding the selected operation to the current schedule

  • branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/Decoders/PWRDecoder.cs

    r13435 r13437  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.ScheduleEncoding;
    26 using HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition;
    2726using HeuristicLab.Optimization;
    2827using HeuristicLab.Parameters;

  • branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/HeuristicLab.Problems.Scheduling-3.3.csproj

    r11623 r13437  
    127127    <Compile Include="Interfaces\IJSSPOperator.cs" />
    128128    <Compile Include="Interfaces\IScheduleDecoder.cs" />
     129    <Compile Include="Interfaces\IScheduleEvaluator.cs" />
    129130    <Compile Include="Interfaces\ISchedulingEvaluator.cs" />
    130     <Compile Include="Interfaces\IScheduleEvaluator.cs" />
     131    <Compile Include="JobShopSchedulingProblem new.cs" />
    131132    <Compile Include="JobShopSchedulingProblem.cs" />
    132133    <Compile Include="Evaluators\SchedulingEvaluator.cs" />
    133     <Compile Include="SchedulingProblem.cs" />
    134134    <Compile Include="Plugin.cs" />
    135135    <Compile Include="Properties\AssemblyInfo.cs" />
     136    <Compile Include="SchedulingProblem.cs" />
    136137  </ItemGroup>
    137138  <ItemGroup>

  • branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

    r13435 r13437  
    2828using HeuristicLab.Encodings.PermutationEncoding;
    2929using HeuristicLab.Encodings.ScheduleEncoding;
    30 using HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix;
    31 using HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition;
    32 using HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector;
    3330using HeuristicLab.Parameters;
    3431using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
Note: See TracChangeset for help on using the changeset viewer.