Changeset 8886 for trunk/sources/HeuristicLab.Problems.Scheduling

Timestamp:

11/11/12 01:46:34 (12 years ago)

Author:

abeham

Message:

#1329:

• Removed unnecessary DueDates parameter
• Changed ValueParameter to FixedValueParameter for Jobs and Resources
• Made Job and Task INotifyPropertyChanged
• Added a JobView and TaskView

File:

• trunk/sources/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

@@ -79 +79 @@
     }
 
-    public ValueParameter<IntValue> JobsParameter {
-      get { return (ValueParameter<IntValue>)Parameters["Jobs"]; }
-    }
-    public ValueParameter<IntValue> ResourcesParameter {
-      get { return (ValueParameter<IntValue>)Parameters["Resources"]; }
+    public IFixedValueParameter<IntValue> JobsParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Jobs"]; }
+    }
+    public IFixedValueParameter<IntValue> ResourcesParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Resources"]; }
     }
     public ValueParameter<SchedulingEvaluator> SolutionEvaluatorParameter {
       get { return (ValueParameter<SchedulingEvaluator>)Parameters["SolutionEvaluator"]; }
-    }
-    public ValueParameter<BoolValue> DueDatesParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["DueDates"]; }
     }
     #endregion
@@ -102 +99 @@
       set { BestKnownSolutionParameter.Value = value; }
     }
-    public IntValue Jobs {
-      get { return JobsParameter.Value; }
-      set { JobsParameter.Value = value; }
-    }
-    public IntValue Resources {
-      get { return ResourcesParameter.Value; }
-      set { ResourcesParameter.Value = value; }
+    public int Jobs {
+      get { return JobsParameter.Value.Value; }
+      set { JobsParameter.Value.Value = value; }
+    }
+    public int Resources {
+      get { return ResourcesParameter.Value.Value; }
+      set { ResourcesParameter.Value.Value = value; }
     }
     public SchedulingEvaluator SolutionEvaluator {
       get { return SolutionEvaluatorParameter.Value; }
       set { SolutionEvaluatorParameter.Value = value; }
-    }
-    public BoolValue DueDates {
-      get { return DueDatesParameter.Value; }
-      set { DueDatesParameter.Value = value; }
     }
     public override Image ItemImage {
@@ -129 +122 @@
       Parameters.Add(new OptionalValueParameter<Schedule>("BestKnownSolution", "The best known solution of this JSSP instance."));
 
-      Parameters.Add(new ValueParameter<IntValue>("Jobs", "The number of jobs used in this JSSP instance.", new IntValue()));
-      Parameters.Add(new ValueParameter<IntValue>("Resources", "The number of resources used in this JSSP instance.", new IntValue()));
-      Parameters.Add(new ValueParameter<BoolValue>("DueDates", "Determines whether the problem instance uses due dates or not.", new BoolValue()));
+      Parameters.Add(new FixedValueParameter<IntValue>("Jobs", "The number of jobs used in this JSSP instance.", new IntValue()));
+      Parameters.Add(new FixedValueParameter<IntValue>("Resources", "The number of resources used in this JSSP instance.", new IntValue()));
       Parameters.Add(new ValueParameter<SchedulingEvaluator>("SolutionEvaluator", "The evaluator used to determine the quality of a solution.", new MakespanEvaluator()));
 
@@ -183 +175 @@
 
       JobData = jobData;
-      Jobs = new IntValue(data.Jobs);
-      Resources = new IntValue(data.Resources);
-      DueDates = new BoolValue(data.DueDates != null);
+      Jobs = data.Jobs;
+      Resources = data.Resources;
     }
 
@@ -192 +183 @@
         Name = Name,
         Description = Description,
-        Jobs = Jobs.Value,
-        Resources = Resources.Value,
-        ProcessingTimes = new double[Jobs.Value, Resources.Value],
-        Demands = new int[Jobs.Value, Resources.Value],
-        DueDates = (DueDates.Value ? new double[Jobs.Value] : null)
+        Jobs = Jobs,
+        Resources = Resources,
+        ProcessingTimes = new double[Jobs, Resources],
+        Demands = new int[Jobs, Resources],
+        DueDates = new double[Jobs]
       };
 
       foreach (var job in JobData) {
         var counter = 0;
-        if (DueDates.Value) result.DueDates[job.Index] = job.DueDate;
+        result.DueDates[job.Index] = job.DueDate;
         foreach (var task in job.Tasks) {
           result.ProcessingTimes[task.JobNr, counter] = task.Duration;