Changeset 15541 for branches/2864_PermutationProblems/HeuristicLab.Problems.PFSP/3.3/PermutationFlowshopSchedulingProblem.cs

Timestamp:

12/19/17 11:10:14 (6 years ago)

Author:

fholzing

Message:

#2864: CleanUp of old code, added LOP benchmark instances

File:

• branches/2864_PermutationProblems/HeuristicLab.Problems.PFSP/3.3/PermutationFlowshopSchedulingProblem.cs (modified) (10 diffs)

branches/2864_PermutationProblems/HeuristicLab.Problems.PFSP/3.3/PermutationFlowshopSchedulingProblem.cs

@@ -97 +97 @@
         }
 
-        // BackwardsCompatibility3.3
-        #region Backwards compatible code, remove with 3.4
-        [Obsolete]
-        [Storable(Name = "operators")]
-        private IEnumerable<IOperator> oldOperators
-        {
-            get { return null; }
-            set
-            {
-                if (value != null && value.Any())
-                    Operators.AddRange(value);
-            }
-        }
-        #endregion
-
         [StorableConstructor]
         private PermutationFlowshopSchedulingProblem(bool deserializing) : base(deserializing) { }
@@ -117 +102 @@
           : base(original, cloner)
         {
-            RegisterEventHandlers();
         }
         public PermutationFlowshopSchedulingProblem()
-          : base(new AwesomeMakeSpanEvaluator(), new RandomPermutationCreator())
+          : base(new CmaxMakeSpanEvaluator(), new RandomPermutationCreator())
         {
             Parameters.Add(new OptionalValueParameter<Permutation>("BestKnownSolution", "The best known solution of this FSSP instance."));
@@ -138 +122 @@
 
             InitializeOperators();
-            RegisterEventHandlers();
         }
 
@@ -147 +130 @@
 
         [StorableHook(HookType.AfterDeserialization)]
-        private void AfterDeserialization()
-        {
-            RegisterEventHandlers();
-        }
-
-        private void RegisterEventHandlers()
-        {
-            SolutionCreator.PermutationParameter.ActualNameChanged += new EventHandler(SolutionCreator_PermutationParameter_ActualNameChanged);
-            Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
-        }
-
-        private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e)
-        {
-            //Nothing to do  ParameterizeAnalyzers();
-        }
-
-        private void SolutionCreator_PermutationParameter_ActualNameChanged(object sender, EventArgs e)
-        {
-            ParameterizeEvaluator();
-            //ParameterizeAnalyzers();
-            ParameterizeOperators();
-        }
-
-        #region Events
-        private void ScheduleEvaluator_QualityParameter_ActualNameChanged(object sender, EventArgs eventArgs)
-        {
-            ParameterizeOperators();
-        }
-
-        private void SolutionCreator_SchedulingEncodingParameter_ActualNameChanged(object sender, EventArgs eventArgs)
-        {
-            ParameterizeOperators();
-        }
-
-        private void ScheduleDecoder_ScheduleParameter_ActualNameChanged(object sender, EventArgs eventArgs)
-        {
-            ParameterizeOperators();
-        }
-        #endregion
+        private void AfterDeserialization() { }
 
         #region Problem Instance Handling
@@ -202 +147 @@
                 if (!permut.Contains(0)) { permut = permut.Select(v => v - 1).ToArray(); }
                 double bestKnownQuality = MakeSpanEvaluator.Apply(
-                    new AwesomeMakeSpanEvaluator(),
+                    new CmaxMakeSpanEvaluator(),
                     new DoubleMatrix(data.ProcessingTimes),
                     new Permutation(PermutationTypes.Absolute, permut)
@@ -213 +158 @@
             ParameterizeSolutionCreator();
         }
-
         public FSSPData Export()
         {
@@ -251 +195 @@
         private void InitializeOperators()
         {
-            var operators = new HashSet<IPermutationOperator>(new IPermutationOperator[] {
-                new OrderCrossover2(),
-                new InversionManipulator(),
-                new StochasticInversionMultiMoveGenerator()
-            }, new TypeEqualityComparer<IPermutationOperator>());
-
-            foreach (var op in ApplicationManager.Manager.GetInstances<IPermutationOperator>())
-                operators.Add(op);
-            Operators.AddRange(operators);
-            Operators.Add(new BestTSPSolutionAnalyzer());
+            Operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
             ParameterizeOperators();
-            UpdateMoveEvaluators();
-        }
-
-
+        }
         private void ParameterizeOperators()
         {
@@ -306 +238 @@
             }
         }
-        #endregion
-
-        private void UpdateMoveEvaluators()
-        {
-            Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
-            foreach (var op in ApplicationManager.Manager.GetInstances<ISingleObjectiveMoveEvaluator>())
-                Operators.Add(op);
-
-            ParameterizeOperators();
-            OnOperatorsChanged();
-        }
-
         private void ParameterizeSolutionCreator()
         {
-            SolutionCreator.LengthParameter.Value = new IntValue(JobMatrix.Columns); //Jobs
+            SolutionCreator.LengthParameter.Value = new IntValue(JobMatrix.Columns);
 
             SolutionCreator.LengthParameter.Hidden = SolutionCreator.LengthParameter.Value != null;
@@ -328 +248 @@
         private void ParameterizeEvaluator()
         {
-            if (Evaluator is AwesomeMakeSpanEvaluator)
+            if (Evaluator is CmaxMakeSpanEvaluator)
             {
                 IMakespanEvaluator evaluator = (IMakespanEvaluator)Evaluator;
@@ -335 +255 @@
             }
         }
+        #endregion
     }
 }