Changeset 6266 for branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Analyzers

Timestamp:

05/24/11 16:20:04 (14 years ago)

Author:

jhelm

Message:

#1329: Did some heavy refactoring.

Location:

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

Files:

• . (modified) (1 prop)
• Analyzers/BestSchedulingSolutionAnalyzer.cs (modified) (4 diffs)
• Analyzers/SchedulingAnalyzer.cs (added)

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

@@ -1 +1 @@
 Plugin.cs
+bin
+obj

@@ -1 +1 @@
 Plugin.cs
+bin
+obj

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Analyzers/BestSchedulingSolutionAnalyzer.cs

@@ -36 +36 @@
   [Item("BestSchedulingSolutionAnalyzer", "An operator for analyzing the best solution of Scheduling Problems given in schedule-representation.")]
   [StorableClass]
-  public sealed class BestSchedulingSolutionAnalyzer : JSSPOperator, IAnalyzer, IStochasticOperator {
+  public sealed class BestSchedulingSolutionAnalyzer : SchedulingAnalyzer, IStochasticOperator {
     [StorableConstructor]
     private BestSchedulingSolutionAnalyzer(bool deserializing) : base(deserializing) { }
@@ -46 +46 @@
     }
 
-
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
@@ -54 +53 @@
     }
 
-
-    public LookupParameter<BoolValue> MaximizationParameter {
-      get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }
-    }
-    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
-      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
-    }
-    public LookupParameter<Schedule> BestSolutionParameter {
-      get { return (LookupParameter<Schedule>)Parameters["BestSolution"]; }
-    }
-    public ValueLookupParameter<ResultCollection> ResultsParameter {
-      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
-    }
-    public LookupParameter<DoubleValue> BestKnownQualityParameter {
-      get { return (LookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
-    }
-    public LookupParameter<Schedule> BestKnownSolutionParameter {
-      get { return (LookupParameter<Schedule>)Parameters["BestKnownSolution"]; }
-    }
-    public ScopeTreeLookupParameter<Schedule> SchedulingSolutionParameter {
-      get { return (ScopeTreeLookupParameter<Schedule>)Parameters["DecodedSchedulingSolution"]; }
+    public BestSchedulingSolutionAnalyzer () : base () {
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
     }
 
-
-
-    public BestSchedulingSolutionAnalyzer () {
-      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
-
-      Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem."));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the JSSP solutions which should be analyzed."));
-      Parameters.Add(new ScopeTreeLookupParameter<Schedule>("DecodedSchedulingSolution", "The solutions from which the best solution has to be chosen from."));
-      Parameters.Add(new LookupParameter<Schedule>("BestSolution", "The best JSSP solution."));
-      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best JSSP solution should be stored."));
-      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this JSSP instance."));
-      Parameters.Add(new LookupParameter<Schedule>("BestKnownSolution", "The best known solution of this JSSP instance."));
-    }
-
-
     public override IOperation Apply() {
-      ItemList<JSSPJob> jobs = Jobs;
       ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
       ItemArray<Schedule> solutions = SchedulingSolutionParameter.ActualValue;
@@ -128 +92 @@
       return base.Apply();
     }
-
   }
 }

@@ -1 +1 @@
 Plugin.cs
+bin
+obj