Free cookie consent management tool by TermsFeed Policy Generator

Changeset 9286


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:
3 added
32 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)
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

    r8833 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|x64' ">
    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|x64' ">
    70     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     70    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7171    <DefineConstants>TRACE</DefineConstants>
    7272    <DocumentationFile>
     
    8080  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    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|x86' ">
    90     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     90    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9191    <DefineConstants>TRACE</DefineConstants>
    9292    <DocumentationFile>
     
    9999  </PropertyGroup>
    100100  <ItemGroup>
     101    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     102    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     103    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     104    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     105    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     106    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    101107    <Reference Include="System" />
    102108    <Reference Include="System.Core">
     
    190196  </ItemGroup>
    191197  <ItemGroup>
    192     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    193       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    194       <Name>HeuristicLab.Common-3.3</Name>
    195       <Private>False</Private>
    196     </ProjectReference>
    197     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    198       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    199       <Name>HeuristicLab.Core.Views-3.3</Name>
    200       <Private>False</Private>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    203       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    204       <Name>HeuristicLab.Core-3.3</Name>
    205       <Private>False</Private>
    206     </ProjectReference>
    207198    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    208199      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    209200      <Name>HeuristicLab.Data-3.3</Name>
    210       <Private>False</Private>
    211     </ProjectReference>
    212     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    213       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    214       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    215       <Private>False</Private>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    218       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    219       <Name>HeuristicLab.MainForm-3.3</Name>
    220       <Private>False</Private>
    221     </ProjectReference>
    222     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    223       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    224       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    225201      <Private>False</Private>
    226202    </ProjectReference>
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

    r8833 r9286  
    8787
    8888    protected override void DeregisterContentEvents() {
    89       Content.ItemChanged -= new EventHandler<EventArgs<int, int>>(Content_ItemChanged);
     89      Content.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged);
    9090      Content.Reset -= new EventHandler(Content_Reset);
    9191      Content.ColumnNamesChanged -= new EventHandler(Content_ColumnNamesChanged);
     
    9595    protected override void RegisterContentEvents() {
    9696      base.RegisterContentEvents();
    97       Content.ItemChanged += new EventHandler<EventArgs<int, int>>(Content_ItemChanged);
     97      Content.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged);
    9898      Content.Reset += new EventHandler(Content_Reset);
    9999      Content.ColumnNamesChanged += new EventHandler(Content_ColumnNamesChanged);
     
    200200        UpdateColumnHeaders();
    201201    }
    202     private void Content_ItemChanged(object sender, EventArgs<int, int> e) {
     202    private void Content_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    203203      if (InvokeRequired)
    204         Invoke(new EventHandler<EventArgs<int, int>>(Content_ItemChanged), sender, e);
    205       else
    206         dataGridView.InvalidateCell(e.Value2, e.Value);
     204        Invoke(new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged), sender, e);
     205      else {
     206        foreach (var pos in e.Value) {
     207          dataGridView.InvalidateCell(pos.Column, pos.Row);
     208        }
     209      }
    207210    }
    208211    private void Content_Reset(object sender, EventArgs e) {
     
    373376      if (Content.Columns < values.GetLength(0) + columnIndex) Content.Columns = values.GetLength(0) + columnIndex;
    374377
     378      List<RowColumnValue> setValues = new List<RowColumnValue>(values.GetLength(0) * values.GetLength(1));
    375379      for (int row = 0; row < values.GetLength(1); row++) {
    376380        for (int col = 0; col < values.GetLength(0); col++) {
    377           Content.SetValue(values[col, row], row + rowIndex, col + columnIndex);
    378         }
    379       }
     381          setValues.Add(new RowColumnValue(new Position(row + rowIndex, col + columnIndex), values[col, row]));
     382          //Content.SetValue(values[col, row], row + rowIndex, col + columnIndex);
     383        }
     384      }
     385      Content.SetValue(setValues);
    380386      ClearSorting();
    381387    }
     
    542548        foreach (DataGridViewCell cell in dataGridView.SelectedCells) {
    543549          double value;
    544           if (!double.TryParse(cell.Value.ToString(), out value)) return;
     550          if (cell.Value == null || !double.TryParse(cell.Value.ToString(), out value)) return;
    545551          selectedValues.Add(value);
    546552        }
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/BoolMatrix.cs

    r7259 r9286  
    2020#endregion
    2121
     22using System;
    2223using System.Collections.Generic;
     24using System.Linq;
    2325using System.Text;
    2426using HeuristicLab.Common;
     
    2931  [Item("BoolMatrix", "Represents a matrix of boolean values.")]
    3032  [StorableClass]
    31   public class BoolMatrix : ValueTypeMatrix<bool>, IStringConvertibleMatrix {
     33  public class BoolMatrix : ValueTypeMatrix<bool> {
    3234    [StorableConstructor]
    3335    protected BoolMatrix(bool deserializing) : base(deserializing) { }
     
    4749    }
    4850
    49     protected virtual bool Validate(string value, out string errorMessage) {
     51    protected override bool Validate(string value, out string errorMessage) {
    5052      bool val;
    5153      bool valid = bool.TryParse(value, out val);
     
    6062      return valid;
    6163    }
    62     protected virtual string GetValue(int rowIndex, int columIndex) {
     64    protected override string GetValue(int rowIndex, int columIndex) {
    6365      return this[rowIndex, columIndex].ToString();
    6466    }
    65     protected virtual bool SetValue(string value, int rowIndex, int columnIndex) {
     67    protected override bool SetValue(string value, int rowIndex, int columnIndex) {
    6668      bool val;
    6769      if (bool.TryParse(value, out val)) {
     
    7274      }
    7375    }
    74 
    75     #region IStringConvertibleMatrix Members
    76     int IStringConvertibleMatrix.Rows {
    77       get { return Rows; }
    78       set { Rows = value; }
     76    protected override bool SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     77      if (ReadOnly) throw new NotSupportedException("Item cannot be set. StringMatrix is read-only.");
     78      List<Tuple<Position, bool>> newValues = new List<Tuple<Position, bool>>();
     79      bool parsed;
     80      foreach (var curValue in rowColumnValues) {
     81        if (bool.TryParse(curValue.Value, out parsed)) {
     82          newValues.Add(new Tuple<Position, bool>(curValue.Position, parsed));
     83        } else {
     84          return false;
     85        }
     86      }
     87      Position pos;
     88      foreach (var curValue in newValues) {
     89        pos = curValue.Item1;
     90        matrix[pos.Row, pos.Column] = curValue.Item2;
     91      }
     92      OnItemsChanged(rowColumnValues.Select(x => x.Position));
     93      return true;
    7994    }
    80     int IStringConvertibleMatrix.Columns {
    81       get { return Columns; }
    82       set { Columns = value; }
    83     }
    84     bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
    85       return Validate(value, out errorMessage);
    86     }
    87     string IStringConvertibleMatrix.GetValue(int rowIndex, int columIndex) {
    88       return GetValue(rowIndex, columIndex);
    89     }
    90     bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) {
    91       return SetValue(value, rowIndex, columnIndex);
    92     }
    93     #endregion
    9495  }
    9596}
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/DoubleMatrix.cs

    r7259 r9286  
    2020#endregion
    2121
     22using System;
    2223using System.Collections.Generic;
     24using System.Linq;
    2325using System.Text;
    2426using HeuristicLab.Common;
     
    2931  [Item("DoubleMatrix", "Represents a matrix of double values.")]
    3032  [StorableClass]
    31   public class DoubleMatrix : ValueTypeMatrix<double>, IStringConvertibleMatrix {
     33  public class DoubleMatrix : ValueTypeMatrix<double> {
    3234    [StorableConstructor]
    3335    protected DoubleMatrix(bool deserializing) : base(deserializing) { }
     
    4749    }
    4850
    49     protected virtual bool Validate(string value, out string errorMessage) {
     51    protected override bool Validate(string value, out string errorMessage) {
    5052      double val;
    5153      bool valid = double.TryParse(value, out val);
     
    6062      return valid;
    6163    }
    62     protected virtual string GetValue(int rowIndex, int columIndex) {
     64    protected override string GetValue(int rowIndex, int columIndex) {
    6365      return this[rowIndex, columIndex].ToString();
    6466    }
    65     protected virtual bool SetValue(string value, int rowIndex, int columnIndex) {
     67    protected override bool SetValue(string value, int rowIndex, int columnIndex) {
    6668      double val;
    6769      if (double.TryParse(value, out val)) {
     
    7274      }
    7375    }
    74 
    75     #region IStringConvertibleMatrix Members
    76     int IStringConvertibleMatrix.Rows {
    77       get { return Rows; }
    78       set { Rows = value; }
     76    protected override bool SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     77      if (ReadOnly) throw new NotSupportedException("Item cannot be set. StringMatrix is read-only.");
     78      List<Tuple<Position, double>> newValues = new List<Tuple<Position, double>>();
     79      double parsed;
     80      foreach (var curValue in rowColumnValues) {
     81        if (double.TryParse(curValue.Value, out parsed)) {
     82          newValues.Add(new Tuple<Position, double>(curValue.Position, parsed));
     83        } else {
     84          return false;
     85        }
     86      }
     87      Position pos;
     88      foreach (var curValue in newValues) {
     89        pos = curValue.Item1;
     90        matrix[pos.Row, pos.Column] = curValue.Item2;
     91      }
     92      OnItemsChanged(rowColumnValues.Select(x => x.Position));
     93      return true;
    7994    }
    80     int IStringConvertibleMatrix.Columns {
    81       get { return Columns; }
    82       set { Columns = value; }
    83     }
    84     bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
    85       return Validate(value, out errorMessage);
    86     }
    87     string IStringConvertibleMatrix.GetValue(int rowIndex, int columIndex) {
    88       return GetValue(rowIndex, columIndex);
    89     }
    90     bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) {
    91       return SetValue(value, rowIndex, columnIndex);
    92     }
    93     #endregion
    9495  }
    9596}
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/HeuristicLab.Data-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>
     
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     54    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
     
    6363  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6464    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     65    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6666    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6767    <DebugType>full</DebugType>
     
    7171  </PropertyGroup>
    7272  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7474    <DefineConstants>TRACE</DefineConstants>
    7575    <DocumentationFile>
     
    8383  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8484    <DebugSymbols>true</DebugSymbols>
    85     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     85    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8686    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8787    <DebugType>full</DebugType>
     
    9191  </PropertyGroup>
    9292  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    93     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     93    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9494    <DefineConstants>TRACE</DefineConstants>
    9595    <DocumentationFile>
     
    102102  </PropertyGroup>
    103103  <ItemGroup>
     104    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     105      <Private>False</Private>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     108      <Private>False</Private>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <Private>False</Private>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     114      <Private>False</Private>
     115    </Reference>
     116    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     117      <Private>False</Private>
     118    </Reference>
    104119    <Reference Include="System" />
    105120    <Reference Include="System.Core">
     
    146161  </ItemGroup>
    147162  <ItemGroup>
    148     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    149       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    150       <Name>HeuristicLab.Common.Resources-3.3</Name>
    151       <Private>False</Private>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    154       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    155       <Name>HeuristicLab.Common-3.3</Name>
    156       <Private>False</Private>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    159       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    160       <Name>HeuristicLab.Core-3.3</Name>
    161       <Private>False</Private>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    164       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    165       <Name>HeuristicLab.Persistence-3.3</Name>
    166       <Private>False</Private>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    169       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    170       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    171       <Private>False</Private>
    172     </ProjectReference>
    173   </ItemGroup>
    174   <ItemGroup>
    175163    <None Include="HeuristicLab.snk" />
    176164    <None Include="Properties\AssemblyInfo.cs.frame" />
     
    212200  -->
    213201  <PropertyGroup>
    214    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     202    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    215203set ProjectDir=$(ProjectDir)
    216204set SolutionDir=$(SolutionDir)
     
    219207call PreBuildEvent.cmd
    220208</PreBuildEvent>
    221 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     209    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    222210export ProjectDir=$(ProjectDir)
    223211export SolutionDir=$(SolutionDir)
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/IntMatrix.cs

    r7259 r9286  
    2020#endregion
    2121
     22using System;
    2223using System.Collections.Generic;
     24using System.Linq;
    2325using System.Text;
    2426using HeuristicLab.Common;
     
    2931  [Item("IntMatrix", "Represents a matrix of integer values.")]
    3032  [StorableClass]
    31   public class IntMatrix : ValueTypeMatrix<int>, IStringConvertibleMatrix {
     33  public class IntMatrix : ValueTypeMatrix<int> {
    3234    [StorableConstructor]
    3335    protected IntMatrix(bool deserializing) : base(deserializing) { }
     
    3840    public IntMatrix(int rows, int columns) : base(rows, columns) { }
    3941    public IntMatrix(int rows, int columns, IEnumerable<string> columnNames) : base(rows, columns, columnNames) { }
    40     public IntMatrix(int rows, int columns, IEnumerable<string> columnNames,IEnumerable<string> rowNames) : base(rows, columns, columnNames,rowNames) { }
     42    public IntMatrix(int rows, int columns, IEnumerable<string> columnNames, IEnumerable<string> rowNames) : base(rows, columns, columnNames, rowNames) { }
    4143    public IntMatrix(int[,] elements) : base(elements) { }
    42     public IntMatrix(int[,] elements, IEnumerable<string> columnNames) : base(elements,columnNames) { }
    43     public IntMatrix(int[,] elements, IEnumerable<string> columnNames, IEnumerable<string> rowNames) : base(elements,columnNames,rowNames) { }
     44    public IntMatrix(int[,] elements, IEnumerable<string> columnNames) : base(elements, columnNames) { }
     45    public IntMatrix(int[,] elements, IEnumerable<string> columnNames, IEnumerable<string> rowNames) : base(elements, columnNames, rowNames) { }
    4446
    4547    public override IDeepCloneable Clone(Cloner cloner) {
     
    4749    }
    4850
    49     protected virtual bool Validate(string value, out string errorMessage) {
     51    protected override bool Validate(string value, out string errorMessage) {
    5052      int val;
    5153      bool valid = int.TryParse(value, out val);
     
    6062      return valid;
    6163    }
    62     protected virtual string GetValue(int rowIndex, int columIndex) {
     64    protected override string GetValue(int rowIndex, int columIndex) {
    6365      return this[rowIndex, columIndex].ToString();
    6466    }
    65     protected virtual bool SetValue(string value, int rowIndex, int columnIndex) {
     67    protected override bool SetValue(string value, int rowIndex, int columnIndex) {
    6668      int val;
    6769      if (int.TryParse(value, out val)) {
     
    7274      }
    7375    }
    74 
    75     #region IStringConvertibleMatrix Members
    76     int IStringConvertibleMatrix.Rows {
    77       get { return Rows; }
    78       set { Rows = value; }
     76    protected override bool SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     77      if (ReadOnly) throw new NotSupportedException("Item cannot be set. StringMatrix is read-only.");
     78      List<Tuple<Position, int>> newValues = new List<Tuple<Position, int>>();
     79      int parsed;
     80      foreach (var curValue in rowColumnValues) {
     81        if (int.TryParse(curValue.Value, out parsed)) {
     82          newValues.Add(new Tuple<Position, int>(curValue.Position, parsed));
     83        } else {
     84          return false;
     85        }
     86      }
     87      Position pos;
     88      foreach (var curValue in newValues) {
     89        pos = curValue.Item1;
     90        matrix[pos.Row, pos.Column] = curValue.Item2;
     91      }
     92      OnItemsChanged(rowColumnValues.Select(x => x.Position));
     93      return true;
    7994    }
    80     int IStringConvertibleMatrix.Columns {
    81       get { return Columns; }
    82       set { Columns = value; }
    83     }
    84     bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
    85       return Validate(value, out errorMessage);
    86     }
    87     string IStringConvertibleMatrix.GetValue(int rowIndex, int columIndex) {
    88       return GetValue(rowIndex, columIndex);
    89     }
    90     bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) {
    91       return SetValue(value, rowIndex, columnIndex);
    92     }
    93     #endregion
    9495  }
    9596}
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/Interfaces/IStringConvertibleMatrix.cs

    r7259 r9286  
    3737    string GetValue(int rowIndex, int columnIndex);
    3838    bool SetValue(string value, int rowIndex, int columnIndex);
     39    bool SetValue(RowColumnValue rowColumnValue);
     40    bool SetValue(IEnumerable<RowColumnValue> rowColumnValues);
    3941
    4042    event EventHandler ColumnsChanged;
     
    4345    event EventHandler RowNamesChanged;
    4446    event EventHandler SortableViewChanged;
    45     event EventHandler<EventArgs<int, int>> ItemChanged;
     47    event EventHandler<EventArgs<IEnumerable<Position>>> ItemsChanged;
    4648    event EventHandler Reset;
     49  }
     50  public struct Position {
     51    public readonly int Row, Column;
     52    public Position(int row, int column) {
     53      Row = row;
     54      Column = column;
     55    }
     56  }
     57  public struct RowColumnValue {
     58    public readonly Position Position;
     59    public readonly string Value;
    4760
     61    public RowColumnValue(Position position, string value) {
     62      Position = position;
     63      Value = value;
     64    }
    4865  }
    4966}
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/StringMatrix.cs

    r7259 r9286  
    128128          if ((value != null) || (matrix[rowIndex, columnIndex] != string.Empty)) {
    129129            matrix[rowIndex, columnIndex] = value != null ? value : string.Empty;
    130             OnItemChanged(rowIndex, columnIndex);
     130            OnItemsChanged(new List<Position>(1) { new Position(rowIndex, columnIndex) });
    131131          }
    132132        }
     
    250250      }
    251251    }
     252    protected virtual bool SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     253      if (ReadOnly) throw new NotSupportedException("Item cannot be set. StringMatrix is read-only.");
     254      if (rowColumnValues.Any(x => x.Value == null)) { return false; }
     255      Position pos;
     256      foreach (var curValue in rowColumnValues) {
     257        pos = curValue.Position;
     258        matrix[pos.Row, pos.Column] = curValue.Value;
     259      }
     260      OnItemsChanged(rowColumnValues.Select(x => x.Position));
     261      return true;
     262    }
    252263
    253264    #region events
     
    282293        handler(this, EventArgs.Empty);
    283294    }
    284     public event EventHandler<EventArgs<int, int>> ItemChanged;
    285     protected virtual void OnItemChanged(int rowIndex, int columnIndex) {
    286       if (ItemChanged != null)
    287         ItemChanged(this, new EventArgs<int, int>(rowIndex, columnIndex));
     295    public event EventHandler<EventArgs<IEnumerable<Position>>> ItemsChanged;
     296    protected virtual void OnItemsChanged(IEnumerable<Position> positions) {
     297      if (ItemsChanged != null)
     298        ItemsChanged(this, new EventArgs<IEnumerable<Position>>(positions));
    288299      OnToStringChanged();
    289300    }
     
    314325      return SetValue(value, rowIndex, columnIndex);
    315326    }
     327    public bool SetValue(RowColumnValue rowColumnValue) {
     328      return SetValue(rowColumnValue.Value, rowColumnValue.Position.Row, rowColumnValue.Position.Column);
     329    }
     330    bool IStringConvertibleMatrix.SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     331      return SetValue(rowColumnValues);
     332    }
    316333    #endregion
    317334  }
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/ValueTypeMatrix.cs

    r7259 r9286  
    3333  [Item("ValueTypeMatrix", "An abstract base class for representing matrices of value types.")]
    3434  [StorableClass]
    35   public abstract class ValueTypeMatrix<T> : Item, IEnumerable<T> where T : struct {
     35  public abstract class ValueTypeMatrix<T> : Item, IEnumerable<T>, IStringConvertibleMatrix where T : struct {
    3636    public static new Image StaticItemImage {
    3737      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
     
    127127        if (!value.Equals(matrix[rowIndex, columnIndex])) {
    128128          matrix[rowIndex, columnIndex] = value;
    129           OnItemChanged(rowIndex, columnIndex);
     129          OnItemsChanged(new List<Position>(1) { new Position(rowIndex, columnIndex) });
    130130        }
    131131      }
     
    247247        handler(this, EventArgs.Empty);
    248248    }
    249     public event EventHandler<EventArgs<int, int>> ItemChanged;
    250     protected virtual void OnItemChanged(int rowIndex, int columnIndex) {
    251       if (ItemChanged != null)
    252         ItemChanged(this, new EventArgs<int, int>(rowIndex, columnIndex));
     249    public event EventHandler<EventArgs<IEnumerable<Position>>> ItemsChanged;
     250    protected virtual void OnItemsChanged(IEnumerable<Position> positions) {
     251      if (ItemsChanged != null)
     252        ItemsChanged(this, new EventArgs<IEnumerable<Position>>(positions));
    253253      OnToStringChanged();
    254254    }
     
    260260    }
    261261    #endregion
     262
     263    protected abstract bool Validate(string value, out string errorMessage);
     264    protected abstract bool SetValue(string value, int rowIndex, int columnIndex);
     265    protected abstract string GetValue(int rowIndex, int columIndex);
     266    protected abstract bool SetValue(IEnumerable<RowColumnValue> rowColumnValues);
     267
     268    #region IStringConvertibleMatrix Members
     269    int IStringConvertibleMatrix.Rows {
     270      get { return Rows; }
     271      set { Rows = value; }
     272    }
     273    int IStringConvertibleMatrix.Columns {
     274      get { return Columns; }
     275      set { Columns = value; }
     276    }
     277
     278    bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
     279      return Validate(value, out errorMessage);
     280    }
     281    string IStringConvertibleMatrix.GetValue(int rowIndex, int columnIndex) {
     282      return GetValue(rowIndex, columnIndex);
     283    }
     284    bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) {
     285      return SetValue(value, rowIndex, columnIndex);
     286    }
     287
     288    bool IStringConvertibleMatrix.SetValue(RowColumnValue rowColumnValue) {
     289      return SetValue(rowColumnValue.Value, rowColumnValue.Position.Row, rowColumnValue.Position.Column);
     290    }
     291
     292    bool IStringConvertibleMatrix.SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     293      return SetValue(rowColumnValues);
     294    }
     295    #endregion
    262296  }
    263297}
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r9079 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="HeuristicLab.Collections-3.3">
     102      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     103      <Private>False</Private>
     104    </Reference>
     105    <Reference Include="HeuristicLab.Common-3.3">
     106      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     107      <Private>False</Private>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Common.Resources-3.3">
     110      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     111      <Private>False</Private>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Core-3.3">
     114      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     115      <Private>False</Private>
     116    </Reference>
     117    <Reference Include="HeuristicLab.Parameters-3.3">
     118      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     119      <Private>False</Private>
     120    </Reference>
     121    <Reference Include="HeuristicLab.Persistence-3.3">
     122      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     123      <Private>False</Private>
     124    </Reference>
     125    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     126      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     127      <Private>False</Private>
     128    </Reference>
    101129    <Reference Include="System" />
    102130    <Reference Include="System.Core">
     
    214242  </ItemGroup>
    215243  <ItemGroup>
    216     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    217       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    218       <Name>HeuristicLab.Collections-3.3</Name>
    219       <Private>False</Private>
    220     </ProjectReference>
    221     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    222       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    223       <Name>HeuristicLab.Common.Resources-3.3</Name>
    224       <Private>False</Private>
    225     </ProjectReference>
    226     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    227       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    228       <Name>HeuristicLab.Common-3.3</Name>
    229       <Private>False</Private>
    230     </ProjectReference>
    231     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    232       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    233       <Name>HeuristicLab.Core-3.3</Name>
    234       <Private>False</Private>
    235     </ProjectReference>
    236244    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    237245      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    238246      <Name>HeuristicLab.Data-3.3</Name>
    239       <Private>False</Private>
    240     </ProjectReference>
    241     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    242       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    243       <Name>HeuristicLab.Parameters-3.3</Name>
    244       <Private>False</Private>
    245     </ProjectReference>
    246     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    247       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    248       <Name>HeuristicLab.Persistence-3.3</Name>
    249       <Private>False</Private>
    250     </ProjectReference>
    251     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    252       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    253       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    254247      <Private>False</Private>
    255248    </ProjectReference>
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Optimization/3.3/RunCollection.cs

    r8967 r9286  
    324324    }
    325325
    326     public event EventHandler<EventArgs<int, int>> ItemChanged;
    327     protected virtual void OnItemChanged(int rowIndex, int columnIndex) {
    328       EventHandler<EventArgs<int, int>> handler = ItemChanged;
    329       if (handler != null) handler(this, new EventArgs<int, int>(rowIndex, columnIndex));
     326    public event EventHandler<EventArgs<IEnumerable<Position>>> ItemsChanged;
     327    protected virtual void OnItemsChanged(int rowIndex, int columnIndex) {
     328      EventHandler<EventArgs<IEnumerable<Position>>> handler = ItemsChanged;
     329      if (handler != null) handler(this, new EventArgs<IEnumerable<Position>>(new List<Position>(1) { new Position(rowIndex, columnIndex) }));
    330330      OnToStringChanged();
    331331    }
     
    364364    public bool Validate(string value, out string errorMessage) { throw new NotSupportedException(); }
    365365    public bool SetValue(string value, int rowIndex, int columnIndex) { throw new NotSupportedException(); }
     366    public bool SetValue(RowColumnValue rowColumnValue) { throw new NotSupportedException(); }
     367    public bool SetValue(IEnumerable<RowColumnValue> rowColumnValues) { throw new NotSupportedException(); }
    366368    #endregion
    367369
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.ArtificialAnt/3.4/AntTrail.cs

    r7259 r9286  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using System.Drawing;
    2425using HeuristicLab.Common;
     
    140141
    141142    private void RegisterWorldEvents() {
    142       World.ItemChanged += new EventHandler<EventArgs<int, int>>(World_ItemChanged);
     143      World.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(World_ItemChanged);
    143144      World.Reset += new EventHandler(World_Reset);
    144145    }
    145146    private void DeregisterWorldEvents() {
    146       World.ItemChanged -= new EventHandler<EventArgs<int, int>>(World_ItemChanged);
     147      World.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(World_ItemChanged);
    147148      World.Reset -= new EventHandler(World_Reset);
    148149    }
     
    157158      OnMaxTimeStepsChanged();
    158159    }
    159     private void World_ItemChanged(object sender, EventArgs<int, int> e) {
     160    private void World_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    160161      OnWorldChanged();
    161162    }
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.ArtificialAnt/3.4/HeuristicLab.Problems.ArtificialAnt-3.4.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>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     60    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     68    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     78    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     86    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    9393  </PropertyGroup>
    9494  <ItemGroup>
     95    <Reference Include="HeuristicLab.Collections-3.3">
     96      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     97      <Private>False</Private>
     98    </Reference>
     99    <Reference Include="HeuristicLab.Common-3.3">
     100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     101      <Private>False</Private>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Common.Resources-3.3">
     104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     105      <Private>False</Private>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Core-3.3">
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
     112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     113      <Private>False</Private>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Operators-3.3">
     116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     117      <Private>False</Private>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Parameters-3.3">
     120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Persistence-3.3">
     124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
     127    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
    95131    <Reference Include="System" />
    96132    <Reference Include="System.Core">
     
    130166  </ItemGroup>
    131167  <ItemGroup>
    132     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    133       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    134       <Name>HeuristicLab.Collections-3.3</Name>
    135       <Private>False</Private>
    136     </ProjectReference>
    137     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    138       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    139       <Name>HeuristicLab.Common.Resources-3.3</Name>
    140       <Private>False</Private>
    141     </ProjectReference>
    142     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    143       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    144       <Name>HeuristicLab.Common-3.3</Name>
    145       <Private>False</Private>
    146     </ProjectReference>
    147     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    148       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    149       <Name>HeuristicLab.Core-3.3</Name>
    150       <Private>False</Private>
    151     </ProjectReference>
    152168    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    153169      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    154170      <Name>HeuristicLab.Data-3.3</Name>
    155       <Private>False</Private>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    158       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    159       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    160       <Private>False</Private>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    163       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    164       <Name>HeuristicLab.Operators-3.3</Name>
    165171      <Private>False</Private>
    166172    </ProjectReference>
     
    168174      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    169175      <Name>HeuristicLab.Optimization-3.3</Name>
    170       <Private>False</Private>
    171     </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    173       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    174       <Name>HeuristicLab.Parameters-3.3</Name>
    175       <Private>False</Private>
    176     </ProjectReference>
    177     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    178       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    179       <Name>HeuristicLab.Persistence-3.3</Name>
    180       <Private>False</Private>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    183       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    184       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    185176      <Private>False</Private>
    186177    </ProjectReference>
     
    212203  -->
    213204  <PropertyGroup>
    214    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     205    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    215206set ProjectDir=$(ProjectDir)
    216207set SolutionDir=$(SolutionDir)
     
    219210call PreBuildEvent.cmd
    220211</PreBuildEvent>
    221 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     212    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    222213export ProjectDir=$(ProjectDir)
    223214export SolutionDir=$(SolutionDir)
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

    r9217 r9286  
    234234      throw new NotSupportedException();
    235235    }
     236    public bool SetValue(RowColumnValue rowColumnValue) {
     237      throw new NotSupportedException();
     238    }
     239    public bool SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
     240      throw new NotSupportedException();
     241    }
    236242
    237243    public event EventHandler ColumnsChanged { add { } remove { } }
     
    240246    public event EventHandler RowNamesChanged { add { } remove { } }
    241247    public event EventHandler SortableViewChanged { add { } remove { } }
    242     public event EventHandler<EventArgs<int, int>> ItemChanged { add { } remove { } }
     248    public event EventHandler<EventArgs<IEnumerable<Position>>> ItemsChanged { add { } remove { } }
    243249    public event EventHandler Reset { add { } remove { } }
    244250    #endregion
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r8861 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>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     60    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     68    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     78    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     86    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    96       <HintPath>..\..\bin\ALGLIB-3.6.0.dll</HintPath>
    97       <Private>False</Private>
    98     </Reference>
    99     <Reference Include="HeuristicLab.ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    100       <HintPath>..\..\bin\HeuristicLab.ALGLIB-3.6.0.dll</HintPath>
     95    <Reference Include="ALGLIB-3.6.0">
     96      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll</HintPath>
     97      <Private>False</Private>
     98    </Reference>
     99    <Reference Include="HeuristicLab.ALGLIB-3.6.0">
     100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.ALGLIB-3.6.0.dll</HintPath>
     101      <Private>False</Private>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Collections-3.3">
     104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     105      <Private>False</Private>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Common-3.3">
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Common.Resources-3.3">
     112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     113      <Private>False</Private>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Core-3.3">
     116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     117      <Private>False</Private>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Parameters-3.3">
     120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Persistence-3.3">
     124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
     127    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    101133      <Private>False</Private>
    102134    </Reference>
     
    239271  </ItemGroup>
    240272  <ItemGroup>
    241     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    242       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    243       <Name>HeuristicLab.Collections-3.3</Name>
    244       <Private>False</Private>
    245     </ProjectReference>
    246     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    247       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    248       <Name>HeuristicLab.Common.Resources-3.3</Name>
    249       <Private>False</Private>
    250     </ProjectReference>
    251     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    252       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    253       <Name>HeuristicLab.Common-3.3</Name>
    254       <Private>False</Private>
    255     </ProjectReference>
    256     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    257       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    258       <Name>HeuristicLab.Core-3.3</Name>
    259       <Private>False</Private>
    260     </ProjectReference>
    261273    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    262274      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     
    267279      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    268280      <Name>HeuristicLab.Optimization-3.3</Name>
    269       <Private>False</Private>
    270     </ProjectReference>
    271     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    272       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    273       <Name>HeuristicLab.Parameters-3.3</Name>
    274       <Private>False</Private>
    275     </ProjectReference>
    276     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    277       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    278       <Name>HeuristicLab.Persistence-3.3</Name>
    279       <Private>False</Private>
    280     </ProjectReference>
    281     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    282       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    283       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    284       <Private>False</Private>
    285     </ProjectReference>
    286     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    287       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    288       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    289281      <Private>False</Private>
    290282    </ProjectReference>
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r8877 r9286  
    383383      TargetVariableParameter.ValueChanged += new EventHandler(TargetVariableParameter_ValueChanged);
    384384      ClassNamesParameter.Value.Reset += new EventHandler(Parameter_ValueChanged);
    385       ClassNamesParameter.Value.ItemChanged += new EventHandler<EventArgs<int, int>>(Parameter_ValueChanged);
    386       ClassificationPenaltiesParameter.Value.ItemChanged += new EventHandler<EventArgs<int, int>>(Parameter_ValueChanged);
     385      ClassNamesParameter.Value.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Parameter_ValueChanged);
     386      ClassificationPenaltiesParameter.Value.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Parameter_ValueChanged);
    387387      ClassificationPenaltiesParameter.Value.Reset += new EventHandler(Parameter_ValueChanged);
    388388    }
     
    390390      TargetVariableParameter.ValueChanged -= new EventHandler(TargetVariableParameter_ValueChanged);
    391391      ClassNamesParameter.Value.Reset -= new EventHandler(Parameter_ValueChanged);
    392       ClassNamesParameter.Value.ItemChanged -= new EventHandler<EventArgs<int, int>>(Parameter_ValueChanged);
    393       ClassificationPenaltiesParameter.Value.ItemChanged -= new EventHandler<EventArgs<int, int>>(Parameter_ValueChanged);
     392      ClassNamesParameter.Value.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Parameter_ValueChanged);
     393      ClassificationPenaltiesParameter.Value.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Parameter_ValueChanged);
    394394      ClassificationPenaltiesParameter.Value.Reset -= new EventHandler(Parameter_ValueChanged);
    395395    }
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

    r9029 r9286  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     20    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
     
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     28    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
     
    3939  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4040    <DebugSymbols>true</DebugSymbols>
    41     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     41    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4242    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4343    <DebugType>full</DebugType>
     
    5454  </PropertyGroup>
    5555  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    56     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     56    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5757    <DefineConstants>TRACE</DefineConstants>
    5858    <Optimize>true</Optimize>
     
    7070  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7171    <DebugSymbols>true</DebugSymbols>
    72     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     72    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7373    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7474    <DebugType>full</DebugType>
     
    8585  </PropertyGroup>
    8686  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    87     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     87    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8888    <DefineConstants>TRACE</DefineConstants>
    8989    <Optimize>true</Optimize>
     
    102102  </PropertyGroup>
    103103  <ItemGroup>
     104    <Reference Include="HeuristicLab.Collections-3.3">
     105      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     106      <Private>False</Private>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Common-3.3">
     109      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     110      <Private>False</Private>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Common.Resources-3.3">
     113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     114      <Private>False</Private>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Core-3.3">
     117      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     118      <Private>False</Private>
     119    </Reference>
     120    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     121      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     122      <Private>False</Private>
     123    </Reference>
     124    <Reference Include="HeuristicLab.Operators-3.3">
     125      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     126      <Private>False</Private>
     127    </Reference>
     128    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     129      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     130      <Private>False</Private>
     131    </Reference>
     132    <Reference Include="HeuristicLab.Parameters-3.3">
     133      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     134      <Private>False</Private>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Persistence-3.3">
     137      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     138      <Private>False</Private>
     139    </Reference>
     140    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     141      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     142      <Private>False</Private>
     143    </Reference>
     144    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     145      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     146      <Private>False</Private>
     147    </Reference>
     148    <Reference Include="HeuristicLab.Problems.LinearAssignment-3.3">
     149      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.LinearAssignment-3.3.dll</HintPath>
     150      <Private>False</Private>
     151    </Reference>
    104152    <Reference Include="System" />
    105153    <Reference Include="System.Core" />
     
    147195      <Private>False</Private>
    148196    </ProjectReference>
    149     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    150       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    151       <Name>HeuristicLab.Collections-3.3</Name>
    152       <Private>False</Private>
    153     </ProjectReference>
    154     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    155       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    156       <Name>HeuristicLab.Common.Resources-3.3</Name>
    157       <Private>False</Private>
    158     </ProjectReference>
    159     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    160       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    161       <Name>HeuristicLab.Common-3.3</Name>
    162       <Private>False</Private>
    163     </ProjectReference>
    164     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    165       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    166       <Name>HeuristicLab.Core-3.3</Name>
    167       <Private>False</Private>
    168     </ProjectReference>
    169197    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    170198      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    171199      <Name>HeuristicLab.Data-3.3</Name>
    172       <Private>False</Private>
    173     </ProjectReference>
    174     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    175       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    176       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    177       <Private>False</Private>
    178     </ProjectReference>
    179     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    180       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    181       <Name>HeuristicLab.Operators-3.3</Name>
    182       <Private>False</Private>
    183     </ProjectReference>
    184     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    185       <Project>{25087811-f74c-4128-bc86-8324271da13e}</Project>
    186       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    187200      <Private>False</Private>
    188201    </ProjectReference>
     
    191204      <Name>HeuristicLab.Optimization-3.3</Name>
    192205      <Private>False</Private>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    195       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    196       <Name>HeuristicLab.Parameters-3.3</Name>
    197       <Private>False</Private>
    198     </ProjectReference>
    199     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    200       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    201       <Name>HeuristicLab.Persistence-3.3</Name>
    202       <Private>False</Private>
    203     </ProjectReference>
    204     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    205       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    206       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    207       <Private>False</Private>
    208     </ProjectReference>
    209     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    210       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    211       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    212       <Private>False</Private>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Problems.LinearAssignment\3.3\HeuristicLab.Problems.LinearAssignment-3.3.csproj">
    215       <Project>{7250653F-DE83-4069-8D34-8050E8E45EA1}</Project>
    216       <Name>HeuristicLab.Problems.LinearAssignment-3.3</Name>
    217206    </ProjectReference>
    218207  </ItemGroup>
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

    r8720 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>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     60    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     68    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     78    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     86    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="System" />
     95    <Reference Include="HeuristicLab.Collections-3.3">
     96      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     97      <Private>False</Private>
     98    </Reference>
     99    <Reference Include="HeuristicLab.Common-3.3">
     100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     101      <Private>False</Private>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Common.Resources-3.3">
     104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     105      <Private>False</Private>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Core-3.3">
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
     112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     113      <Private>False</Private>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Operators-3.3">
     116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     117      <Private>False</Private>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Parameters-3.3">
     124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
     127    <Reference Include="HeuristicLab.Persistence-3.3">
     128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
     131    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     133      <Private>False</Private>
     134    </Reference>
     135    <Reference Include="System">
     136      <Private>False</Private>
     137    </Reference>
    96138    <Reference Include="System.Core">
    97139      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    98     </Reference>
    99     <Reference Include="System.Drawing" />
     140      <Private>False</Private>
     141    </Reference>
     142    <Reference Include="System.Drawing">
     143      <Private>False</Private>
     144    </Reference>
    100145    <Reference Include="System.Xml.Linq">
    101146      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     147      <Private>False</Private>
    102148    </Reference>
    103149    <Reference Include="System.Data.DataSetExtensions">
    104150      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    105     </Reference>
    106     <Reference Include="System.Data" />
    107     <Reference Include="System.Xml" />
     151      <Private>False</Private>
     152    </Reference>
     153    <Reference Include="System.Data">
     154      <Private>False</Private>
     155    </Reference>
     156    <Reference Include="System.Xml">
     157      <Private>False</Private>
     158    </Reference>
    108159  </ItemGroup>
    109160  <ItemGroup>
     
    165216      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    166217      <Name>HeuristicLab.Analysis-3.3</Name>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    169       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    170       <Name>HeuristicLab.Collections-3.3</Name>
    171       <Private>False</Private>
    172     </ProjectReference>
    173     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    174       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    175       <Name>HeuristicLab.Common.Resources-3.3</Name>
    176       <Private>False</Private>
    177     </ProjectReference>
    178     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    179       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    180       <Name>HeuristicLab.Common-3.3</Name>
    181       <Private>False</Private>
    182     </ProjectReference>
    183     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    184       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    185       <Name>HeuristicLab.Core-3.3</Name>
    186218      <Private>False</Private>
    187219    </ProjectReference>
     
    191223      <Private>False</Private>
    192224    </ProjectReference>
    193     <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
    194       <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
    195       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    196       <Private>False</Private>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    199       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    200       <Name>HeuristicLab.Operators-3.3</Name>
    201       <Private>False</Private>
    202     </ProjectReference>
    203     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    204       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    205       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    206     </ProjectReference>
    207225    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    208226      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    209227      <Name>HeuristicLab.Optimization-3.3</Name>
    210       <Private>False</Private>
    211     </ProjectReference>
    212     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    213       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    214       <Name>HeuristicLab.Parameters-3.3</Name>
    215       <Private>False</Private>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    218       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    219       <Name>HeuristicLab.Persistence-3.3</Name>
    220       <Private>False</Private>
    221     </ProjectReference>
    222     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    223       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    224       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    225228      <Private>False</Private>
    226229    </ProjectReference>
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

    r9258 r9286  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Linq;
    2225using HeuristicLab.Analysis;
    2326using HeuristicLab.Common;
     
    2932using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3033using HeuristicLab.PluginInfrastructure;
    31 using System;
    32 using System.Collections.Generic;
    33 using System.Linq;
    3434
    3535namespace HeuristicLab.Problems.TestFunctions {
     
    183183      UpdateStrategyVectorBounds();
    184184    }
    185     private void Bounds_ItemChanged(object sender, EventArgs<int, int> e) {
    186       if (e.Value2 == 0 && Bounds[e.Value, 1] <= Bounds[e.Value, 0])
    187         Bounds[e.Value, 1] = Bounds[e.Value, 0] + 0.1;
    188       if (e.Value2 == 1 && Bounds[e.Value, 0] >= Bounds[e.Value, 1])
    189         Bounds[e.Value, 0] = Bounds[e.Value, 1] - 0.1;
     185    private void Bounds_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
     186      foreach (var pos in e.Value) {
     187        if (pos.Column == 0 && Bounds[pos.Row, 1] <= Bounds[pos.Row, 0])
     188          Bounds[pos.Row, 1] = Bounds[pos.Row, 0] + 0.1;
     189        if (pos.Column == 1 && Bounds[pos.Row, 0] >= Bounds[pos.Row, 1])
     190          Bounds[pos.Row, 0] = Bounds[pos.Row, 1] - 0.1;
     191      }
    190192      ParameterizeOperators();
    191193      UpdateStrategyVectorBounds();
     
    240242      BoundsParameter.ValueChanged += new EventHandler(BoundsParameter_ValueChanged);
    241243      Bounds.ToStringChanged += new EventHandler(Bounds_ToStringChanged);
    242       Bounds.ItemChanged += new EventHandler<EventArgs<int, int>>(Bounds_ItemChanged);
     244      Bounds.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Bounds_ItemChanged);
    243245      SolutionCreator.RealVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_RealVectorParameter_ActualNameChanged);
    244246      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionSolution.cs

    r7259 r9286  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using System.Drawing;
    2425using HeuristicLab.Collections;
     
    236237    }
    237238    private void RegisterBoundsEvents() {
    238       Bounds.ItemChanged += new EventHandler<EventArgs<int, int>>(Bounds_ItemChanged);
     239      Bounds.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Bounds_ItemChanged);
    239240      Bounds.Reset += new EventHandler(Bounds_Reset);
    240241    }
    241242    private void DeregisterBoundsEvents() {
    242       Bounds.ItemChanged -= new EventHandler<EventArgs<int, int>>(Bounds_ItemChanged);
     243      Bounds.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Bounds_ItemChanged);
    243244      Bounds.Reset -= new EventHandler(Bounds_Reset);
    244245    }
     
    268269      OnPopulationChanged();
    269270    }
    270     private void Bounds_ItemChanged(object sender, EventArgs<int, int> e) {
     271    private void Bounds_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    271272      OnBoundsChanged();
    272273    }
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-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>
     
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     54    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
     
    6363  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6464    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     65    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6666    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6767    <DebugType>full</DebugType>
     
    7171  </PropertyGroup>
    7272  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7474    <DefineConstants>TRACE</DefineConstants>
    7575    <DocumentationFile>
     
    8383  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8484    <DebugSymbols>true</DebugSymbols>
    85     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     85    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8686    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8787    <DebugType>full</DebugType>
     
    9191  </PropertyGroup>
    9292  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    93     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     93    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9494    <DefineConstants>TRACE</DefineConstants>
    9595    <DocumentationFile>
     
    102102  </PropertyGroup>
    103103  <ItemGroup>
     104    <Reference Include="HeuristicLab.Collections-3.3">
     105      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     106      <Private>False</Private>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Common-3.3">
     109      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     110      <Private>False</Private>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Common.Resources-3.3">
     113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     114      <Private>False</Private>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Core-3.3">
     117      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     118      <Private>False</Private>
     119    </Reference>
     120    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     121      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     122      <Private>False</Private>
     123    </Reference>
     124    <Reference Include="HeuristicLab.Operators-3.3">
     125      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     126      <Private>False</Private>
     127    </Reference>
     128    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     129      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     130      <Private>False</Private>
     131    </Reference>
     132    <Reference Include="HeuristicLab.Parameters-3.3">
     133      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     134      <Private>False</Private>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Persistence-3.3">
     137      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     138      <Private>False</Private>
     139    </Reference>
     140    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     141      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     142      <Private>False</Private>
     143    </Reference>
     144    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     145      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     146      <Private>False</Private>
     147    </Reference>
    104148    <Reference Include="System" />
    105149    <Reference Include="System.Core">
     
    154198      <Private>False</Private>
    155199    </ProjectReference>
    156     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    157       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    158       <Name>HeuristicLab.Collections-3.3</Name>
    159       <Private>False</Private>
    160     </ProjectReference>
    161     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    162       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    163       <Name>HeuristicLab.Common.Resources-3.3</Name>
    164       <Private>False</Private>
    165     </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    167       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    168       <Name>HeuristicLab.Common-3.3</Name>
    169       <Private>False</Private>
    170     </ProjectReference>
    171     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    172       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    173       <Name>HeuristicLab.Core-3.3</Name>
    174       <Private>False</Private>
    175     </ProjectReference>
    176200    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    177201      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    178202      <Name>HeuristicLab.Data-3.3</Name>
    179203      <Private>False</Private>
    180     </ProjectReference>
    181     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    182       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    183       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    184       <Private>False</Private>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    187       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    188       <Name>HeuristicLab.Operators-3.3</Name>
    189       <Private>False</Private>
    190     </ProjectReference>
    191     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    192       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    193       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    194204    </ProjectReference>
    195205    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    196206      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    197207      <Name>HeuristicLab.Optimization-3.3</Name>
    198       <Private>False</Private>
    199     </ProjectReference>
    200     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    201       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    202       <Name>HeuristicLab.Parameters-3.3</Name>
    203       <Private>False</Private>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    206       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    207       <Name>HeuristicLab.Persistence-3.3</Name>
    208       <Private>False</Private>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    211       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    212       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    213       <Private>False</Private>
    214     </ProjectReference>
    215     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    216       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    217       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    218208      <Private>False</Private>
    219209    </ProjectReference>
     
    250240  -->
    251241  <PropertyGroup>
    252    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     242    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    253243set ProjectDir=$(ProjectDir)
    254244set SolutionDir=$(SolutionDir)
     
    257247call PreBuildEvent.cmd
    258248</PreBuildEvent>
    259 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     249    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    260250export ProjectDir=$(ProjectDir)
    261251export SolutionDir=$(SolutionDir)
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

    r7259 r9286  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using System.Drawing;
    2425using HeuristicLab.Common;
     
    144145
    145146    private void RegisterCoordinatesEvents() {
    146       Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     147      Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    147148      Coordinates.Reset += new EventHandler(Coordinates_Reset);
    148149    }
    149150    private void DeregisterCoordinatesEvents() {
    150       Coordinates.ItemChanged -= new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     151      Coordinates.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    151152      Coordinates.Reset -= new EventHandler(Coordinates_Reset);
    152153    }
     
    166167    }
    167168
    168     private void Coordinates_ItemChanged(object sender, EventArgs<int, int> e) {
     169    private void Coordinates_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    169170      OnCoordinatesChanged();
    170171    }
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r8720 r9286  
    158158    private void CoordinatesParameter_ValueChanged(object sender, EventArgs e) {
    159159      if (Coordinates != null) {
    160         Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     160        Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    161161        Coordinates.Reset += new EventHandler(Coordinates_Reset);
    162162      }
     
    166166      }
    167167    }
    168     private void Coordinates_ItemChanged(object sender, EventArgs<int, int> e) {
     168    private void Coordinates_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    169169      if (Evaluator is ITSPCoordinatesPathEvaluator) {
    170170        ClearDistanceMatrix();
     
    223223      CoordinatesParameter.ValueChanged += new EventHandler(CoordinatesParameter_ValueChanged);
    224224      if (Coordinates != null) {
    225         Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     225        Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    226226        Coordinates.Reset += new EventHandler(Coordinates_Reset);
    227227      }
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-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>
     
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     54    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
     
    6363  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6464    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     65    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6666    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6767    <DebugType>full</DebugType>
     
    7171  </PropertyGroup>
    7272  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7474    <DefineConstants>TRACE</DefineConstants>
    7575    <DocumentationFile>
     
    8383  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8484    <DebugSymbols>true</DebugSymbols>
    85     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     85    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8686    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8787    <DebugType>full</DebugType>
     
    9191  </PropertyGroup>
    9292  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    93     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     93    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9494    <DefineConstants>TRACE</DefineConstants>
    9595    <DocumentationFile>
     
    102102  </PropertyGroup>
    103103  <ItemGroup>
    104     <Reference Include="System" />
     104    <Reference Include="HeuristicLab.Collections-3.3">
     105      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     106      <Private>False</Private>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Common-3.3">
     109      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     110      <Private>False</Private>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Common.Resources-3.3">
     113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     114      <Private>False</Private>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Core-3.3">
     117      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     118      <Private>False</Private>
     119    </Reference>
     120    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     121      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     122      <Private>False</Private>
     123    </Reference>
     124    <Reference Include="HeuristicLab.Operators-3.3">
     125      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     126      <Private>False</Private>
     127    </Reference>
     128    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     129      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     130      <Private>False</Private>
     131    </Reference>
     132    <Reference Include="HeuristicLab.Parameters-3.3">
     133      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     134      <Private>False</Private>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Persistence-3.3">
     137      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     138      <Private>False</Private>
     139    </Reference>
     140    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     141      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     142      <Private>False</Private>
     143    </Reference>
     144    <Reference Include="System">
     145      <Private>False</Private>
     146    </Reference>
    105147    <Reference Include="System.Core">
    106148      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    107     </Reference>
    108     <Reference Include="System.Data" />
    109     <Reference Include="System.Drawing" />
    110     <Reference Include="System.Xml" />
     149      <Private>False</Private>
     150    </Reference>
     151    <Reference Include="System.Data">
     152      <Private>False</Private>
     153    </Reference>
     154    <Reference Include="System.Drawing">
     155      <Private>False</Private>
     156    </Reference>
     157    <Reference Include="System.Xml">
     158      <Private>False</Private>
     159    </Reference>
    111160  </ItemGroup>
    112161  <ItemGroup>
     
    237286      <Private>False</Private>
    238287    </ProjectReference>
    239     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    240       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    241       <Name>HeuristicLab.Collections-3.3</Name>
    242       <Private>False</Private>
    243     </ProjectReference>
    244     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    245       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    246       <Name>HeuristicLab.Common.Resources-3.3</Name>
    247       <Private>False</Private>
    248     </ProjectReference>
    249     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    250       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    251       <Name>HeuristicLab.Common-3.3</Name>
    252       <Private>False</Private>
    253     </ProjectReference>
    254     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    255       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    256       <Name>HeuristicLab.Core-3.3</Name>
    257       <Private>False</Private>
    258     </ProjectReference>
    259288    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    260289      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    261290      <Name>HeuristicLab.Data-3.3</Name>
    262       <Private>False</Private>
    263     </ProjectReference>
    264     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    265       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    266       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    267       <Private>False</Private>
    268     </ProjectReference>
    269     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    270       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    271       <Name>HeuristicLab.Operators-3.3</Name>
    272       <Private>False</Private>
    273     </ProjectReference>
    274     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    275       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    276       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    277291      <Private>False</Private>
    278292    </ProjectReference>
     
    280294      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    281295      <Name>HeuristicLab.Optimization-3.3</Name>
    282       <Private>False</Private>
    283     </ProjectReference>
    284     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    285       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    286       <Name>HeuristicLab.Parameters-3.3</Name>
    287       <Private>False</Private>
    288     </ProjectReference>
    289     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    290       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    291       <Name>HeuristicLab.Persistence-3.3</Name>
    292       <Private>False</Private>
    293     </ProjectReference>
    294     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    295       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    296       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    297296      <Private>False</Private>
    298297    </ProjectReference>
     
    330329  -->
    331330  <PropertyGroup>
    332    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     331    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    333332set ProjectDir=$(ProjectDir)
    334333set SolutionDir=$(SolutionDir)
     
    337336call PreBuildEvent.cmd
    338337</PreBuildEvent>
    339 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     338    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    340339export ProjectDir=$(ProjectDir)
    341340export SolutionDir=$(SolutionDir)
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.VehicleRouting/3.3/VRPSolution.cs

    r7259 r9286  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using System.Drawing;
    2425using HeuristicLab.Common;
     
    311312
    312313    private void RegisterCoordinatesEvents() {
    313       Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     314      Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    314315      Coordinates.Reset += new EventHandler(Coordinates_Reset);
    315316    }
    316317    private void DeregisterCoordinatesEvents() {
    317       Coordinates.ItemChanged -= new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     318      Coordinates.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    318319      Coordinates.Reset -= new EventHandler(Coordinates_Reset);
    319320    }
     
    361362    }
    362363
    363     private void Coordinates_ItemChanged(object sender, EventArgs<int, int> e) {
     364    private void Coordinates_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    364365      OnCoordinatesChanged();
    365366    }
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

    r7904 r9286  
    212212    }
    213213    private void CoordinatesParameter_ValueChanged(object sender, EventArgs e) {
    214       Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     214      Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    215215      Coordinates.Reset += new EventHandler(Coordinates_Reset);
    216216      ParameterizeSolutionCreator();
     
    219219      BestKnownSolution = null;
    220220    }
    221     private void Coordinates_ItemChanged(object sender, EventArgs<int, int> e) {
     221    private void Coordinates_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    222222      ClearDistanceMatrix();
    223223
     
    271271    void DistanceMatrixParameter_ValueChanged(object sender, EventArgs e) {
    272272      if (DistanceMatrix != null) {
    273         DistanceMatrix.ItemChanged += new EventHandler<EventArgs<int, int>>(DistanceMatrix_ItemChanged);
     273        DistanceMatrix.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(DistanceMatrix_ItemChanged);
    274274        DistanceMatrix.Reset += new EventHandler(DistanceMatrix_Reset);
    275275      }
     
    279279      EvalBestKnownSolution();
    280280    }
    281     void DistanceMatrix_ItemChanged(object sender, EventArgs<int, int> e) {
     281    void DistanceMatrix_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    282282      EvalBestKnownSolution();
    283283    }
     
    367367    private void RegisterEventHandlers() {
    368368      CoordinatesParameter.ValueChanged += new EventHandler(CoordinatesParameter_ValueChanged);
    369       Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     369      Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    370370      Coordinates.Reset += new EventHandler(Coordinates_Reset);
    371371
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

    r8894 r9286  
    4040    <DebugType>full</DebugType>
    4141    <Optimize>false</Optimize>
    42     <OutputPath>..\..\bin\</OutputPath>
     42    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4343    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4444    <ErrorReport>prompt</ErrorReport>
     
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>..\..\bin\</OutputPath>
     53    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
     
    6262  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6363    <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>..\..\bin\</OutputPath>
     64    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6565    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6666    <DebugType>full</DebugType>
     
    7070  </PropertyGroup>
    7171  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    72     <OutputPath>..\..\bin\</OutputPath>
     72    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7373    <DefineConstants>TRACE</DefineConstants>
    7474    <DocumentationFile>
     
    8282  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8383    <DebugSymbols>true</DebugSymbols>
    84     <OutputPath>..\..\bin\</OutputPath>
     84    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8585    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8686    <DebugType>full</DebugType>
     
    9090  </PropertyGroup>
    9191  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    92     <OutputPath>..\..\bin\</OutputPath>
     92    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9393    <DefineConstants>TRACE</DefineConstants>
    9494    <DocumentationFile>bin\x64\Release\HeuristicLab.Routing.TSP-3.3.XML</DocumentationFile>
     
    100100  </PropertyGroup>
    101101  <ItemGroup>
     102    <Reference Include="HeuristicLab.Collections-3.3">
     103      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     104      <Private>False</Private>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Common-3.3">
     107      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     108      <Private>False</Private>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Common.Resources-3.3">
     111      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     112      <Private>False</Private>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Core-3.3">
     115      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     116      <Private>False</Private>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     119      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     120      <Private>False</Private>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Operators-3.3">
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     124      <Private>False</Private>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     127      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     128      <Private>False</Private>
     129    </Reference>
     130    <Reference Include="HeuristicLab.Parameters-3.3">
     131      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     132      <Private>False</Private>
     133    </Reference>
     134    <Reference Include="HeuristicLab.Persistence-3.3">
     135      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     136      <Private>False</Private>
     137    </Reference>
     138    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     139      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     140      <Private>False</Private>
     141    </Reference>
     142    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     143      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     144      <Private>False</Private>
     145    </Reference>
    102146    <Reference Include="System" />
    103147    <Reference Include="System.Core">
     
    400444      <Private>False</Private>
    401445    </ProjectReference>
    402     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    403       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    404       <Name>HeuristicLab.Collections-3.3</Name>
    405       <Private>False</Private>
    406     </ProjectReference>
    407     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    408       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    409       <Name>HeuristicLab.Common.Resources-3.3</Name>
    410       <Private>False</Private>
    411     </ProjectReference>
    412     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    413       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    414       <Name>HeuristicLab.Common-3.3</Name>
    415       <Private>False</Private>
    416     </ProjectReference>
    417     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    418       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    419       <Name>HeuristicLab.Core-3.3</Name>
    420       <Private>False</Private>
    421     </ProjectReference>
    422446    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    423447      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    424448      <Name>HeuristicLab.Data-3.3</Name>
    425       <Private>False</Private>
    426     </ProjectReference>
    427     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    428       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    429       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    430       <Private>False</Private>
    431     </ProjectReference>
    432     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    433       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    434       <Name>HeuristicLab.Operators-3.3</Name>
    435       <Private>False</Private>
    436     </ProjectReference>
    437     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    438       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    439       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    440449      <Private>False</Private>
    441450    </ProjectReference>
     
    443452      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    444453      <Name>HeuristicLab.Optimization-3.3</Name>
    445       <Private>False</Private>
    446     </ProjectReference>
    447     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    448       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    449       <Name>HeuristicLab.Parameters-3.3</Name>
    450       <Private>False</Private>
    451     </ProjectReference>
    452     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    453       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    454       <Name>HeuristicLab.Persistence-3.3</Name>
    455       <Private>False</Private>
    456     </ProjectReference>
    457     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    458       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    459       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    460       <Private>False</Private>
    461     </ProjectReference>
    462     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    463       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    464       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    465454      <Private>False</Private>
    466455    </ProjectReference>
  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

    r8922 r9286  
    281281      DistanceMatrixParameter.ValueChanged += new EventHandler(DistanceMatrixParameter_ValueChanged);
    282282      if (DistanceMatrix != null) {
    283         DistanceMatrix.ItemChanged += new EventHandler<EventArgs<int, int>>(DistanceMatrix_ItemChanged);
     283        DistanceMatrix.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(DistanceMatrix_ItemChanged);
    284284        DistanceMatrix.Reset += new EventHandler(DistanceMatrix_Reset);
    285285      }
     
    311311    void DistanceMatrixParameter_ValueChanged(object sender, EventArgs e) {
    312312      if (DistanceMatrix != null) {
    313         DistanceMatrix.ItemChanged += new EventHandler<EventArgs<int, int>>(DistanceMatrix_ItemChanged);
     313        DistanceMatrix.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(DistanceMatrix_ItemChanged);
    314314        DistanceMatrix.Reset += new EventHandler(DistanceMatrix_Reset);
    315315      }
     
    320320      EvalBestKnownSolution();
    321321    }
    322     void DistanceMatrix_ItemChanged(object sender, EventArgs<int, int> e) {
     322    void DistanceMatrix_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    323323      distanceMatrix = DistanceMatrix;
    324324      EvalBestKnownSolution();
Note: See TracChangeset for help on using the changeset viewer.