Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/05/13 16:37:17 (12 years ago)
Author:
sforsten
Message:

#2018:

  • added new methods to the interface IStringConvertibleMatrix as well as two structs. Also the event ItemChanged has been changed to ItemsChanged
  • class ValueTypeMatrix now implements IStringConvertibleMatrix instead of the classes which inherit from it
  • small changes have been applied to a lot of classes to correctly implement the changed interface IStringConvertibleMatrix
  • solution file, Build.cmd and PreBuildEvent.cmd have been added
Location:
branches/ImprovingStringConvertibleMatrix
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/ImprovingStringConvertibleMatrix

    • Property svn:ignore set to
      *.suo

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

    r8280 r9286  
    245245      throw new NotSupportedException();
    246246    }
    247 
    248     public event EventHandler<EventArgs<int, int>> ItemChanged;
    249     protected virtual void OnItemChanged(int rowIndex, int columnIndex) {
    250       var handler = ItemChanged;
    251       if (handler != null) handler(this, new EventArgs<int, int>(rowIndex, columnIndex));
     247    bool IStringConvertibleMatrix.SetValue(RowColumnValue rowColumnValue) {
     248      throw new NotSupportedException();
     249    }
     250    bool IStringConvertibleMatrix.SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     251      throw new NotSupportedException();
     252    }
     253
     254    public event EventHandler<EventArgs<IEnumerable<Position>>> ItemsChanged;
     255    protected virtual void OnItemsChanged(IEnumerable<Position> positions) {
     256      var handler = ItemsChanged;
     257      if (handler != null) handler(this, new EventArgs<IEnumerable<Position>>(positions));
    252258      OnToStringChanged();
    253259    }

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs

    r8405 r9286  
    259259      throw new NotSupportedException();
    260260    }
    261 
    262     public event EventHandler<EventArgs<int, int>> ItemChanged;
    263     protected virtual void OnItemChanged(int rowIndex, int columnIndex) {
    264       var handler = ItemChanged;
    265       if (handler != null) handler(this, new EventArgs<int, int>(rowIndex, columnIndex));
     261    bool IStringConvertibleMatrix.SetValue(RowColumnValue rowColumnValue) {
     262      throw new NotSupportedException();
     263    }
     264    bool IStringConvertibleMatrix.SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     265      throw new NotSupportedException();
     266    }
     267
     268    public event EventHandler<EventArgs<IEnumerable<Position>>> ItemsChanged;
     269    protected virtual void OnItemsChanged(IEnumerable<Position> positions) {
     270      var handler = ItemsChanged;
     271      if (handler != null) handler(this, new EventArgs<IEnumerable<Position>>(positions));
    266272      OnToStringChanged();
    267273    }

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r8600 r9286  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    6060  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6161    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     62    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6363    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6464    <DebugType>full</DebugType>
    … …  
    6868  </PropertyGroup>
    6969  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    70     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     70    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7171    <DefineConstants>TRACE</DefineConstants>
    7272    <DocumentationFile>
    … …  
    8080  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8181    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     82    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8383    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8484    <DebugType>full</DebugType>
    … …  
    8888  </PropertyGroup>
    8989  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    90     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     90    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9191    <DefineConstants>TRACE</DefineConstants>
    9292    <DocumentationFile>
    … …  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.6.0.dll</HintPath>
    103       <Private>False</Private>
    104     </Reference>
    105     <Reference Include="System" />
     101    <Reference Include="ALGLIB-3.6.0">
     102      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll</HintPath>
     103      <Private>False</Private>
     104    </Reference>
     105    <Reference Include="HeuristicLab.Collections-3.3">
     106      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     107      <Private>False</Private>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Common-3.3">
     110      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     111      <Private>False</Private>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Common.Resources-3.3">
     114      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     115      <Private>False</Private>
     116    </Reference>
     117    <Reference Include="HeuristicLab.Core-3.3">
     118      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     119      <Private>False</Private>
     120    </Reference>
     121    <Reference Include="HeuristicLab.Operators-3.3">
     122      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     123      <Private>False</Private>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     126      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     127      <Private>False</Private>
     128    </Reference>
     129    <Reference Include="HeuristicLab.Parameters-3.3">
     130      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     131      <Private>False</Private>
     132    </Reference>
     133    <Reference Include="HeuristicLab.Persistence-3.3">
     134      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     135      <Private>False</Private>
     136    </Reference>
     137    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     138      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     139      <Private>False</Private>
     140    </Reference>
     141    <Reference Include="System">
     142      <Private>False</Private>
     143    </Reference>
    106144    <Reference Include="System.Core">
    107145      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    108     </Reference>
    109     <Reference Include="System.Drawing" />
     146      <Private>False</Private>
     147    </Reference>
     148    <Reference Include="System.Drawing">
     149      <Private>False</Private>
     150    </Reference>
    110151    <Reference Include="System.Xml.Linq">
    111152      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     153      <Private>False</Private>
    112154    </Reference>
    113155    <Reference Include="System.Data.DataSetExtensions">
    114156      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    115     </Reference>
    116     <Reference Include="System.Data" />
    117     <Reference Include="System.Xml" />
     157      <Private>False</Private>
     158    </Reference>
     159    <Reference Include="System.Data">
     160      <Private>False</Private>
     161    </Reference>
     162    <Reference Include="System.Xml">
     163      <Private>False</Private>
     164    </Reference>
    118165  </ItemGroup>
    119166  <ItemGroup>
    … …  
    163210  </ItemGroup>
    164211  <ItemGroup>
    165     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    166       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    167       <Name>HeuristicLab.Collections-3.3</Name>
    168       <Private>False</Private>
    169     </ProjectReference>
    170     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    171       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    172       <Name>HeuristicLab.Common.Resources-3.3</Name>
    173       <Private>False</Private>
    174     </ProjectReference>
    175     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    176       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    177       <Name>HeuristicLab.Common-3.3</Name>
    178       <Private>False</Private>
    179     </ProjectReference>
    180     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    181       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    182       <Name>HeuristicLab.Core-3.3</Name>
    183       <Private>False</Private>
    184     </ProjectReference>
    185212    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    186213      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    187214      <Name>HeuristicLab.Data-3.3</Name>
    188       <Private>False</Private>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    191       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    192       <Name>HeuristicLab.Operators-3.3</Name>
    193       <Private>False</Private>
    194     </ProjectReference>
    195     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    196       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    197       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    198215      <Private>False</Private>
    199216    </ProjectReference>
    … …  
    201218      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    202219      <Name>HeuristicLab.Optimization-3.3</Name>
    203       <Private>False</Private>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    206       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    207       <Name>HeuristicLab.Parameters-3.3</Name>
    208       <Private>False</Private>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    211       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    212       <Name>HeuristicLab.Persistence-3.3</Name>
    213       <Private>False</Private>
    214     </ProjectReference>
    215     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    216       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    217       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    218220      <Private>False</Private>
    219221    </ProjectReference>
    … …  
    245247  -->
    246248  <PropertyGroup>
    247    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     249    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    248250set ProjectDir=$(ProjectDir)
    249251set SolutionDir=$(SolutionDir)
    … …  
    252254call PreBuildEvent.cmd
    253255</PreBuildEvent>
    254 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     256    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    255257export ProjectDir=$(ProjectDir)
    256258export SolutionDir=$(SolutionDir)
Note: See TracChangeset for help on using the changeset viewer.