Changeset 17694

Timestamp:

07/23/20 14:18:19 (4 years ago)

Author:

abeham

Message:

#2521: fixed encoding change of JSSP, added tostring and itemimage change to ValueChanged event of ReferenceParameter

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Parameters/3.3/ReferenceParameter.cs (modified) (4 diffs)
• HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ReferenceParameter.cs

@@ -110 +110 @@
     }
 
+    // TODO: Remove
+    //protected void ChangeReference(IValueParameter newReference, bool retainData) {
+    //  IItem oldValue = Value;
+    //  var oldRef = ReferencedParameter;
+    //  oldRef.ToStringChanged -= (o, e) => OnToStringChanged();
+    //  oldRef.ItemImageChanged -= (o, e) => OnItemImageChanged();
+    //  if (valueChanged != null) oldRef.ValueChanged -= OnReferencedParameterValueChanged;
+    //  newReference.ToStringChanged += (o, e) => OnToStringChanged();
+    //  newReference.ItemImageChanged += (o, e) => OnItemImageChanged();
+    //  if (valueChanged != null) newReference.ValueChanged += OnReferencedParameterValueChanged;
+    //  ReferencedParameter = newReference;
+    //  oldRef.Value = (IItem)oldValue.Clone(); // This is problematic, e.g. FixedValueParameter !!! But necessary, otherwise the value holds reference to the old parameter
+    //  if (retainData) Value = oldValue;
+    //}
+
 
     #region event handlers
@@ -128 +143 @@
     private void OnReferencedParameterValueChanged(object sender, EventArgs args) {
       valueChanged?.Invoke(this, args); // note "this", not "sender" as sender would be the referenced parameter
+      OnItemImageChanged();
+      OnToStringChanged();
     }
 
@@ -166 +183 @@
       return new ReferenceParameter<T>(this, cloner);
     }
+
+    // TODO: Remove
+    //public void ChangeReference(IValueParameter<T> newParameter, bool retainData) {
+    //  base.ChangeReference(newParameter, retainData);
+    //}
   }
 
@@ -193 +215 @@
       return new ReferenceParameter<T, U>(this, cloner);
     }
+
+    // TODO: Remove
+    //public void ChangeReference(IValueParameter<U> newParameter, bool retainData) {
+    //  base.ChangeReference(newParameter, retainData);
+    //}
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

@@ -21 +21 @@
 
 using System;
-using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
@@ -187 +186 @@
     protected override void OnEncodingChanged() {
       base.OnEncodingChanged();
+      var jobData = (ItemList<Job>)JobData.Clone();
+      var jobs = Jobs;
+      var resources = Resources;
       Parameters.Remove(JobDataParameter);
       Parameters.Add(JobDataParameter = new ReferenceParameter<ItemList<Job>>("JobData", "Jobdata defining the precedence relationships and the duration of the tasks in this JSSP-Instance.", Encoding.JobDataParameter));
@@ -193 +195 @@
       Parameters.Remove(ResourcesParameter);
       Parameters.Add(ResourcesParameter = new ReferenceParameter<IntValue>("Resources", "The number of resources used in this JSSP instance.", Encoding.ResourcesParameter));
+      JobData = jobData;
+      Jobs = jobs;
+      Resources = resources;
+
+      RegisterEventHandlers();
     }
 
 
     private void RegisterEventHandlers() {
-      JobDataParameter.ValueChanged += JobDataParameterOnValueChanged;
-      JobData.PropertyChanged += JobDataOnPropertyChanged;
-    }
-
-    private void JobDataParameterOnValueChanged(object sender, EventArgs e) {
-      JobData.PropertyChanged += JobDataOnPropertyChanged;
+      ItemListParameterChangeHandler<Job>.Create(JobDataParameter, JobDataOnChanged);
+    }
+
+    private void JobDataOnChanged() {
       Jobs = JobData.Count;
-    }
-
-    private void JobDataOnPropertyChanged(object sender, PropertyChangedEventArgs e) {
-      if (e.PropertyName == nameof(JobData.Count)) {
-        Jobs = JobData.Count;
-      }
-    }
+      Resources = JobData.SelectMany(x => x.Tasks).Select(x => x.ResourceNr).Distinct().Count();
+    }
+
 
     #region Problem Instance Handling