Changeset 2663


Ignore:
Timestamp:
01/21/10 01:31:15 (10 years ago)
Author:
swagner
Message:

Started to adapt HeuristicLab.Data and HeuristicLab.Operators according to the changes in HeuristicLab.Core (#95)

Location:
trunk/sources
Files:
15 added
2 deleted
13 edited
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r2656 r2663  
    5454Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab 3.3", "HeuristicLab 3.3\HeuristicLab 3.3.csproj", "{B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}"
    5555  ProjectSection(ProjectDependencies) = postProject
     56    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943} = {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}
    5657    {E226881D-315F-423D-B419-A766FE0D8685} = {E226881D-315F-423D-B419-A766FE0D8685}
    5758    {C36BD924-A541-4A00-AFA8-41701378DDC5} = {C36BD924-A541-4A00-AFA8-41701378DDC5}
     
    5960    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} = {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}
    6061    {678E2145-8152-4E19-9646-07D439D00301} = {678E2145-8152-4E19-9646-07D439D00301}
     62    {C49CB749-8B24-4628-8003-E86475749410} = {C49CB749-8B24-4628-8003-E86475749410}
    6163    {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} = {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}
    6264    {C664305E-497C-4533-A140-967DEDB05C19} = {C664305E-497C-4533-A140-967DEDB05C19}
     
    6971    {1B3063DB-D71C-4A6A-A359-883E8F53A140} = {1B3063DB-D71C-4A6A-A359-883E8F53A140}
    7072    {A9E282EA-180F-4233-B809-AEDF0787545C} = {A9E282EA-180F-4233-B809-AEDF0787545C}
     73    {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} = {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}
     74    {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
    7175    {1FC004FC-59AF-4249-B1B6-FF25873A20E4} = {1FC004FC-59AF-4249-B1B6-FF25873A20E4}
    7276  EndProjectSection
     
    101105EndProject
    102106Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.log4net", "HeuristicLab.log4net", "{BA3315A3-9D7C-4F5F-99F4-1C9B88FD32AE}"
     107EndProject
     108Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data.Views-3.3", "HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj", "{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}"
     109EndProject
     110Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators.Views-3.3", "HeuristicLab.Operators.Views\3.3\HeuristicLab.Operators.Views-3.3.csproj", "{C49CB749-8B24-4628-8003-E86475749410}"
    103111EndProject
    104112Global
     
    486494    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Release|x86.ActiveCfg = Release|x86
    487495    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Release|x86.Build.0 = Release|x86
     496    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     497    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Debug|Any CPU.Build.0 = Debug|Any CPU
     498    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Debug|x64.ActiveCfg = Debug|Any CPU
     499    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Debug|x86.ActiveCfg = Debug|Any CPU
     500    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Release|Any CPU.ActiveCfg = Release|Any CPU
     501    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Release|Any CPU.Build.0 = Release|Any CPU
     502    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Release|x64.ActiveCfg = Release|Any CPU
     503    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Release|x86.ActiveCfg = Release|Any CPU
     504    {C49CB749-8B24-4628-8003-E86475749410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     505    {C49CB749-8B24-4628-8003-E86475749410}.Debug|Any CPU.Build.0 = Debug|Any CPU
     506    {C49CB749-8B24-4628-8003-E86475749410}.Debug|x64.ActiveCfg = Debug|Any CPU
     507    {C49CB749-8B24-4628-8003-E86475749410}.Debug|x86.ActiveCfg = Debug|Any CPU
     508    {C49CB749-8B24-4628-8003-E86475749410}.Release|Any CPU.ActiveCfg = Release|Any CPU
     509    {C49CB749-8B24-4628-8003-E86475749410}.Release|Any CPU.Build.0 = Release|Any CPU
     510    {C49CB749-8B24-4628-8003-E86475749410}.Release|x64.ActiveCfg = Release|Any CPU
     511    {C49CB749-8B24-4628-8003-E86475749410}.Release|x86.ActiveCfg = Release|Any CPU
    488512  EndGlobalSection
    489513  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab 3.3/Files.txt

    r2656 r2663  
    1212HeuristicLab.Core.Views\3.3:HeuristicLab.Core.Views-3.3.dll
    1313HeuristicLab.Data\3.3:HeuristicLab.Data-3.3.dll
     14HeuristicLab.Data.Views\3.3:HeuristicLab.Data.Views-3.3.dll
    1415HeuristicLab.Evolutionary\3.3:HeuristicLab.Evolutionary-3.3.dll
    1516HeuristicLab.Logging\3.3:HeuristicLab.Logging-3.3.dll
     
    1718HeuristicLab.MainForm.WindowsForms\3.2:HeuristicLab.MainForm.WindowsForms-3.2.dll
    1819HeuristicLab.Operators\3.3:HeuristicLab.Operators-3.3.dll
     20HeuristicLab.Operators.Views\3.3:HeuristicLab.Operators.Views-3.3.dll
    1921HeuristicLab.Operators.Programmable\3.3:HeuristicLab.Operators.Programmable-3.3.dll
    2022HeuristicLab.Optimizer\3.3:HeuristicLab.Optimizer-3.3.dll
  • trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

    r2655 r2663  
    156156      <DependentUpon>ObjectViewBase.cs</DependentUpon>
    157157    </Compile>
    158     <Compile Include="OperatorBaseView.cs">
    159       <SubType>UserControl</SubType>
    160     </Compile>
    161     <Compile Include="OperatorBaseView.Designer.cs">
    162       <DependentUpon>OperatorBaseView.cs</DependentUpon>
    163     </Compile>
    164158    <Compile Include="NamedItemBaseView.cs">
    165159      <SubType>UserControl</SubType>
     
    167161    <Compile Include="NamedItemBaseView.Designer.cs">
    168162      <DependentUpon>NamedItemBaseView.cs</DependentUpon>
    169     </Compile>
    170     <Compile Include="IntDataView.cs">
    171       <SubType>UserControl</SubType>
    172     </Compile>
    173     <Compile Include="IntDataView.Designer.cs">
    174       <DependentUpon>IntDataView.cs</DependentUpon>
    175163    </Compile>
    176164    <Compile Include="ParameterView.cs">
     
    253241      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    254242      <Name>HeuristicLab.MainForm-3.2</Name>
    255     </ProjectReference>
    256     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    257       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    258       <Name>HeuristicLab.Persistence-3.3</Name>
    259243    </ProjectReference>
    260244    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
  • trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLabCoreViewsPlugin.cs

    r2655 r2663  
    3434  [PluginDependency("HeuristicLab.Common-3.2")]
    3535  [PluginDependency("HeuristicLab.Common.Resources-3.2")]
    36   [PluginDependency("HeuristicLab.Persistence-3.3")]
    3736  [PluginDependency("HeuristicLab.Core-3.3")]
    3837  [PluginDependency("HeuristicLab.MainForm-3.2")]
  • trunk/sources/HeuristicLab.Core.Views/3.3/Properties/AssemblyInfo.frame

    r2511 r2663  
    3030// associated with an assembly.
    3131[assembly: AssemblyTitle("HeuristicLab.Core.Views")]
    32 [assembly: AssemblyDescription("HeuristicLab core view controls")]
     32[assembly: AssemblyDescription("Views of the HeuristicLab core classes")]
    3333[assembly: AssemblyConfiguration("")]
    3434[assembly: AssemblyCompany("")]
  • trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

    r2653 r2663  
    102102    <Compile Include="Cloner.cs" />
    103103    <Compile Include="Attributes\CreatableAttribute.cs" />
    104     <Compile Include="CombinedOperator.cs" />
    105104    <Compile Include="ChangedEventArgs.cs" />
    106105    <Compile Include="Interfaces\IOperatorParameter.cs" />
     
    113112    <Compile Include="OperatorSet.cs" />
    114113    <Compile Include="ItemSet.cs" />
    115     <Compile Include="StandardOperatorBase.cs" />
    116114    <Compile Include="ItemList.cs" />
    117     <Compile Include="SequentialProcessor.cs" />
    118     <Compile Include="CounterOperator.cs" />
    119     <Compile Include="IntData.cs" />
    120     <Compile Include="EmptyOperator.cs" />
    121115    <Compile Include="EngineBase.cs">
    122116      <SubType>Code</SubType>
     
    139133    <Compile Include="Interfaces\IItem.cs" />
    140134    <Compile Include="ItemBase.cs" />
    141     <Compile Include="OperatorBase.cs" />
    142135    <Compile Include="Interfaces\IRandom.cs" />
    143136    <Compile Include="Scope.cs" />
  • trunk/sources/HeuristicLab.Data.Views/3.3/IntDataView.Designer.cs

    r2662 r2663  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core.Views {
     22namespace HeuristicLab.Data.Views {
    2323  partial class IntDataView {
    2424    /// <summary>
  • trunk/sources/HeuristicLab.Data.Views/3.3/IntDataView.cs

    r2662 r2663  
    2727using System.Text;
    2828using System.Windows.Forms;
     29using HeuristicLab.Core.Views;
    2930using HeuristicLab.MainForm;
    3031
    31 namespace HeuristicLab.Core.Views {
     32namespace HeuristicLab.Data.Views {
    3233  /// <summary>
    3334  /// The visual representation of a <see cref="Variable"/>.
  • trunk/sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

    r2524 r2663  
    100100  </ItemGroup>
    101101  <ItemGroup>
    102     <Compile Include="ArrayDataBaseView.cs">
    103       <SubType>UserControl</SubType>
     102    <Compile Include="ValueTypeData.cs">
     103      <SubType>Code</SubType>
    104104    </Compile>
    105     <Compile Include="ArrayDataBaseView.Designer.cs">
    106       <DependentUpon>ArrayDataBaseView.cs</DependentUpon>
     105    <Compile Include="HeuristicLabDataPlugin.cs" />
     106    <Compile Include="IntData.cs">
     107      <SubType>Code</SubType>
    107108    </Compile>
    108     <Compile Include="BoolArrayData.cs" />
    109     <Compile Include="BoolArrayDataView.cs">
    110       <SubType>UserControl</SubType>
    111     </Compile>
    112     <Compile Include="BoolArrayDataView.Designer.cs">
    113       <DependentUpon>BoolArrayDataView.cs</DependentUpon>
    114     </Compile>
    115     <Compile Include="BoolData.cs" />
    116     <Compile Include="BoolDataView.cs">
    117       <SubType>UserControl</SubType>
    118     </Compile>
    119     <Compile Include="BoolDataView.Designer.cs">
    120       <DependentUpon>BoolDataView.cs</DependentUpon>
    121     </Compile>
    122     <Compile Include="BoolMatrixData.cs" />
    123     <Compile Include="ArrayDataBase.cs" />
    124     <Compile Include="BoolMatrixDataView.cs">
    125       <SubType>UserControl</SubType>
    126     </Compile>
    127     <Compile Include="BoolMatrixDataView.Designer.cs">
    128       <DependentUpon>BoolMatrixDataView.cs</DependentUpon>
    129     </Compile>
    130     <Compile Include="EditKeyValueDialog.cs">
    131       <SubType>Form</SubType>
    132     </Compile>
    133     <Compile Include="EditKeyValueDialog.designer.cs">
    134       <DependentUpon>EditKeyValueDialog.cs</DependentUpon>
    135     </Compile>
    136     <Compile Include="ItemDictionaryView_T.cs">
    137       <SubType>UserControl</SubType>
    138     </Compile>
    139     <Compile Include="ItemDictionaryView_T.designer.cs">
    140       <DependentUpon>ItemDictionaryView_T.cs</DependentUpon>
    141     </Compile>
    142     <Compile Include="ItemDictionary_T.cs" />
    143     <Compile Include="NullData.cs" />
    144     <Compile Include="IntMatrixDataView.cs">
    145       <SubType>UserControl</SubType>
    146     </Compile>
    147     <Compile Include="IntMatrixDataView.Designer.cs">
    148       <DependentUpon>IntMatrixDataView.cs</DependentUpon>
    149     </Compile>
    150     <Compile Include="DoubleMatrixDataView.cs">
    151       <SubType>UserControl</SubType>
    152     </Compile>
    153     <Compile Include="DoubleMatrixDataView.Designer.cs">
    154       <DependentUpon>DoubleMatrixDataView.cs</DependentUpon>
    155     </Compile>
    156     <Compile Include="IntArrayDataView.cs">
    157       <SubType>UserControl</SubType>
    158     </Compile>
    159     <Compile Include="IntArrayDataView.Designer.cs">
    160       <DependentUpon>IntArrayDataView.cs</DependentUpon>
    161     </Compile>
    162     <Compile Include="DoubleArrayDataView.cs">
    163       <SubType>UserControl</SubType>
    164     </Compile>
    165     <Compile Include="DoubleArrayDataView.Designer.cs">
    166       <DependentUpon>DoubleArrayDataView.cs</DependentUpon>
    167     </Compile>
    168     <Compile Include="DoubleDataView.cs">
    169       <SubType>UserControl</SubType>
    170     </Compile>
    171     <Compile Include="DoubleDataView.Designer.cs">
    172       <DependentUpon>DoubleDataView.cs</DependentUpon>
    173     </Compile>
    174     <Compile Include="IntDataView.cs">
    175       <SubType>UserControl</SubType>
    176     </Compile>
    177     <Compile Include="IntDataView.Designer.cs">
    178       <DependentUpon>IntDataView.cs</DependentUpon>
    179     </Compile>
    180     <Compile Include="IObjectData.cs" />
    181     <Compile Include="ItemList.cs" />
    182     <Compile Include="ItemListView.cs">
    183       <SubType>UserControl</SubType>
    184     </Compile>
    185     <Compile Include="ItemListView_T.cs">
    186       <SubType>UserControl</SubType>
    187     </Compile>
    188     <Compile Include="ItemListView_T.Designer.cs">
    189       <DependentUpon>ItemListView_T.cs</DependentUpon>
    190     </Compile>
    191     <Compile Include="ItemList_T.cs">
    192     </Compile>
    193     <Compile Include="MatrixDataBaseView.cs">
    194       <SubType>UserControl</SubType>
    195     </Compile>
    196     <Compile Include="MatrixDataBaseView.Designer.cs">
    197       <DependentUpon>MatrixDataBaseView.cs</DependentUpon>
    198     </Compile>
    199     <Compile Include="ObjectData.cs" />
    200     <Compile Include="StringDataView.cs">
    201       <SubType>UserControl</SubType>
    202     </Compile>
    203     <Compile Include="StringDataView.Designer.cs">
    204       <DependentUpon>StringDataView.cs</DependentUpon>
    205     </Compile>
    206     <Compile Include="DoubleArrayData.cs" />
    207     <Compile Include="DoubleData.cs" />
    208     <Compile Include="DoubleMatrixData.cs" />
    209     <Compile Include="HeuristicLabDataPlugin.cs" />
    210     <Compile Include="IntArrayData.cs" />
    211     <Compile Include="IntData.cs" />
    212     <Compile Include="IntMatrixData.cs" />
    213109    <Compile Include="Properties\AssemblyInfo.cs" />
    214     <Compile Include="StringData.cs" />
    215110  </ItemGroup>
    216111  <ItemGroup>
    217     <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
    218       <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
    219       <Name>HeuristicLab.Common-3.2</Name>
    220     </ProjectReference>
    221     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    222       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    223       <Name>HeuristicLab.Core.Views-3.3</Name>
     112    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
     113      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     114      <Name>HeuristicLab.Common.Resources-3.2</Name>
    224115    </ProjectReference>
    225116    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    226117      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    227118      <Name>HeuristicLab.Core-3.3</Name>
    228     </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
    230       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    231       <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>
    232     </ProjectReference>
    233     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
    234       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    235       <Name>HeuristicLab.MainForm-3.2</Name>
    236119    </ProjectReference>
    237120    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     
    247130    <None Include="HeuristicLab.snk" />
    248131    <None Include="Properties\AssemblyInfo.frame" />
    249   </ItemGroup>
    250   <ItemGroup>
    251     <EmbeddedResource Include="ArrayDataBaseView.resx">
    252       <DependentUpon>ArrayDataBaseView.cs</DependentUpon>
    253       <SubType>Designer</SubType>
    254     </EmbeddedResource>
    255     <EmbeddedResource Include="BoolDataView.resx">
    256       <DependentUpon>BoolDataView.cs</DependentUpon>
    257       <SubType>Designer</SubType>
    258     </EmbeddedResource>
    259     <EmbeddedResource Include="DoubleDataView.resx">
    260       <DependentUpon>DoubleDataView.cs</DependentUpon>
    261       <SubType>Designer</SubType>
    262     </EmbeddedResource>
    263     <EmbeddedResource Include="EditKeyValueDialog.resx">
    264       <DependentUpon>EditKeyValueDialog.cs</DependentUpon>
    265       <SubType>Designer</SubType>
    266     </EmbeddedResource>
    267     <EmbeddedResource Include="IntDataView.resx">
    268       <DependentUpon>IntDataView.cs</DependentUpon>
    269       <SubType>Designer</SubType>
    270     </EmbeddedResource>
    271     <EmbeddedResource Include="ItemDictionaryView_T.resx">
    272       <DependentUpon>ItemDictionaryView_T.cs</DependentUpon>
    273       <SubType>Designer</SubType>
    274     </EmbeddedResource>
    275     <EmbeddedResource Include="ItemListView_T.resx">
    276       <DependentUpon>ItemListView_T.cs</DependentUpon>
    277       <SubType>Designer</SubType>
    278     </EmbeddedResource>
    279     <EmbeddedResource Include="MatrixDataBaseView.resx">
    280       <DependentUpon>MatrixDataBaseView.cs</DependentUpon>
    281       <SubType>Designer</SubType>
    282     </EmbeddedResource>
    283     <EmbeddedResource Include="StringDataView.resx">
    284       <DependentUpon>StringDataView.cs</DependentUpon>
    285       <SubType>Designer</SubType>
    286     </EmbeddedResource>
    287132  </ItemGroup>
    288133  <ItemGroup>
  • trunk/sources/HeuristicLab.Data/3.3/HeuristicLabDataPlugin.cs

    r2520 r2663  
    2929  /// Plugin class for HeuristicLab.Data plugin.
    3030  /// </summary>
    31   [ClassInfo(Name = "HeuristicLab.Data-3.3")]
    32   [PluginFile(Filename = "HeuristicLab.Data-3.3.dll", Filetype = PluginFileType.Assembly)]
    33   [Dependency(Dependency = "HeuristicLab.Common-3.2")]
    34   [Dependency(Dependency = "HeuristicLab.Core-3.3")]
    35   [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
    36   [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
    37   [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
    38   [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
     31  [Plugin("HeuristicLab.Data-3.3", "")]
     32  [PluginFile("HeuristicLab.Data-3.3.dll", PluginFileType.Assembly)]
     33  [PluginDependency("HeuristicLab.Common.Resources-3.2")]
     34  [PluginDependency("HeuristicLab.Core-3.3")]
     35  [PluginDependency("HeuristicLab.Persistence-3.3")]
    3936  public class HeuristicLabDataPlugin : PluginBase {
    4037  }
  • trunk/sources/HeuristicLab.Data/3.3/IntData.cs

    r2526 r2663  
    2525using System.Xml;
    2626using HeuristicLab.Core;
    27 using System.Globalization;
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2928
    3029namespace HeuristicLab.Data {
    31   /// <summary>
    32   /// The representation of an int value.
    33   /// </summary>
    3430  [EmptyStorableClass]
    35   public class IntData : ObjectData {
    36     /// <summary>
    37     /// Gets or sets the int value.
    38     /// </summary>
    39     /// <remarks>Uses property <see cref="ObjectData.Data"/> of base class <see cref="ObjectData"/>.
    40     /// No own data storage present.</remarks>
    41     public new int Data {
    42       get { return (int)base.Data; }
    43       set { base.Data = value; }
     31  [Item("Int Data", "Represents an integer value.")]
     32  [Creatable("Test")]
     33  public sealed class IntData : ValueTypeData<int> {
     34    public IntData() : base() { }
     35    public IntData(int value)
     36      : base() {
     37      Value = value;
    4438    }
    4539
    46     /// <summary>
    47     /// Initializes a new instance of <see cref="IntData"/> with default value <c>0</c>.
    48     /// </summary>
    49     public IntData() {
    50       Data = 0;
    51     }
    52     /// <summary>
    53     /// Initializes a new instance of <see cref="IntData"/>.
    54     /// </summary>
    55     /// <param name="data">The int value the current instance should represent.</param>
    56     public IntData(int data) {
    57       Data = data;
    58     }
    59 
    60     /// <summary>
    61     /// Clones the current instance.
    62     /// </summary>
    63     /// <remarks>Adds the cloned instance to the dictionary <paramref name="clonedObjects"/>.</remarks>
    64     /// <param name="clonedObjects">Dictionary of all already cloned objects.</param>
    65     /// <returns>The cloned instance as <see cref="IntData"/>.</returns>
    66     public override IItem Clone(ICloner cloner) {
    67       IntData clone = new IntData();
     40    public override IDeepCloneable Clone(Cloner cloner) {
     41      IntData clone = new IntData(Value);
    6842      cloner.RegisterClonedObject(this, clone);
    69       clone.Data = Data;
    7043      return clone;
    7144    }
  • trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorBaseView.Designer.cs

    r2662 r2663  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core.Views {
     22namespace HeuristicLab.Operators.Views {
    2323  partial class OperatorBaseView {
    2424    /// <summary>
     
    9090    #endregion
    9191
    92     protected ParameterCollectionView parameterCollectionView;
     92    protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
    9393
    9494
  • trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorBaseView.cs

    r2662 r2663  
    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.Operators.Views {
    3234  /// <summary>
    3335  /// The base class for visual representations of items.
  • trunk/sources/HeuristicLab.Operators/3.3/EmptyOperator.cs

    r1530 r2663  
    2323using System.Collections.Generic;
    2424using System.Text;
     25using System.Xml;
     26using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2527using HeuristicLab.Core;
    2628
    2729namespace HeuristicLab.Operators {
    2830  /// <summary>
    29   /// Placeholder and also used for testing; Does nothing.
     31  /// An operator which represents an empty statement.
    3032  /// </summary>
    31   public class EmptyOperator : OperatorBase {
    32     /// <inheritdoc select="summary"/>
    33     public override string Description {
    34       get { return "An empty operator just does nothing. Useful for testing and as a place holder for sub-operators of SequentialSubScopesProcessor and ParallelSubScopesProcessor."; }
    35     }
    36 
    37     /// <summary>
    38     /// Initializes a new instance of <see cref="EmptyOperator"/>.
    39     /// </summary>
     33  [Item("Empty Operator", "An operator which represents an empty statement.")]
     34  [Creatable("Test")]
     35  [EmptyStorableClass]
     36  public sealed class EmptyOperator : StandardOperatorBase {
    4037    public EmptyOperator()
    4138      : base() {
    4239    }
    43 
    44     /// <summary>
    45     /// Does nothing.
    46     /// </summary>
    47     /// <param name="scope">The scope to apply the operator on.</param>
    48     /// <returns><c>null</c>.</returns>
    49     public override IOperation Apply(IScope scope) {
    50       return null;
    51     }
    5240  }
    5341}
  • trunk/sources/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

    r2524 r2663  
    8585  </ItemGroup>
    8686  <ItemGroup>
    87     <Compile Include="AddVariableInfoDialog.cs">
    88       <SubType>Form</SubType>
    89     </Compile>
    90     <Compile Include="AddVariableInfoDialog.Designer.cs">
    91       <DependentUpon>AddVariableInfoDialog.cs</DependentUpon>
    92     </Compile>
    93     <Compile Include="CombinedOperator.cs" />
    94     <Compile Include="CombinedOperatorView.cs">
    95       <SubType>UserControl</SubType>
    96     </Compile>
    97     <Compile Include="CombinedOperatorView.Designer.cs">
    98       <DependentUpon>CombinedOperatorView.cs</DependentUpon>
    99     </Compile>
    100     <Compile Include="ComparatorBase.cs" />
    101     <Compile Include="ConditionalBranch.cs">
     87    <Compile Include="EmptyOperator.cs">
    10288      <SubType>Code</SubType>
    10389    </Compile>
    104     <Compile Include="DelegatingOperator.cs" />
    105     <Compile Include="DoubleCounter.cs" />
    106     <Compile Include="ScopeCleaner.cs" />
    107     <Compile Include="StochasticMultiBranch.cs" />
    108     <Compile Include="SubScopesMixer.cs" />
    109     <Compile Include="DataCollector.cs" />
    110     <Compile Include="EqualToComparator.cs" />
    111     <Compile Include="GreaterOrEqualThanComparator.cs" />
    112     <Compile Include="GreaterThanComparator.cs" />
    113     <Compile Include="LessOrEqualThanComparator.cs" />
    114     <Compile Include="LessThanComparator.cs" />
    115     <Compile Include="OperatorExtractor.cs" />
    116     <Compile Include="ParallelProcessor.cs" />
    117     <Compile Include="EmptyOperator.cs" />
    118     <Compile Include="SequentialProcessor.cs" />
    119     <Compile Include="SingleObjectiveEvaluatorBase.cs" />
    120     <Compile Include="Sorter.cs" />
    121     <Compile Include="StochasticBranch.cs" />
    122     <Compile Include="SubScopesRemover.cs" />
    123     <Compile Include="UnequalToComparator.cs" />
    124     <Compile Include="UniformSequentialSubScopesProcessor.cs" />
    125     <Compile Include="UniformParallelSubScopesProcessor.cs" />
    126     <Compile Include="ParallelSubScopesProcessor.cs" />
    127     <Compile Include="SequentialSubScopesProcessor.cs" />
    128     <Compile Include="SubScopesCreater.cs" />
    129     <Compile Include="Counter.cs" />
    13090    <Compile Include="HeuristicLabOperatorsPlugin.cs" />
     91    <Compile Include="OperatorBase.cs" />
    13192    <Compile Include="Properties\AssemblyInfo.cs" />
    132     <Compile Include="VariableInjector.cs" />
    133     <Compile Include="VariableInjectorView.cs">
    134       <SubType>UserControl</SubType>
    135     </Compile>
    136     <Compile Include="VariableInjectorView.Designer.cs">
    137       <DependentUpon>VariableInjectorView.cs</DependentUpon>
    138     </Compile>
     93    <Compile Include="StandardOperatorBase.cs" />
    13994  </ItemGroup>
    14095  <ItemGroup>
    141     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    142       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    143       <Name>HeuristicLab.Core.Views-3.3</Name>
     96    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     97      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     98      <Name>HeuristicLab.Collections-3.3</Name>
     99    </ProjectReference>
     100    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
     101      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     102      <Name>HeuristicLab.Common.Resources-3.2</Name>
    144103    </ProjectReference>
    145104    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     
    150109      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    151110      <Name>HeuristicLab.Data-3.3</Name>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
    154       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    155       <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
    158       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    159       <Name>HeuristicLab.MainForm-3.2</Name>
    160111    </ProjectReference>
    161112    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     
    171122    <None Include="HeuristicLab.snk" />
    172123    <None Include="Properties\AssemblyInfo.frame" />
    173   </ItemGroup>
    174   <ItemGroup>
    175     <EmbeddedResource Include="AddVariableInfoDialog.resx">
    176       <DependentUpon>AddVariableInfoDialog.cs</DependentUpon>
    177       <SubType>Designer</SubType>
    178     </EmbeddedResource>
    179     <EmbeddedResource Include="CombinedOperatorView.resx">
    180       <DependentUpon>CombinedOperatorView.cs</DependentUpon>
    181       <SubType>Designer</SubType>
    182     </EmbeddedResource>
    183124  </ItemGroup>
    184125  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.Operators/3.3/HeuristicLabOperatorsPlugin.cs

    r2524 r2663  
    2929  /// Plugin class for HeuristicLab.Operators plugin.
    3030  /// </summary>
    31   [ClassInfo(Name = "HeuristicLab.Operators-3.3")]
    32   [PluginFile(Filename = "HeuristicLab.Operators-3.3.dll", Filetype = PluginFileType.Assembly)]
    33   [Dependency(Dependency = "HeuristicLab.Core-3.3")]
    34   [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
    35   [Dependency(Dependency = "HeuristicLab.Data-3.3")]
    36   [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
    37   [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
    38   [Dependency(Dependency = "HeuristicLab.Persistence-3.3")] 
     31  [Plugin("HeuristicLab.Operators-3.3")]
     32  [PluginFile("HeuristicLab.Operators-3.3.dll", PluginFileType.Assembly)]
     33  [PluginDependency("HeuristicLab.Collections-3.3")]
     34  [PluginDependency("HeuristicLab.Common.Resources-3.2")]
     35  [PluginDependency("HeuristicLab.Core-3.3")]
     36  [PluginDependency("HeuristicLab.Data-3.3")]
     37  [PluginDependency("HeuristicLab.Persistence-3.3")] 
    3938  public class HeuristicLabOperatorsPlugin : PluginBase {
    4039  }
  • trunk/sources/HeuristicLab.Operators/3.3/OperatorBase.cs

    r2662 r2663  
    2626using System.Drawing;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Common;
     28using HeuristicLab.Core;
    2929using HeuristicLab.Collections;
    3030
    31 namespace HeuristicLab.Core {
     31namespace HeuristicLab.Operators {
    3232  /// <summary>
    3333  /// The base class for all operators.
  • trunk/sources/HeuristicLab.Operators/3.3/Properties/AssemblyInfo.frame

    r1673 r2663  
    2929// associated with an assembly.
    3030[assembly: AssemblyTitle("HeuristicLab.Operators")]
    31 [assembly: AssemblyDescription("Various HeuristicLab operator classes")]
     31[assembly: AssemblyDescription("HeuristicLab operator classes")]
    3232[assembly: AssemblyConfiguration("")]
    3333[assembly: AssemblyCompany("")]
  • trunk/sources/HeuristicLab.Operators/3.3/StandardOperatorBase.cs

    r2662 r2663  
    2525using System.Xml;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Common;
     27using HeuristicLab.Core;
    2828
    29 namespace HeuristicLab.Core {
     29namespace HeuristicLab.Operators {
    3030  /// <summary>
    3131  /// A base class for operators which have only one successor.
Note: See TracChangeset for help on using the changeset viewer.