Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk/sources/HeuristicLab.Data/3.3
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • 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    }
Note: See TracChangeset for help on using the changeset viewer.