Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5938


Ignore:
Timestamp:
04/04/11 01:01:27 (13 years ago)
Author:
abeham
Message:

#1330

  • Added HeuristicLab.Problems.QuadraticAssignment.Tests-3.3 project to solution
  • Fixed assembly name in HeuristicLab.Analysis.Tests-3.3
  • Added another test case to the MDS tests
  • Referenced the two QAP plugins in the tests project
  • Removed plugin dependency in HeuristicLab.Problems.QuadraticAssignment.Views to HeuristicLab.Optimization as the unit test complained about it
Location:
trunk/sources
Files:
1 deleted
6 edited

Legend:

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

    r5933 r5938  
    390390EndProject
    391391Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.QuadraticAssignment.Views-3.3", "HeuristicLab.Problems.QuadraticAssignment.Views\3.3\HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj", "{997F018D-AEA2-4F21-9301-82FAF6A5612D}"
     392EndProject
     393Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.QuadraticAssignment.Tests-3.3", "HeuristicLab.Problems.QuadraticAssignment\3.3\Tests\HeuristicLab.Problems.QuadraticAssignment.Tests-3.3.csproj", "{00E73394-D41B-4C4F-963F-A59341FA1791}"
    392394EndProject
    393395Global
     
    18081810    {997F018D-AEA2-4F21-9301-82FAF6A5612D}.Release|x86.ActiveCfg = Release|x86
    18091811    {997F018D-AEA2-4F21-9301-82FAF6A5612D}.Release|x86.Build.0 = Release|x86
     1812    {00E73394-D41B-4C4F-963F-A59341FA1791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1813    {00E73394-D41B-4C4F-963F-A59341FA1791}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1814    {00E73394-D41B-4C4F-963F-A59341FA1791}.Debug|x64.ActiveCfg = Debug|x64
     1815    {00E73394-D41B-4C4F-963F-A59341FA1791}.Debug|x64.Build.0 = Debug|x64
     1816    {00E73394-D41B-4C4F-963F-A59341FA1791}.Debug|x86.ActiveCfg = Debug|x86
     1817    {00E73394-D41B-4C4F-963F-A59341FA1791}.Debug|x86.Build.0 = Debug|x86
     1818    {00E73394-D41B-4C4F-963F-A59341FA1791}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1819    {00E73394-D41B-4C4F-963F-A59341FA1791}.Release|Any CPU.Build.0 = Release|Any CPU
     1820    {00E73394-D41B-4C4F-963F-A59341FA1791}.Release|x64.ActiveCfg = Release|x64
     1821    {00E73394-D41B-4C4F-963F-A59341FA1791}.Release|x64.Build.0 = Release|x64
     1822    {00E73394-D41B-4C4F-963F-A59341FA1791}.Release|x86.ActiveCfg = Release|x86
     1823    {00E73394-D41B-4C4F-963F-A59341FA1791}.Release|x86.Build.0 = Release|x86
    18101824  EndGlobalSection
    18111825  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Analysis/3.3/Tests/HeuristicLab.Analysis.Tests-3.3.csproj

    r5933 r5938  
    1111    <AppDesignerFolder>Properties</AppDesignerFolder>
    1212    <RootNamespace>HeuristicLab.Analysis.Tests</RootNamespace>
    13     <AssemblyName>HeuristicLab.Analysis.Tests</AssemblyName>
     13    <AssemblyName>HeuristicLab.Analysis.Tests-3.3</AssemblyName>
    1414    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1515    <FileAlignment>512</FileAlignment>
  • trunk/sources/HeuristicLab.Analysis/3.3/Tests/MultidimensionalScalingTest.cs

    r5933 r5938  
    7676        MultidimensionalScaling.KruskalShepard(distancesK));
    7777      Assert.IsTrue(stress < 0.1);
     78      // Example 7: A matrix of perceived dissimilarities between 14 colors, published in the literature
     79      distancesK = new DoubleMatrix(new double[,] {
     80{ 0.00, 0.14, 0.58, 0.58, 0.82, 0.94, 0.93, 0.96, 0.98, 0.93, 0.91, 0.88, 0.87, 0.84 },
     81{ 0.14, 0.00, 0.50, 0.56, 0.78, 0.91, 0.93, 0.93, 0.98, 0.96, 0.93, 0.89, 0.87, 0.86 },
     82{ 0.58, 0.50, 0.00, 0.19, 0.53, 0.83, 0.90, 0.92, 0.98, 0.99, 0.98, 0.99, 0.95, 0.97 },
     83{ 0.58, 0.56, 0.19, 0.00, 0.46, 0.75, 0.90, 0.91, 0.98, 0.99, 1.00, 0.99, 0.98, 0.96 },
     84{ 0.82, 0.78, 0.53, 0.46, 0.00, 0.39, 0.69, 0.74, 0.93, 0.98, 0.98, 0.99, 0.98, 1.00 },
     85{ 0.94, 0.91, 0.83, 0.75, 0.39, 0.00, 0.38, 0.55, 0.86, 0.92, 0.98, 0.98, 0.98, 0.99 },
     86{ 0.93, 0.93, 0.90, 0.90, 0.69, 0.38, 0.00, 0.27, 0.78, 0.86, 0.95, 0.98, 0.98, 1.00 },
     87{ 0.96, 0.93, 0.92, 0.91, 0.74, 0.55, 0.27, 0.00, 0.67, 0.81, 0.96, 0.97, 0.98, 0.98 },
     88{ 0.98, 0.98, 0.98, 0.98, 0.93, 0.86, 0.78, 0.67, 0.00, 0.42, 0.63, 0.73, 0.80, 0.77 },
     89{ 0.93, 0.96, 0.99, 0.99, 0.98, 0.92, 0.86, 0.81, 0.42, 0.00, 0.26, 0.50, 0.59, 0.72 },
     90{ 0.91, 0.93, 0.98, 1.00, 0.98, 0.98, 0.95, 0.96, 0.63, 0.26, 0.00, 0.24, 0.38, 0.45 },
     91{ 0.88, 0.89, 0.99, 0.99, 0.99, 0.98, 0.98, 0.97, 0.73, 0.50, 0.24, 0.00, 0.15, 0.32 },
     92{ 0.87, 0.87, 0.95, 0.98, 0.98, 0.98, 0.98, 0.98, 0.80, 0.59, 0.38, 0.15, 0.00, 0.24 },
     93{ 0.84, 0.86, 0.97, 0.96, 1.00, 0.99, 1.00, 0.98, 0.77, 0.72, 0.45, 0.32, 0.24, 0.00 }});
     94      stress = MultidimensionalScaling.CalculateNormalizedStress(distancesK,
     95        MultidimensionalScaling.KruskalShepard(distancesK));
     96      Assert.IsTrue(stress < 0.1);
    7897    }
    7998
  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/Plugin.cs.frame

    r5933 r5938  
    3434  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3535  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    36   [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3736  [PluginDependency("HeuristicLab.Problems.QuadraticAssignment", "3.3")]
    3837  public class HeuristicLabProblemsQuadraticAssignmentViewsPlugin : PluginBase {
  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Tests/HeuristicLab.Problems.QuadraticAssignment.Tests-3.3.csproj

    r5933 r5938  
    9595  </PropertyGroup>
    9696  <ItemGroup>
    97     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    98     <Reference Include="HeuristicLab.Common-3.3">
    99       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    100     </Reference>
    101     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    102     <Reference Include="HeuristicLab.Core-3.3">
    103       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    104     </Reference>
    105     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    106     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    107     <Reference Include="HeuristicLab.Optimization-3.3">
    108       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    111     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    112     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    113     <Reference Include="HeuristicLab.Random-3.3">
    114       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
    115     </Reference>
    11697    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    11798    <Reference Include="System" />
     
    130111    <Compile Include="Properties\AssemblyInfo.cs" />
    131112    <Compile Include="QAPMoveEvaluatorTest.cs" />
    132     <None Include="Properties\AssemblyInfo.frame" />
    133113    <Compile Include="QAPLIBInstancesTest.cs" />
    134114  </ItemGroup>
    135115  <ItemGroup>
     116    <ProjectReference Include="..\..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     117      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     118      <Name>HeuristicLab.Collections-3.3</Name>
     119    </ProjectReference>
     120    <ProjectReference Include="..\..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     121      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     122      <Name>HeuristicLab.Common.Resources-3.3</Name>
     123    </ProjectReference>
     124    <ProjectReference Include="..\..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     125      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     126      <Name>HeuristicLab.Common-3.3</Name>
     127    </ProjectReference>
     128    <ProjectReference Include="..\..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     129      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     130      <Name>HeuristicLab.Core-3.3</Name>
     131    </ProjectReference>
     132    <ProjectReference Include="..\..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     133      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     134      <Name>HeuristicLab.Data-3.3</Name>
     135    </ProjectReference>
    136136    <ProjectReference Include="..\..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    137137      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    138138      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     139    </ProjectReference>
     140    <ProjectReference Include="..\..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     141      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     142      <Name>HeuristicLab.Operators-3.3</Name>
     143    </ProjectReference>
     144    <ProjectReference Include="..\..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     145      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     146      <Name>HeuristicLab.Optimization-3.3</Name>
     147    </ProjectReference>
     148    <ProjectReference Include="..\..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     149      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     150      <Name>HeuristicLab.Parameters-3.3</Name>
     151    </ProjectReference>
     152    <ProjectReference Include="..\..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     153      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     154      <Name>HeuristicLab.Persistence-3.3</Name>
     155    </ProjectReference>
     156    <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     157      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     158      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     159    </ProjectReference>
     160    <ProjectReference Include="..\..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     161      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     162      <Name>HeuristicLab.Random-3.3</Name>
    139163    </ProjectReference>
    140164    <ProjectReference Include="..\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
     
    145169  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    146170  <PropertyGroup>
    147     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    148 set ProjectDir=$(ProjectDir)
    149 set SolutionDir=$(SolutionDir)
    150 set Outdir=$(Outdir)
    151 
    152 call PreBuildEvent.cmd
    153 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Properties\AssemblyInfo.frame" "%25ProjectDir%25\Properties\AssemblyInfo.cs"</PreBuildEvent>
     171    <PreBuildEvent>
     172    </PreBuildEvent>
    154173  </PropertyGroup>
    155174  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • trunk/sources/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj

    r5825 r5938  
    488488      <Name>HeuristicLab.Problems.OneMax-3.3</Name>
    489489    </ProjectReference>
     490    <ProjectReference Include="..\..\..\HeuristicLab.Problems.QuadraticAssignment.Views\3.3\HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj">
     491      <Project>{997F018D-AEA2-4F21-9301-82FAF6A5612D}</Project>
     492      <Name>HeuristicLab.Problems.QuadraticAssignment.Views-3.3</Name>
     493    </ProjectReference>
     494    <ProjectReference Include="..\..\..\HeuristicLab.Problems.QuadraticAssignment\3.3\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
     495      <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>
     496      <Name>HeuristicLab.Problems.QuadraticAssignment-3.3</Name>
     497    </ProjectReference>
    490498    <ProjectReference Include="..\..\..\HeuristicLab.Problems.TestFunctions.Views\3.3\HeuristicLab.Problems.TestFunctions.Views-3.3.csproj">
    491499      <Project>{6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5}</Project>
Note: See TracChangeset for help on using the changeset viewer.