Changeset 2656 for trunk/sources/HeuristicLab.Optimizer

Timestamp:

01/20/10 05:10:22 (14 years ago)

Author:

swagner

Message:

Committing first results of the refactoring of HeuristicLab.Core and related plugins (#95)

Location:

trunk/sources/HeuristicLab.Optimizer/3.3

Files:

• FileManager.cs (modified) (10 diffs)
• HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLabOptimizerApplication.cs (modified) (1 diff)
• HeuristicLabOptimizerPlugin.cs (modified) (1 diff)
• MenuItems/OperatorsMenuItem.cs (added)
• MenuItems/SaveAllMenuItem.cs (modified) (1 diff)
• MenuItems/SaveAsMenuItem.cs (modified) (1 diff)
• MenuItems/SaveMenuItem.cs (modified) (1 diff)
• NewItemDialog.cs (modified) (2 diffs)
• OptimizerMainForm.Designer.cs (modified) (1 diff)
• ToolBarItems/SaveAllToolBarItem.cs (modified) (1 diff)
• ToolBarItems/SaveToolBarItem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -32 +32 @@
     #endregion
 
-    private static Dictionary<IItemView, FileInfo> files;
+    private static Dictionary<IObjectView, FileInfo> files;
     private static NewItemDialog newItemDialog;
     private static OpenFileDialog openFileDialog;
@@ -40 +40 @@
 
     static FileManager() {
-      files = new Dictionary<IItemView, FileInfo>();
+      files = new Dictionary<IObjectView, FileInfo>();
       newItemDialog = null;
       openFileDialog = null;
@@ -53 +53 @@
       if (newItemDialog.ShowDialog() == DialogResult.OK) {
         IView view = MainFormManager.CreateDefaultView(newItemDialog.Item);
-        if (view is IItemView) {
+        if (view is IObjectView) {
           view.Caption = "Item" + newDocumentsCounter.ToString() + ".hl";
           newDocumentsCounter++;
@@ -78 +78 @@
 
     public static void Save() {
-      IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
-      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType()))) {
+      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
+      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType()))) {
         Save(activeView);
       }
     }
-    private static void Save(IItemView view) {
+    private static void Save(IObjectView view) {
       if ((!files.ContainsKey(view)) || (!File.Exists(files[view].Filename))) {
         SaveAs(view);
@@ -95 +95 @@
 
     public static void SaveAs() {
-      IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
-      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType()))) {
+      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
+      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType()))) {
         SaveAs(activeView);
       }
     }
-    public static void SaveAs(IItemView view) {
+    public static void SaveAs(IObjectView view) {
       if (saveFileDialog == null) {
         saveFileDialog = new SaveFileDialog();
@@ -131 +131 @@
     public static void SaveAll() {
       var views = from v in MainFormManager.MainForm.Views
-                  where v is IItemView
-                  where CreatableAttribute.IsCreatable(((IItemView)v).Item.GetType())
-                  select v as IItemView;
-
-      foreach (IItemView view in views) {
+                  where v is IObjectView
+                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
+                  select v as IObjectView;
+
+      foreach (IObjectView view in views) {
         Save(view);
       }
@@ -142 +142 @@
     // NOTE: This event is fired by the main form. It is registered in HeuristicLabOptimizerApplication.
     internal static void ViewClosed(object sender, ViewEventArgs e) {
-      IItemView view = e.View as IItemView;
-      files.Remove(view);
+      IObjectView view = e.View as IObjectView;
+      if (view != null) files.Remove(view);
     }
 
@@ -155 +155 @@
     }
 
-    private static void SaveItemAsync(IItemView view, string filename, int compression) {
+    private static void SaveItemAsync(IObjectView view, string filename, int compression) {
       ThreadPool.QueueUserWorkItem(
         new WaitCallback(
@@ -162 +162 @@
               DisableView(view);
               SetWaitingCursor();
-              XmlGenerator.Serialize(view.Item, filename, compression);
+              XmlGenerator.Serialize(view.Object, filename, compression);
               Invoke(delegate() {
                 view.Caption = Path.GetFileName(filename);
@@ -187 +187 @@
               IItem item = (IItem)XmlParser.Deserialize(filename);
               Invoke(delegate() {
-                IItemView view = MainFormManager.CreateDefaultView(item) as IItemView;
+                IObjectView view = MainFormManager.CreateDefaultView(item) as IObjectView;
                 if (view != null) {
                   view.Caption = Path.GetFileName(filename);

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -54 +54 @@
     <Compile Include="MenuItems\CloseMenuItem.cs" />
     <Compile Include="MenuItems\CloseAllMenuItem.cs" />
+    <Compile Include="MenuItems\OperatorsMenuItem.cs" />
     <Compile Include="MenuItems\SaveAllMenuItem.cs" />
     <Compile Include="MenuItems\SaveAsMenuItem.cs" />

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Optimizer {
-  [ClassInfo(Name = "Optimizer 3.3", Description="Next generation heuristic optimization environment.")]
+  [Application("Optimizer 3.3", "Next generation heuristic optimization environment.")]
   internal class HeuristicLabOptimizerApplication : ApplicationBase {
     public override void Run() {

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Optimizer {
-  [ClassInfo(Name = "HeuristicLab.Optimizer-3.3")]
-  [PluginFile(Filename = "HeuristicLab.Optimizer-3.3.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
-  [Dependency(Dependency = "HeuristicLab.Common.Resources-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Core-3.3")]
-  [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
-  [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
-  [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
+  [Plugin("HeuristicLab.Optimizer-3.3")]
+  [PluginFile("HeuristicLab.Optimizer-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Persistence-3.3")]
+  [PluginDependency("HeuristicLab.Common.Resources-3.2")]
+  [PluginDependency("HeuristicLab.Core-3.3")]
+  [PluginDependency("HeuristicLab.Core.Views-3.3")]
+  [PluginDependency("HeuristicLab.MainForm-3.2")]
+  [PluginDependency("HeuristicLab.MainForm.WindowsForms-3.2")]
   public class HeuristicLabOptimizerPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs

@@ -34 +34 @@
     public override void ActiveViewChanged(object sender, EventArgs e) {
       var views = from v in MainFormManager.MainForm.Views
-                  where v is IItemView
-                  where CreatableAttribute.IsCreatable(((IItemView)v).Item.GetType())
+                  where v is IObjectView
+                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
                   select v;
       ToolStripItem.Enabled = views.FirstOrDefault() != null;

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs

@@ -33 +33 @@
     }
     public override void ActiveViewChanged(object sender, EventArgs e) {
-      IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
-      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
+      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs

@@ -36 +36 @@
     }
     public override void ActiveViewChanged(object sender, EventArgs e) {
-      IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
-      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
+      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

@@ -32 +32 @@
         SetListViewDisplayStyleCheckBoxes();
 
-        DiscoveryService ds = new DiscoveryService();
-        var categories = from t in ds.GetTypes(typeof(IItem))
+        var categories = from t in ApplicationManager.Manager.GetTypes(typeof(IItem))
                          where CreatableAttribute.IsCreatable(t)
                          orderby CreatableAttribute.GetCategory(t), ItemAttribute.GetName(t) ascending
@@ -46 +45 @@
             IItem i = (IItem)Activator.CreateInstance(creatable);
             items.Add(i);
-            ListViewItem item = new ListViewItem(new string[] { i.Name, i.Description}, group);
-            itemsListView.SmallImageList.Images.Add(i.Image);
+            ListViewItem item = new ListViewItem(new string[] { i.ItemName, i.ItemDescription}, group);
+            itemsListView.SmallImageList.Images.Add(i.ItemImage);
             item.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
             item.Tag = i;

trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.Designer.cs

@@ -30 +30 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(784, 564);
+      this.ClientSize = new System.Drawing.Size(984, 714);
       this.Name = "OptimizerMainForm";
       this.Text = "HeuristicLab Optimizer";

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs

@@ -31 +31 @@
     public override void ActiveViewChanged(object sender, EventArgs e) {
       var views = from v in MainFormManager.MainForm.Views
-                  where v is IItemView
-                  where CreatableAttribute.IsCreatable(((IItemView)v).Item.GetType())
+                  where v is IObjectView
+                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
                   select v;
       ToolStripItem.Enabled = views.FirstOrDefault() != null;

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs

@@ -30 +30 @@
     }
     public override void ActiveViewChanged(object sender, EventArgs e) {
-      IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
-      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
+      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
     }