Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/27/11 15:51:15 (13 years ago)
Author:
jhelm
Message:

#1329: Applied some changes to the ScheduleView. Added TaskNr properties to ScheduledTask to make specific selection of tasks in the view possible.

Location:
branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3

    • Property svn:ignore
      •  

        old new  
        11HeuristicLab.Encodings.ScheduleEncoding-3.3.csproj.user
         2Plugin.cs
        23bin
        34obj
  • branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs
  • branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs

    r6475 r6482  
    123123        i++;
    124124
     125      if (!lastScheduledTaskOfJob.ContainsKey(jobNr)) {
     126        lastScheduledTaskOfJob.Add(jobNr, task);
     127        task.TaskNr = 0;
     128      } else {
     129        task.TaskNr = lastScheduledTaskOfJob[jobNr].TaskNr + 1;
     130        lastScheduledTaskOfJob[jobNr] = task;
     131      }
     132
    125133      if (i >= affectedResource.Tasks.Count)
    126134        affectedResource.Tasks.Add(task);
     
    128136        affectedResource.Tasks.Insert(i, task);
    129137
    130       if (!lastScheduledTaskOfJob.ContainsKey(jobNr))
    131         lastScheduledTaskOfJob.Add(jobNr, task);
    132       else
    133         lastScheduledTaskOfJob[jobNr] = task;
    134138    }
    135139
  • branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/ScheduledTask.cs

    r6475 r6482  
    3131    #region Properties
    3232    [Storable]
     33    public int TaskNr { get; set; }
     34    [Storable]
    3335    public int ResourceNr { get; set; }
    3436    [Storable]
     
    4951    protected ScheduledTask(ScheduledTask original, Cloner cloner)
    5052      : base(original, cloner) {
     53      this.TaskNr = original.TaskNr;
    5154      this.ResourceNr = original.ResourceNr;
    5255      this.Duration = original.Duration;
     
    8184
    8285    public static bool AreEqual(ScheduledTask task1, ScheduledTask task2) {
    83       return (task1.Duration == task2.Duration &&
     86      return (
     87        task1.TaskNr == task2.TaskNr &&
     88        task1.Duration == task2.Duration &&
    8489        task1.JobNr == task2.JobNr &&
    8590        task1.ResourceNr == task2.ResourceNr &&
Note: See TracChangeset for help on using the changeset viewer.