Changeset 13667

Timestamp:

03/08/16 15:33:39 (8 years ago)

Author:

abeham

Message:

#2457: worked on expert system, created new application, merged trunk change of r13666

Location:

branches/PerformanceComparison

Files:

• . (modified) (1 prop)
• Build.cmd (added)
• Clean.cmd (added)
• HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/AdaptiveWalkCalculator.cs (modified) (1 diff)
• HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/RandomWalkCalculator.cs (modified) (1 diff)
• HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/UpDownWalkCalculator.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ICharacteristicCalculatorView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/ICharacteristicCalculatorView.Designer.cs)
• HeuristicLab.Optimization.Views/3.3/ICharacteristicCalculatorView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/ICharacteristicCalculatorView.cs)
• HeuristicLab.OptimizationExpertSystem (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views)
• HeuristicLab.OptimizationExpertSystem.Common (copied) (copied from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/ExpertSystem.cs (modified) (2 diffs)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/CharacteristicCalculator.cs (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/DoubleMatrixCharacteristicCalculator.cs (modified) (2 diffs)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/QAP/QAPCharacteristicCalculator.cs (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem.Common/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.Designer.cs (modified) (1 diff)
• HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.cs (modified) (2 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj (copied) (copied from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/HeuristicLab.OptimizationExpertSystem.Views-3.3.csproj) (5 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj.DotSettings (added)
• HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj.user (added)
• HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem.Views-3.3.csproj (deleted)
• HeuristicLab.OptimizationExpertSystem/3.3/Interfaces (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Interfaces/IOptimizationExpertSystemUi.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/OptimizationExpertSystem.Designer.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/OptimizationExpertSystem.cs (added)
• HeuristicLab.OptimizationExpertSystem/3.3/OptimizationExpertSystem.resx (added)
• HeuristicLab.OptimizationExpertSystem/3.3/Plugin.cs.frame (modified) (3 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• PerformanceComparison.sln (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/AdaptiveWalkCalculator.cs

@@ -67 +67 @@
         "Diversity", "Regularity", "TotalEntropy", "PeakInformationContent",
         "PeakDensityBasinInformation" }.Select(x => new StringValue(x)));
+      characteristics.SetItemCheckedState(1, false);
+      characteristics.SetItemCheckedState(5, false);
     }
 

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/RandomWalkCalculator.cs

@@ -67 +67 @@
         "Diversity", "Regularity", "TotalEntropy", "PeakInformationContent",
         "PeakDensityBasinInformation" }.Select(x => new StringValue(x)));
+      characteristics.SetItemCheckedState(1, false);
+      characteristics.SetItemCheckedState(5, false);
     }
 

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/UpDownWalkCalculator.cs

@@ -68 +68 @@
         "PeakDensityBasinInformation", "DownWalkLength", "UpWalkLength", "UpWalkLenVar",
         "DownWalkLenVar", "LowerVariance", "UpperVariance" }.Select(x => new StringValue(x)));
+      characteristics.SetItemCheckedState(1, false);
+      characteristics.SetItemCheckedState(5, false);
+      characteristics.SetItemCheckedState(15, false);
+      characteristics.SetItemCheckedState(16, false);
     }
 

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -228 +228 @@
       <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="ICharacteristicCalculatorView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ICharacteristicCalculatorView.Designer.cs">
+      <DependentUpon>ICharacteristicCalculatorView.cs</DependentUpon>
+    </Compile>
     <Compile Include="IRRestarterView.cs">
       <SubType>UserControl</SubType>

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ExpertSystem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -361 +361 @@
     };
 
-    public async void StartAlgorithmAsync(int index) {
+    public void StartAlgorithmAsync(int index) {
       var selectedInstance = suggestedInstances[index];
       var algorithm = (IAlgorithm)selectedInstance.Clone();

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Plugin.cs.frame

@@ -37 +37 @@
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  public class HeuristicLabOptimizationExpertSystemPlugin : PluginBase {
+  public class HeuristicLabOptimizationExpertSystemCommonPlugin : PluginBase {
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/CharacteristicCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/DoubleMatrixCharacteristicCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
+using HeuristicLab.Data;
 using System;
 using System.Linq;
-using HeuristicLab.Common;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.CharacteristicAnalysis {

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/QAP/QAPCharacteristicCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Properties/AssemblyInfo.cs.frame

@@ -6 +6 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.OptimizationExpertSystem")]
+[assembly: AssemblyTitle("HeuristicLab.OptimizationExpertSystem.Common")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.OptimizationExpertSystem.Views {
+namespace HeuristicLab.OptimizationExpertSystem {
   partial class ExpertSystemView {
     /// <summary> 

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.cs

@@ -29 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Views;
+using HeuristicLab.OptimizationExpertSystem.Common;
 using System;
 using System.Collections.Generic;
@@ -37 +38 @@
 using System.Windows.Forms.DataVisualization.Charting;
 
-namespace HeuristicLab.OptimizationExpertSystem.Views {
+namespace HeuristicLab.OptimizationExpertSystem {
   [View("Expert-system Optimizer View")]
   [Content(typeof(ExpertSystem), IsDefaultView = true)]

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj

@@ -8 +8 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.OptimizationExpertSystem.Views</RootNamespace>
-    <AssemblyName>HeuristicLab.OptimizationExpertSystem.Views-3.3</AssemblyName>
+    <RootNamespace>HeuristicLab.OptimizationExpertSystem</RootNamespace>
+    <AssemblyName>HeuristicLab.OptimizationExpertSystem-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -76 +76 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Clients.Access-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.Access-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -167 +172 @@
       <DependentUpon>ExpertSystemView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Interfaces\IOptimizationExpertSystemUi.cs" />
+    <Compile Include="OptimizationExpertSystem.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OptimizationExpertSystem.Designer.cs">
+      <DependentUpon>OptimizationExpertSystem.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
@@ -191 +203 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.OptimizationExpertSystem\3.3\HeuristicLab.OptimizationExpertSystem-3.3.csproj">
+    <ProjectReference Include="..\..\HeuristicLab.OptimizationExpertSystem.Common\3.3\HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj">
       <Project>{492cc257-e27c-4497-b2c1-09c45310c91c}</Project>
-      <Name>HeuristicLab.OptimizationExpertSystem-3.3</Name>
+      <Name>HeuristicLab.OptimizationExpertSystem.Common-3.3</Name>
       <Private>False</Private>
     </ProjectReference>
@@ -205 +217 @@
     <EmbeddedResource Include="ExpertSystemView.resx">
       <DependentUpon>ExpertSystemView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="OptimizationExpertSystem.resx">
+      <DependentUpon>OptimizationExpertSystem.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
+using System.Windows.Forms;
+using HeuristicLab.Clients.Access;
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.OptimizationExpertSystem.Views {
+namespace HeuristicLab.OptimizationExpertSystem {
   /// <summary>
-  /// Plugin class for HeuristicLab.OptimizationExpertSystem.Views plugin.
+  /// Plugin class for HeuristicLab.OptimizationExpertSystem plugin.
   /// </summary>
-  [Plugin("HeuristicLab.OptimizationExpertSystem.Views", "3.3.12.$WCREV$")]
-  [PluginFile("HeuristicLab.OptimizationExpertSystem.Views-3.3.dll", PluginFileType.Assembly)]
+  [Plugin("HeuristicLab.OptimizationExpertSystem", "3.3.12.$WCREV$")]
+  [PluginFile("HeuristicLab.OptimizationExpertSystem-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
@@ -36 +38 @@
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
-  [PluginDependency("HeuristicLab.OptimizationExpertSystem", "3.3")]
+  [PluginDependency("HeuristicLab.OptimizationExpertSystem.Common", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  public class HeuristicLabOptimizationExpertSystemViewsPlugin : PluginBase {
+  public class HeuristicLabOptimizationExpertSystemPlugin : PluginBase {
+  }
+
+  [Application("Optimization Expert System", "HeuristicLab Optimization Expert System 3.3.13.$WCREV$")]
+  internal class HeuristicLabOptimizationExpertSystemApplication : ApplicationBase {
+    public override void Run(ICommandLineArgument[] args) {
+      HeuristicLab.MainForm.WindowsForms.MainForm mainForm = new OptimizationExpertSystem(typeof(IOptimizationExpertSystemUi));
+      
+      ClientInformation.InitializeAsync();
+      UserInformation.InitializeAsync();
+
+      mainForm.ShowContentInViewHost = true;
+      Application.Run(mainForm);
+    }
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Properties/AssemblyInfo.cs.frame

@@ -6 +6 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.OptimizationExpertSystem.Views")]
+[assembly: AssemblyTitle("HeuristicLab.OptimizationExpertSystem")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/PerformanceComparison/PerformanceComparison.sln

@@ -12 +12 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization.Views-3.3", "HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj", "{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OptimizationExpertSystem-3.3", "HeuristicLab.OptimizationExpertSystem\3.3\HeuristicLab.OptimizationExpertSystem-3.3.csproj", "{492CC257-E27C-4497-B2C1-09C45310C91C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OptimizationExpertSystem-3.3", "HeuristicLab.OptimizationExpertSystem.Common\3.3\HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj", "{492CC257-E27C-4497-B2C1-09C45310C91C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OptimizationExpertSystem.Views-3.3", "HeuristicLab.OptimizationExpertSystem.Views\3.3\HeuristicLab.OptimizationExpertSystem.Views-3.3.csproj", "{6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OptimizationExpertSystem.Views-3.3", "HeuristicLab.OptimizationExpertSystem.\3.3\HeuristicLab.OptimizationExpertSystem-3.3.csproj", "{6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis.FitnessLandscape-3.3", "HeuristicLab.Analysis.FitnessLandscape\3.3\HeuristicLab.Analysis.FitnessLandscape-3.3.csproj", "{5FBDCD4A-3C2A-4EC6-83CE-34B29F43621A}"