Changeset 6260 for branches/Scheduling/HeuristicLab.Problems.Scheduling.Views

Timestamp:

05/24/11 09:47:24 (13 years ago)

Author:

jhelm

Message:

#1329: Implemented PermutationWithRepetition Encoding. Implemented new operators for JSM Encoding.

Location:

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3

Files:

• GanttChart.Designer.cs (modified) (1 diff)
• GanttChart.cs (modified) (2 diffs)
• HeuristicLab.Problems.Scheduling.Views-3.3.csproj (modified) (2 diffs)
• JobShopSchedulingProblemView.Designer.cs (modified) (1 diff)
• JobShopSchedulingProblemView.cs (modified) (2 diffs)
• Plugin.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)
• ScheduleView.cs (modified) (3 diffs)

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/GanttChart.Designer.cs

@@ -54 +54 @@
       this.chart.TabIndex = 0;
       this.chart.Text = "chart";
+      this.chart.MouseClick += new System.Windows.Forms.MouseEventHandler(this.chart_MouseClick);
       // 
       // GanttChart

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/GanttChart.cs

@@ -9 +9 @@
   public partial class GanttChart : UserControl {
 
-    private IDictionary<string, Color> categories = new Dictionary<string, Color>();
+    private IDictionary<int, Color> jobColors = new SortedDictionary<int, Color>();
     private IDictionary<string, int> rowNames = new Dictionary<string, int>();
+    
 
     public GanttChart() {
       InitializeComponent();
+      chart.Series[0].YValueType = ChartValueType.Double;
     }
 
-    public void AddCategory(string name, Color color) {
-      if (!categories.ContainsKey(name)) {
-        categories[name] = color;
-        chart.Legends[0].CustomItems.Add(color, name);
+    public void AddJobColor(int jobNr) {
+      if (!jobColors.ContainsKey(jobNr)) {
+        Random r = new Random(jobNr + 1);
+        jobColors[jobNr] = Color.FromArgb (r.Next(256),r.Next(256),r.Next(256));
+        chart.Legends[0].CustomItems.Clear();
+        if (jobColors.Count > 1) {
+          int i = 0;
+          foreach (Color c in jobColors.Values) {
+            chart.Legends[0].CustomItems.Add(c, "Job#" + (i++));
+          }
+        }   
       }
-    }
-
-    public void AddData(string rowName, string category, double start, double end, string tooltip, bool showLabel = true) {
-      AddRowName(rowName);
-      var point = CreateDataPoint(rowNames[rowName], rowName, start, end, showLabel ? category : string.Empty, categories[category]);
-      point.ToolTip = tooltip;
-      chart.Series[0].Points.Add(point);
     }
 
@@ -37 +39 @@
     }
 
-    private static DataPoint CreateDataPoint(double x, string axisLabel, double start, double end, string text, Color color) {
-      var point = new DataPoint(x, new double[] { start, end });
-      point.Color = color;
-      point.Label = text;
-      point.AxisLabel = axisLabel;
-      return point;
+    public void AddData(string rowName, int jobNr, double start, double end, string tooltip, bool showLabel = true) {
+      AddRowName(rowName);
+      var point = new DataPoint(rowNames[rowName], new double[] { start, end });
+      point.Color = jobColors[jobNr];
+      point.AxisLabel = rowName;
+      point.ToolTip = tooltip;
+      chart.Series[0].Points.Add(point);
     }
 
     public void Reset() {
       chart.Series[0].Points.Clear();
-      categories.Clear();
+      jobColors.Clear();
       chart.Legends[0].CustomItems.Clear();
       rowNames.Clear();
     }
+
+    void chart_MouseClick(object sender, MouseEventArgs e) {
+      var pos = e.Location;
+      var results = chart.HitTest(pos.X, pos.Y, false, ChartElementType.DataPoint);
+      foreach (DataPoint dp in chart.Series[0].Points) {
+        Color newColor = Color.FromArgb(255, dp.Color);
+        dp.Color = newColor;
+      }
+      foreach (var result in results) {
+        if (result.ChartElementType == ChartElementType.DataPoint) {
+          Color currentColor = chart.Series[0].Points[result.PointIndex].Color;
+          foreach (DataPoint dp in result.Series.Points) {
+            if (dp.Color != currentColor) {
+              Color newColor = Color.FromArgb(0, dp.Color);
+              dp.Color = newColor;
+            }
+          }
+        }
+      }
+    }
   }
 }

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/HeuristicLab.Problems.Scheduling.Views-3.3.csproj

@@ -32 +32 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
+      <HintPath>..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\bin\Debug\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
+      <HintPath>..\..\HeuristicLab.Problems.DataAnalysis\3.4\bin\Debug\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
+      <HintPath>..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\bin\Debug\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4">
+      <HintPath>..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\bin\Debug\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4">
+      <HintPath>..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\bin\Debug\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Views-3.4">
+      <HintPath>..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\bin\Debug\HeuristicLab.Problems.DataAnalysis.Views-3.4.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -153 +171 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj">
+      <Project>{20831A74-D18F-42D9-A667-1CE3AF53DF93}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.Scheduling\3.3\HeuristicLab.Problems.Scheduling-3.3.csproj">
       <Project>{2BF1D639-1A74-44ED-AAAD-41ECD395AD93}</Project>

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.Designer.cs

@@ -109 +109 @@
       // ganttChart
       // 
+      this.ganttChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.ganttChart.Location = new System.Drawing.Point(0, 3);
       this.ganttChart.Name = "ganttChart";

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.cs

@@ -57 +57 @@
     private void FillGanttChart(JobShopSchedulingProblem content) {
       //Add Jobs as Categories
+      ganttChart.Reset();
       int jobCount = 0;
-      Random random = new Random();
+      Random random = new Random(1);
       foreach (JSSPJob j in content.Jobs) {
         foreach (JSSPTask t in content.Jobs[jobCount].Tasks) {
-          string categoryName = "ScheduleTasks";
-          categoryName = "Job" + t.Job.Index;
-          ganttChart.AddCategory(categoryName, Color.FromArgb(random.Next(255), random.Next(255), random.Next(255)));
+          int categoryNr = t.JobNr.Value;
+          string categoryName = "Job" + categoryNr;
+          ganttChart.AddJobColor(categoryNr);
           ganttChart.AddData(categoryName,
-            categoryName,
+            categoryNr,
             t.StartTime.Value,
             t.EndTime.Value,
-            "Job" + t.Job.Index + " - " + "Task#" + t.TaskNr.Value.ToString(), 
-            false);
+            "Job" + t.JobNr + " - " + "Task#" + t.TaskNr.Value.ToString());
         }
         jobCount++;
@@ -92 +92 @@
           }
 
-          /* TODO: Implement solution-import in problem-class
+
           if (!string.IsNullOrEmpty(spImportDialog.OptimalScheduleFileName))
-            Content.ImportSolution(spImportDialog.OptimalScheduleFileName);
-           * */
+            Content.ImportJSMSolution(spImportDialog.OptimalScheduleFileName);
           OnContentChanged();
         }

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Scheduling.Views {
-  [Plugin("HeuristicLab.Problems.Scheduling.Views", "3.3.3.6121")]
+  [Plugin("HeuristicLab.Problems.Scheduling.Views", "3.3.3.6177")]
   [PluginFile("HeuristicLab.Problems.Scheduling.Views-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabProblemsSchedulingViewsPlugin : PluginBase {

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/Properties/AssemblyInfo.cs

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.0.6121")]
+[assembly: AssemblyFileVersion("3.3.0.6177")]

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/ScheduleView.cs

@@ -40 +40 @@
     }
 
+
+    protected override void DeregisterContentEvents() {
+      Content.QualityChanged -= new EventHandler(Content_QualityChanged);
+      Content.ResourcesChanged -= new EventHandler(Content_ResourcesChanged);
+
+      base.DeregisterContentEvents();
+    }
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.QualityChanged += new EventHandler(Content_QualityChanged);
+      Content.ResourcesChanged += new EventHandler(Content_ResourcesChanged);
+    }
+
+
     public new Schedule Content {
       get { return (Schedule)base.Content; }
@@ -59 +73 @@
 
     private void FillGanttChart(Schedule content) {
-      //Add Resources as Categories
+      ResetGanttChart();
       int resCount = 0;
-      Random random = new Random ();
+      Random random = new Random (1);
       foreach (Resource r in content.Resources) {
         foreach (JSSPTask t in content.Resources[resCount].Tasks) {
+          int categoryNr = 0;      
+          string toolTip = "Task#" + t.TaskNr;
           string categoryName = "ScheduleTasks";
-          string toolTip = "Task#" + t.TaskNr.Value.ToString();
           if (t is JSSPTask) {
-            categoryName = "Job" + ((JSSPTask)t).Job.Index;
+            categoryNr = ((JSSPTask)t).JobNr.Value;
+            categoryName = "Job" + categoryNr;
             toolTip = categoryName + " - " + toolTip;
-          }
-          ganttChart.AddCategory(categoryName, Color.FromArgb(random.Next(255), random.Next(255), random.Next(255)));
+          } 
+          ganttChart.AddJobColor(categoryNr);
           ganttChart.AddData("Resource" + r.Index, 
-            categoryName, 
+            categoryNr, 
             t.StartTime.Value, 
             t.EndTime.Value, 
-            toolTip, 
-            false);
+            toolTip);
         }
         resCount++;
@@ -86 +101 @@
       ganttChart.Enabled = Content != null;
     }
+
+
+    private void Content_QualityChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_QualityChanged), sender, e);
+      else {
+        if (Content == null) {
+          ResetGanttChart();
+        } else {
+          FillGanttChart(Content);
+        }
+      }
+    }
+
+    private void Content_ResourcesChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_ResourcesChanged), sender, e);
+      else {
+        if (Content == null) {
+          ResetGanttChart();
+        } else {
+          FillGanttChart(Content);
+        }
+      }
+    }
   }
 }