Changeset 14165


Ignore:
Timestamp:
07/21/16 17:21:54 (9 months ago)
Author:
mkommend
Message:

#1087: Merged r14120, r14121, r14122, r14124, r14125, r14126, r14127, r14130, r14132, r14150, r14164 into stable.

Location:
stable
Files:
8 edited
4 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3.sln

    r13952 r14165  
    455455EndProject
    456456Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.RandomSearch-3.3", "HeuristicLab.Algorithms.RandomSearch\3.3\HeuristicLab.Algorithms.RandomSearch-3.3.csproj", "{4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}"
     457EndProject
     458Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TestFunctions.MultiObjective-3.3", "HeuristicLab.Problems.TestFunctions.MultiObjective\3.3\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj", "{D53E8E48-CFAA-4F57-AC35-63BEF4476159}"
    457459EndProject
    458460Global
     
    22182220    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|x86.ActiveCfg = Release|x86
    22192221    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|x86.Build.0 = Release|x86
     2222    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2223    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2224    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Debug|x64.ActiveCfg = Debug|Any CPU
     2225    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Debug|x86.ActiveCfg = Debug|Any CPU
     2226    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2227    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|Any CPU.Build.0 = Release|Any CPU
     2228    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x64.ActiveCfg = Release|Any CPU
     2229    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x86.ActiveCfg = Release|Any CPU
    22202230  EndGlobalSection
    22212231  GlobalSection(SolutionProperties) = preSolution
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj

    r14121 r14165  
    1212    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    14     <SccProjectName>Svn</SccProjectName>
    15     <SccLocalPath>Svn</SccLocalPath>
    16     <SccAuxPath>Svn</SccAuxPath>
    17     <SccProvider>SubversionScc</SccProvider>
    1814  </PropertyGroup>
    1915  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    5551    <Reference Include="System.Windows.Forms" />
    5652    <Reference Include="System.Windows.Forms.DataVisualization" />
    57     <Reference Include="System.Drawing" />
    5853    <Reference Include="System.Xml.Linq" />
    5954    <Reference Include="System.Data.DataSetExtensions" />
     
    213208</PreBuildEvent>
    214209  </PropertyGroup>
    215   <PropertyGroup>
    216     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    217 set ProjectDir=$(ProjectDir)
    218 set SolutionDir=$(SolutionDir)
    219 set Outdir=$(Outdir)
    220 
    221 call PreBuildEvent.cmd</PreBuildEvent>
    222   </PropertyGroup>
    223210  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    224211       Other similar extension points exist, see Microsoft.Common.targets.
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs

    r14111 r14165  
    5656      get { return (IValueParameter<DoubleArray>)Parameters["ReferencePoint"]; }
    5757    }
    58     public IValueParameter<DoubleMatrix> BestKnownFrontParameter {
    59       get { return (IValueParameter<DoubleMatrix>)Parameters["BestKnownFront"]; }
     58    public OptionalValueParameter<DoubleMatrix> BestKnownFrontParameter {
     59      get { return (OptionalValueParameter<DoubleMatrix>)Parameters["BestKnownFront"]; }
    6060    }
    6161
     
    118118      Parameters.Add(new ValueParameter<DoubleArray>("ReferencePoint", "The reference point used for hypervolume calculation."));
    119119      Parameters.Add(new ValueParameter<IMultiObjectiveTestFunction>("TestFunction", "The function that is to be optimized.", new Fonseca()));
    120       Parameters.Add(new ValueParameter<DoubleMatrix>("BestKnownFront", "The currently best known Pareto front"));
     120      Parameters.Add(new OptionalValueParameter<DoubleMatrix>("BestKnownFront", "The currently best known Pareto front"));
    121121
    122122      Encoding.LengthParameter = ProblemSizeParameter;
  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj

    r11920 r14165  
    105105    <Reference Include="System.Drawing" />
    106106    <Reference Include="System.Windows.Forms" />
     107    <Reference Include="System.Windows.Forms.DataVisualization" />
    107108    <Reference Include="System.Xml.Linq">
    108109      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    115116  </ItemGroup>
    116117  <ItemGroup>
     118    <Compile Include="MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs">
     119      <SubType>UserControl</SubType>
     120    </Compile>
     121    <Compile Include="MultiObjectiveTestFunctionParetoFrontScatterPlotView.Designer.cs">
     122      <DependentUpon>MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs</DependentUpon>
     123    </Compile>
    117124    <Compile Include="Plugin.cs" />
    118125    <Compile Include="Properties\AssemblyInfo.cs" />
     
    196203      <Private>False</Private>
    197204    </ProjectReference>
     205    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions.MultiObjective\3.3\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj">
     206      <Project>{d53e8e48-cfaa-4f57-ac35-63bef4476159}</Project>
     207      <Name>HeuristicLab.Problems.TestFunctions.MultiObjective-3.3</Name>
     208      <Private>False</Private>
     209    </ProjectReference>
    198210    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj">
    199211      <Project>{88B9B0E3-344E-4196-82A3-0F9732506FE8}</Project>
    200212      <Name>HeuristicLab.Problems.TestFunctions-3.3</Name>
     213      <Private>False</Private>
     214    </ProjectReference>
     215    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     216      <Project>{315bda09-3f4f-49b3-9790-b37cfc1c5750}</Project>
     217      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    201218      <Private>False</Private>
    202219    </ProjectReference>
  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/MultiObjectiveTestFunctionParetoFrontScatterPlotView.Designer.cs

    r14122 r14165  
    1919 */
    2020#endregion
    21 namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
     21
     22namespace HeuristicLab.Problems.TestFunctions.Views {
    2223  partial class MultiObjectiveTestFunctionParetoFrontScatterPlotView {
    2324    /// <summary>
  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs

    r14122 r14165  
    2727using HeuristicLab.Core.Views;
    2828using HeuristicLab.MainForm;
    29 
    30 namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
     29using HeuristicLab.Problems.TestFunctions.MultiObjective;
     30
     31namespace HeuristicLab.Problems.TestFunctions.Views {
    3132  [View("Scatter Plot")]
    3233  [Content(typeof(ScatterPlotContent))]
  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame

    r13316 r14165  
    3939  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    4040  [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
     41  [PluginDependency("HeuristicLab.Problems.TestFunctions.MultiObjective", "3.3")]
     42  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
    4143  public class HeuristicLabProblemsTestFunctionsViewsPlugin : PluginBase {
    4244  }
  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r14116 r14165  
    385385    <Reference Include="HeuristicLab.Problems.TestFunctions-3.3">
    386386      <HintPath>..\bin\HeuristicLab.Problems.TestFunctions-3.3.dll</HintPath>
     387      <Private>False</Private>
     388    </Reference>
     389    <Reference Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     390      <SpecificVersion>False</SpecificVersion>
     391      <HintPath>..\bin\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.dll</HintPath>
    387392      <Private>False</Private>
    388393    </Reference>
     
    593598    <Compile Include="HeuristicLab.Problems.TestFunctions-3.3\SumSquaresEvaluatorTest.cs" />
    594599    <Compile Include="HeuristicLab.Problems.TestFunctions-3.3\ZakharovEvaluatorTest.cs" />
     600    <Compile Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3\CrowdingTest.cs" />
     601    <Compile Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3\FastHyperVolumeTests.cs" />
     602    <Compile Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3\GenerationalDistanceTest.cs" />
     603    <Compile Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3\HyperVolumeTests.cs" />
     604    <Compile Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3\InvertedGenerationalDistanceTest.cs" />
     605    <Compile Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3\SpacingTest.cs" />
    595606    <Compile Include="HeuristicLab.Problems.TravelingSalesman-3.3\TSPMoveEvaluatorTest.cs" />
    596607    <Compile Include="HeuristicLab.Problems.LinearAssignment-3.3\LinearAssignmentProblemSolverTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.