Changeset 13667


Ignore:
Timestamp:
03/08/16 15:33:39 (5 years ago)
Author:
abeham
Message:

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

Location:
branches/PerformanceComparison
Files:
9 added
1 deleted
17 edited
4 copied
1 moved

Legend:

Unmodified
Added
Removed
  • branches/PerformanceComparison

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

    r13594 r13667  
    6767        "Diversity", "Regularity", "TotalEntropy", "PeakInformationContent",
    6868        "PeakDensityBasinInformation" }.Select(x => new StringValue(x)));
     69      characteristics.SetItemCheckedState(1, false);
     70      characteristics.SetItemCheckedState(5, false);
    6971    }
    7072
  • branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/RandomWalkCalculator.cs

    r13594 r13667  
    6767        "Diversity", "Regularity", "TotalEntropy", "PeakInformationContent",
    6868        "PeakDensityBasinInformation" }.Select(x => new StringValue(x)));
     69      characteristics.SetItemCheckedState(1, false);
     70      characteristics.SetItemCheckedState(5, false);
    6971    }
    7072
  • branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/UpDownWalkCalculator.cs

    r13594 r13667  
    6868        "PeakDensityBasinInformation", "DownWalkLength", "UpWalkLength", "UpWalkLenVar",
    6969        "DownWalkLenVar", "LowerVariance", "UpperVariance" }.Select(x => new StringValue(x)));
     70      characteristics.SetItemCheckedState(1, false);
     71      characteristics.SetItemCheckedState(5, false);
     72      characteristics.SetItemCheckedState(15, false);
     73      characteristics.SetItemCheckedState(16, false);
    7074    }
    7175
  • branches/PerformanceComparison/HeuristicLab.Optimization.Views

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

    r13475 r13667  
    228228      <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
    229229    </Compile>
     230    <Compile Include="ICharacteristicCalculatorView.cs">
     231      <SubType>UserControl</SubType>
     232    </Compile>
     233    <Compile Include="ICharacteristicCalculatorView.Designer.cs">
     234      <DependentUpon>ICharacteristicCalculatorView.cs</DependentUpon>
     235    </Compile>
    230236    <Compile Include="IRRestarterView.cs">
    231237      <SubType>UserControl</SubType>
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ExpertSystem.cs

    r13663 r13667  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    361361    };
    362362
    363     public async void StartAlgorithmAsync(int index) {
     363    public void StartAlgorithmAsync(int index) {
    364364      var selectedInstance = suggestedInstances[index];
    365365      var algorithm = (IAlgorithm)selectedInstance.Clone();
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Plugin.cs.frame

    r13663 r13667  
    3737  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3838  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    39   public class HeuristicLabOptimizationExpertSystemPlugin : PluginBase {
     39  public class HeuristicLabOptimizationExpertSystemCommonPlugin : PluginBase {
    4040  }
    4141}
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/CharacteristicCalculator.cs

    r13594 r13667  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/DoubleMatrixCharacteristicCalculator.cs

    r13551 r13667  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
     22using HeuristicLab.Common;
     23using HeuristicLab.Data;
    2224using System;
    2325using System.Linq;
    24 using HeuristicLab.Common;
    25 using HeuristicLab.Data;
    2626
    2727namespace HeuristicLab.Problems.CharacteristicAnalysis {
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis/QAP/QAPCharacteristicCalculator.cs

    r13594 r13667  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Properties/AssemblyInfo.cs.frame

    r12842 r13667  
    66// set of attributes. Change these attribute values to modify the information
    77// associated with an assembly.
    8 [assembly: AssemblyTitle("HeuristicLab.OptimizationExpertSystem")]
     8[assembly: AssemblyTitle("HeuristicLab.OptimizationExpertSystem.Common")]
    99[assembly: AssemblyDescription("")]
    1010[assembly: AssemblyConfiguration("")]
    1111[assembly: AssemblyCompany("HEAL")]
    1212[assembly: AssemblyProduct("HeuristicLab")]
    13 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
     13[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
    1414[assembly: AssemblyTrademark("")]
    1515[assembly: AssemblyCulture("")]
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.Designer.cs

    r13663 r13667  
    2020#endregion
    2121
    22 namespace HeuristicLab.OptimizationExpertSystem.Views {
     22namespace HeuristicLab.OptimizationExpertSystem {
    2323  partial class ExpertSystemView {
    2424    /// <summary>
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemView.cs

    r13663 r13667  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Optimization.Views;
     31using HeuristicLab.OptimizationExpertSystem.Common;
    3132using System;
    3233using System.Collections.Generic;
     
    3738using System.Windows.Forms.DataVisualization.Charting;
    3839
    39 namespace HeuristicLab.OptimizationExpertSystem.Views {
     40namespace HeuristicLab.OptimizationExpertSystem {
    4041  [View("Expert-system Optimizer View")]
    4142  [Content(typeof(ExpertSystem), IsDefaultView = true)]
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj

    r13666 r13667  
    88    <OutputType>Library</OutputType>
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    10     <RootNamespace>HeuristicLab.OptimizationExpertSystem.Views</RootNamespace>
    11     <AssemblyName>HeuristicLab.OptimizationExpertSystem.Views-3.3</AssemblyName>
     10    <RootNamespace>HeuristicLab.OptimizationExpertSystem</RootNamespace>
     11    <AssemblyName>HeuristicLab.OptimizationExpertSystem-3.3</AssemblyName>
    1212    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     
    7676      <SpecificVersion>False</SpecificVersion>
    7777      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
     78      <Private>False</Private>
     79    </Reference>
     80    <Reference Include="HeuristicLab.Clients.Access-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     81      <SpecificVersion>False</SpecificVersion>
     82      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.Access-3.3.dll</HintPath>
    7883      <Private>False</Private>
    7984    </Reference>
     
    167172      <DependentUpon>ExpertSystemView.cs</DependentUpon>
    168173    </Compile>
     174    <Compile Include="Interfaces\IOptimizationExpertSystemUi.cs" />
     175    <Compile Include="OptimizationExpertSystem.cs">
     176      <SubType>Form</SubType>
     177    </Compile>
     178    <Compile Include="OptimizationExpertSystem.Designer.cs">
     179      <DependentUpon>OptimizationExpertSystem.cs</DependentUpon>
     180    </Compile>
    169181    <Compile Include="Plugin.cs" />
    170182    <None Include="Properties\AssemblyInfo.cs.frame" />
     
    191203      <Private>False</Private>
    192204    </ProjectReference>
    193     <ProjectReference Include="..\..\HeuristicLab.OptimizationExpertSystem\3.3\HeuristicLab.OptimizationExpertSystem-3.3.csproj">
     205    <ProjectReference Include="..\..\HeuristicLab.OptimizationExpertSystem.Common\3.3\HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj">
    194206      <Project>{492cc257-e27c-4497-b2c1-09c45310c91c}</Project>
    195       <Name>HeuristicLab.OptimizationExpertSystem-3.3</Name>
     207      <Name>HeuristicLab.OptimizationExpertSystem.Common-3.3</Name>
    196208      <Private>False</Private>
    197209    </ProjectReference>
     
    205217    <EmbeddedResource Include="ExpertSystemView.resx">
    206218      <DependentUpon>ExpertSystemView.cs</DependentUpon>
     219    </EmbeddedResource>
     220    <EmbeddedResource Include="OptimizationExpertSystem.resx">
     221      <DependentUpon>OptimizationExpertSystem.cs</DependentUpon>
    207222    </EmbeddedResource>
    208223  </ItemGroup>
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Plugin.cs.frame

    r12847 r13667  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
     22using System.Windows.Forms;
     23using HeuristicLab.Clients.Access;
    2224using HeuristicLab.PluginInfrastructure;
    2325
    24 namespace HeuristicLab.OptimizationExpertSystem.Views {
     26namespace HeuristicLab.OptimizationExpertSystem {
    2527  /// <summary>
    26   /// Plugin class for HeuristicLab.OptimizationExpertSystem.Views plugin.
     28  /// Plugin class for HeuristicLab.OptimizationExpertSystem plugin.
    2729  /// </summary>
    28   [Plugin("HeuristicLab.OptimizationExpertSystem.Views", "3.3.12.$WCREV$")]
    29   [PluginFile("HeuristicLab.OptimizationExpertSystem.Views-3.3.dll", PluginFileType.Assembly)]
     30  [Plugin("HeuristicLab.OptimizationExpertSystem", "3.3.12.$WCREV$")]
     31  [PluginFile("HeuristicLab.OptimizationExpertSystem-3.3.dll", PluginFileType.Assembly)]
    3032  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3133  [PluginDependency("HeuristicLab.Collections", "3.3")]
     
    3638  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3739  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    38   [PluginDependency("HeuristicLab.OptimizationExpertSystem", "3.3")]
     40  [PluginDependency("HeuristicLab.OptimizationExpertSystem.Common", "3.3")]
    3941  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    40   public class HeuristicLabOptimizationExpertSystemViewsPlugin : PluginBase {
     42  public class HeuristicLabOptimizationExpertSystemPlugin : PluginBase {
     43  }
     44
     45  [Application("Optimization Expert System", "HeuristicLab Optimization Expert System 3.3.13.$WCREV$")]
     46  internal class HeuristicLabOptimizationExpertSystemApplication : ApplicationBase {
     47    public override void Run(ICommandLineArgument[] args) {
     48      HeuristicLab.MainForm.WindowsForms.MainForm mainForm = new OptimizationExpertSystem(typeof(IOptimizationExpertSystemUi));
     49     
     50      ClientInformation.InitializeAsync();
     51      UserInformation.InitializeAsync();
     52
     53      mainForm.ShowContentInViewHost = true;
     54      Application.Run(mainForm);
     55    }
    4156  }
    4257}
  • branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Properties/AssemblyInfo.cs.frame

    r12842 r13667  
    66// set of attributes. Change these attribute values to modify the information
    77// associated with an assembly.
    8 [assembly: AssemblyTitle("HeuristicLab.OptimizationExpertSystem.Views")]
     8[assembly: AssemblyTitle("HeuristicLab.OptimizationExpertSystem")]
    99[assembly: AssemblyDescription("")]
    1010[assembly: AssemblyConfiguration("")]
    1111[assembly: AssemblyCompany("HEAL")]
    1212[assembly: AssemblyProduct("HeuristicLab")]
    13 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
     13[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
    1414[assembly: AssemblyTrademark("")]
    1515[assembly: AssemblyCulture("")]
  • branches/PerformanceComparison/PerformanceComparison.sln

    r13583 r13667  
    1212Project("{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}"
    1313EndProject
    14 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OptimizationExpertSystem-3.3", "HeuristicLab.OptimizationExpertSystem\3.3\HeuristicLab.OptimizationExpertSystem-3.3.csproj", "{492CC257-E27C-4497-B2C1-09C45310C91C}"
     14Project("{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}"
    1515EndProject
    16 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}"
     16Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OptimizationExpertSystem.Views-3.3", "HeuristicLab.OptimizationExpertSystem.\3.3\HeuristicLab.OptimizationExpertSystem-3.3.csproj", "{6240A044-BD4B-4DDB-9E67-A6CFA5E0C7BE}"
    1717EndProject
    1818Project("{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}"
Note: See TracChangeset for help on using the changeset viewer.