Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2714


Ignore:
Timestamp:
01/29/10 02:58:39 (15 years ago)
Author:
swagner
Message:

Operator architecture refactoring (#95)

  • moved parameters and parameter views into new plugins
Location:
trunk/sources
Files:
14 added
8 edited
7 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r2713 r2714  
    6464    {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} = {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}
    6565    {C664305E-497C-4533-A140-967DEDB05C19} = {C664305E-497C-4533-A140-967DEDB05C19}
     66    {56F9106A-079F-4C61-92F6-86A84C2D84B7} = {56F9106A-079F-4C61-92F6-86A84C2D84B7}
    6667    {DC3D7072-7999-4719-B65D-3997744D5DC1} = {DC3D7072-7999-4719-B65D-3997744D5DC1}
    6768    {BF7D9494-A586-457B-8DF9-ED599F9E6A71} = {BF7D9494-A586-457B-8DF9-ED599F9E6A71}
    … …  
    7172    {EE2034D9-6E27-48A1-B855-42D45F69A4FC} = {EE2034D9-6E27-48A1-B855-42D45F69A4FC}
    7273    {1B3063DB-D71C-4A6A-A359-883E8F53A140} = {1B3063DB-D71C-4A6A-A359-883E8F53A140}
     74    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295} = {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}
    7375    {A9E282EA-180F-4233-B809-AEDF0787545C} = {A9E282EA-180F-4233-B809-AEDF0787545C}
    7476    {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} = {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}
    … …  
    112114EndProject
    113115Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm.Test-3.2", "HeuristicLab.MainForm.Test\3.2\HeuristicLab.MainForm.Test-3.2.csproj", "{569E430B-B4CE-4B94-A44E-6246B6E4E3BC}"
     116EndProject
     117Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Parameters-3.3", "HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj", "{56F9106A-079F-4C61-92F6-86A84C2D84B7}"
     118EndProject
     119Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Parameters.Views-3.3", "HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj", "{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}"
    114120EndProject
    115121Global
    … …  
    525531    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.ActiveCfg = Release|x86
    526532    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.Build.0 = Release|x86
     533    {56F9106A-079F-4C61-92F6-86A84C2D84B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     534    {56F9106A-079F-4C61-92F6-86A84C2D84B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
     535    {56F9106A-079F-4C61-92F6-86A84C2D84B7}.Debug|x64.ActiveCfg = Debug|Any CPU
     536    {56F9106A-079F-4C61-92F6-86A84C2D84B7}.Debug|x86.ActiveCfg = Debug|Any CPU
     537    {56F9106A-079F-4C61-92F6-86A84C2D84B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
     538    {56F9106A-079F-4C61-92F6-86A84C2D84B7}.Release|Any CPU.Build.0 = Release|Any CPU
     539    {56F9106A-079F-4C61-92F6-86A84C2D84B7}.Release|x64.ActiveCfg = Release|Any CPU
     540    {56F9106A-079F-4C61-92F6-86A84C2D84B7}.Release|x86.ActiveCfg = Release|Any CPU
     541    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     542    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}.Debug|Any CPU.Build.0 = Debug|Any CPU
     543    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}.Debug|x64.ActiveCfg = Debug|Any CPU
     544    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}.Debug|x86.ActiveCfg = Debug|Any CPU
     545    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}.Release|Any CPU.ActiveCfg = Release|Any CPU
     546    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}.Release|Any CPU.Build.0 = Release|Any CPU
     547    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}.Release|x64.ActiveCfg = Release|Any CPU
     548    {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}.Release|x86.ActiveCfg = Release|Any CPU
    527549  EndGlobalSection
    528550  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab 3.3/Files.txt

    r2713 r2714  
    2222HeuristicLab.Operators.Programmable\3.3:HeuristicLab.Operators.Programmable-3.3.dll
    2323HeuristicLab.Optimizer\3.3:HeuristicLab.Optimizer-3.3.dll
     24HeuristicLab.Parameters\3.3:HeuristicLab.Parameters-3.3.dll
     25HeuristicLab.Parameters.Views\3.3:HeuristicLab.Parameters.Views-3.3.dll
    2426HeuristicLab.Permutation\3.3:HeuristicLab.Permutation-3.3.dll
    2527HeuristicLab.Persistence\3.3:HeuristicLab.Persistence-3.3.dll

  • trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

    r2713 r2714  
    6565      <DependentUpon>EngineView.cs</DependentUpon>
    6666    </Compile>
    67     <Compile Include="ItemParameterView.cs">
    68       <SubType>UserControl</SubType>
    69     </Compile>
    70     <Compile Include="ItemParameterView.Designer.cs">
    71       <DependentUpon>ItemParameterView.cs</DependentUpon>
    72     </Compile>
    7367    <Compile Include="ItemView.cs">
    7468      <SubType>UserControl</SubType>
    … …  
    160154    <Compile Include="ItemListView.Designer.cs">
    161155      <DependentUpon>ItemListView.cs</DependentUpon>
    162     </Compile>
    163     <Compile Include="ParameterView.cs">
    164       <SubType>UserControl</SubType>
    165     </Compile>
    166     <Compile Include="ParameterView.Designer.cs">
    167       <DependentUpon>ParameterView.cs</DependentUpon>
    168156    </Compile>
    169157    <Compile Include="ScopeView.cs">

  • trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

    r2687 r2714  
    109109    <Compile Include="Interfaces\IVariable.cs" />
    110110    <Compile Include="Item.cs" />
    111     <Compile Include="ItemParameter.cs" />
    112111    <Compile Include="NamedItem.cs" />
    113112    <Compile Include="OperatorGraph.cs" />
    114     <Compile Include="OperatorParameter.cs" />
    115113    <Compile Include="Interfaces\IParameter.cs" />
    116114    <Compile Include="OperatorCollection.cs" />
    … …  
    127125    <Compile Include="ParameterCollection.cs" />
    128126    <Compile Include="VariableCollection.cs" />
    129     <Compile Include="Parameter.cs" />
    130127    <Compile Include="ScopeList.cs" />
    131128    <Compile Include="Interfaces\IDeepCloneable.cs" />

  • trunk/sources/HeuristicLab.Operators/3.3/Counter.cs

    r2684 r2714  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
     27using HeuristicLab.Parameters;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2829

  • trunk/sources/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

    r2684 r2714  
    113113      <Name>HeuristicLab.Data-3.3</Name>
    114114    </ProjectReference>
     115    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     116      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     117      <Name>HeuristicLab.Parameters-3.3</Name>
     118    </ProjectReference>
    115119    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    116120      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>

  • trunk/sources/HeuristicLab.Operators/3.3/HeuristicLabOperatorsPlugin.cs

    r2663 r2714  
    3535  [PluginDependency("HeuristicLab.Core-3.3")]
    3636  [PluginDependency("HeuristicLab.Data-3.3")]
    37   [PluginDependency("HeuristicLab.Persistence-3.3")] 
     37  [PluginDependency("HeuristicLab.Parameters-3.3")]
     38  [PluginDependency("HeuristicLab.Persistence-3.3")]
    3839  public class HeuristicLabOperatorsPlugin : PluginBase {
    3940  }

  • trunk/sources/HeuristicLab.Operators/3.3/StandardOperator.cs

    r2687 r2714  
    2424using System.Text;
    2525using System.Xml;
     26using HeuristicLab.Core;
     27using HeuristicLab.Parameters;
    2628using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Core;
    2829
    2930namespace HeuristicLab.Operators {

  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ItemParameterView.Designer.cs

    r2713 r2714  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core.Views {
     22namespace HeuristicLab.Parameters.Views {
    2323  partial class ItemParameterView {
    2424    /// <summary>
    … …  
    202202    protected System.Windows.Forms.Label actualNameLabel;
    203203    protected System.Windows.Forms.Panel valuePanel;
    204     protected ViewHost viewHost;
     204    protected HeuristicLab.Core.Views.ViewHost viewHost;
    205205    protected System.Windows.Forms.Button setValueButton;
    206206    protected System.Windows.Forms.ToolTip toolTip;

  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ItemParameterView.cs

    r2713 r2714  
    2727using System.Text;
    2828using System.Windows.Forms;
     29using HeuristicLab.Core;
     30using HeuristicLab.Core.Views;
    2931using HeuristicLab.MainForm;
    3032
    31 namespace HeuristicLab.Core.Views {
     33namespace HeuristicLab.Parameters.Views {
    3234  /// <summary>
    3335  /// The visual representation of a <see cref="Parameter"/>.

  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ParameterView.Designer.cs

    r2711 r2714  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core.Views {
     22namespace HeuristicLab.Parameters.Views {
    2323  partial class ParameterView {
    2424    /// <summary>

  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ParameterView.cs

    r2713 r2714  
    2727using System.Text;
    2828using System.Windows.Forms;
     29using HeuristicLab.Core.Views;
    2930using HeuristicLab.MainForm;
    3031
    31 namespace HeuristicLab.Core.Views {
     32namespace HeuristicLab.Parameters.Views {
    3233  /// <summary>
    3334  /// The visual representation of a <see cref="Parameter"/>.

  • trunk/sources/HeuristicLab.Parameters/3.3/ItemParameter.cs

    r2711 r2714  
    2424using System.Text;
    2525using System.Xml;
     26using HeuristicLab.Core;
    2627using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Common;
    2828
    29 namespace HeuristicLab.Core {
     29namespace HeuristicLab.Parameters {
    3030  /// <summary>
    3131  /// Represents a parameter.

  • trunk/sources/HeuristicLab.Parameters/3.3/OperatorParameter.cs

    r2711 r2714  
    2424using System.Text;
    2525using System.Xml;
     26using HeuristicLab.Core;
    2627using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Common;
    2828
    29 namespace HeuristicLab.Core {
     29namespace HeuristicLab.Parameters {
    3030  /// <summary>
    3131  /// Represents a parameter.

  • trunk/sources/HeuristicLab.Parameters/3.3/Parameter.cs

    r2711 r2714  
    2424using System.Text;
    2525using System.Xml;
     26using HeuristicLab.Core;
    2627using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Common;
    2828
    29 namespace HeuristicLab.Core {
     29namespace HeuristicLab.Parameters {
    3030  /// <summary>
    3131  /// Represents a parameter.
Note: See TracChangeset for help on using the changeset viewer.