Changeset 2501

Timestamp:

11/17/09 01:05:46 (14 years ago)

Author:

swagner

Message:

Worked on Optimizer (#770)

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (1 diff)
• HeuristicLab 3.3/CopyAssemblies.cmd (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/IOptimizerUserInterfaceItemProvider.cs (added)

trunk/sources/HeuristicLab 3.3.sln

@@ -26 +26 @@
     {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} = {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}
     {DA0D505A-2149-4E3C-B220-5724DE26EB59} = {DA0D505A-2149-4E3C-B220-5724DE26EB59}
+    {C664305E-497C-4533-A140-967DEDB05C19} = {C664305E-497C-4533-A140-967DEDB05C19}
     {DC3D7072-7999-4719-B65D-3997744D5DC1} = {DC3D7072-7999-4719-B65D-3997744D5DC1}
     {81609E8A-9757-4865-8B89-0B6603F769E8} = {81609E8A-9757-4865-8B89-0B6603F769E8}

trunk/sources/HeuristicLab 3.3/CopyAssemblies.cmd

@@ -29 +29 @@
 copy "%SolutionDir%\HeuristicLab.Operators.Programmable\3.3\%Outdir%\HeuristicLab.Operators.Programmable-3.3.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.OptimizationFrontend\3.3\%Outdir%\HeuristicLab.OptimizationFrontend-3.3.dll" .\plugins
+copy "%SolutionDir%\HeuristicLab.Optimizer\3.3\%Outdir%\HeuristicLab.Optimizer-3.3.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Permutation\3.3\%Outdir%\HeuristicLab.Permutation-3.3.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll" .\plugins

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

@@ -39 +39 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq">
@@ -52 +53 @@
     <Compile Include="HeuristicLabOptimizerApplication.cs" />
     <Compile Include="HeuristicLabOptimizerPlugin.cs" />
+    <Compile Include="IOptimizerUserInterfaceItemProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -59 +61 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
       <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
+      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
+      <Name>HeuristicLab.MainForm-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Common.Resources;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Optimizer {
@@ -30 +33 @@
   class HeuristicLabOptimizerApplication : ApplicationBase {
     public override void Run() {
-      //Form mainForm = new MainForm();
-      //PluginManager.ControlManager = (IControlManager)mainForm;
-      //Application.Run(mainForm);
+      DockingMainForm mainForm = new DockingMainForm(typeof(IOptimizerUserInterfaceItemProvider));
+      mainForm.Title = "HeuristicLab Optimizer " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
+      mainForm.Icon = Resources.HeuristicLabIcon;
+      Application.Run(mainForm);
     }
   }

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

@@ -28 +28 @@
   [ClassInfo(Name = "HeuristicLab.Optimizer-3.3")]
   [PluginFile(Filename = "HeuristicLab.Optimizer-3.3.dll", Filetype = PluginFileType.Assembly)]
+  [Dependency(Dependency = "HeuristicLab.Common.Resources-3.2")]
+  [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
   [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
   public class HeuristicLabOptimizerPlugin : PluginBase {