Free cookie consent management tool by TermsFeed Policy Generator

Changeset 13622


Ignore:
Timestamp:
02/17/16 11:19:58 (9 years ago)
Author:
bwerth
Message:

#1087 recommited project file, renamed IMOSolution to MOSolution

Location:
branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/HeuristicLab.Problems.MultiObjectiveTestFunctions-3.3.csproj

    r13563 r13622  
    2121    <ErrorReport>prompt</ErrorReport>
    2222    <WarningLevel>4</WarningLevel>
     23    <RunCodeAnalysis>true</RunCodeAnalysis>
    2324  </PropertyGroup>
    2425  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    3637    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    3738  </PropertyGroup>
     39  <PropertyGroup>
     40    <StartupObject />
     41  </PropertyGroup>
    3842  <ItemGroup>
    3943    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    … …  
    4751      <Private>False</Private>
    4852    </Reference>
     53    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     54      <SpecificVersion>False</SpecificVersion>
     55      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     56    </Reference>
    4957    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    5058      <SpecificVersion>False</SpecificVersion>
    … …  
    5260      <Private>False</Private>
    5361    </Reference>
     62    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     63      <SpecificVersion>False</SpecificVersion>
     64      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     65    </Reference>
    5466    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    5567      <SpecificVersion>False</SpecificVersion>
    … …  
    6274      <Private>False</Private>
    6375    </Reference>
     76    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     77      <SpecificVersion>False</SpecificVersion>
     78      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     79    </Reference>
     80    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     81      <SpecificVersion>False</SpecificVersion>
     82      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     83    </Reference>
    6484    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    6585      <SpecificVersion>False</SpecificVersion>
    … …  
    86106      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    87107      <Private>False</Private>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     110      <SpecificVersion>False</SpecificVersion>
     111      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     114      <SpecificVersion>False</SpecificVersion>
     115      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
    88116    </Reference>
    89117    <Reference Include="System" />
    90118    <Reference Include="System.Core" />
     119    <Reference Include="System.Drawing" />
     120    <Reference Include="System.Windows.Forms" />
     121    <Reference Include="System.Windows.Forms.DataVisualization" />
    91122    <Reference Include="System.Drawing" />
    92123    <Reference Include="System.Xml.Linq" />
    … …  
    97128  </ItemGroup>
    98129  <ItemGroup>
     130    <Compile Include="Comparators\Crowding.cs" />
     131    <Compile Include="Comparators\FastHV2.cs" />
     132    <Compile Include="Comparators\HyperVolumeFast.cs" />
    99133    <Compile Include="Comparators\Spacing.cs" />
    100134    <Compile Include="Comparators\HyperVolume.cs" />
    101135    <Compile Include="Comparators\InvertedGenerationalDistance.cs" />
    102136    <Compile Include="Comparators\GenerationalDistance.cs" />
     137    <Compile Include="Comparators\Utilities.cs" />
     138    <Compile Include="Data\MISCInstanceProvider.cs" />
     139    <Compile Include="Data\ZDTInstanceProvider.cs" />
     140    <Compile Include="Data\MOTFData.cs" />
     141    <Compile Include="Data\MOTFDataDescriptor.cs" />
     142    <Compile Include="Data\DTLZInstanceProvider.cs" />
     143    <Compile Include="Drawings\IMOQualities.cs" />
     144    <Compile Include="Drawings\MOSolution.cs" />
     145    <Compile Include="Drawings\MOQualitiesScatterPlotView.cs">
     146      <SubType>UserControl</SubType>
     147    </Compile>
     148    <Compile Include="Drawings\MOQualitiesScatterPlotView.Designer.cs">
     149      <DependentUpon>MOQualitiesScatterPlotView.cs</DependentUpon>
     150    </Compile>
     151    <Compile Include="Drawings\MOQulaitiesView.cs">
     152      <SubType>UserControl</SubType>
     153    </Compile>
     154    <Compile Include="Drawings\MOQulaitiesView.Designer.cs">
     155      <DependentUpon>MOQulaitiesView.cs</DependentUpon>
     156    </Compile>
    103157    <Compile Include="NonDominatedSelect.cs" />
    104158    <Compile Include="Interfaces\IMultiObjectiveTestFunction.cs" />
    … …  
    106160    <Compile Include="MultiObjectiveTestFunctionProblem.cs" />
    107161    <Compile Include="PFReader.cs" />
     162    <Compile Include="PFStore.cs" />
    108163    <Compile Include="Plugin.cs" />
    109164    <Compile Include="Properties\AssemblyInfo.cs" />
    110     <Compile Include="Testfunctions\DTLZ7.cs" />
    111     <Compile Include="Testfunctions\DTLZ6.cs" />
    112     <Compile Include="Testfunctions\DTLZ5.cs" />
    113     <Compile Include="Testfunctions\DTLZ4.cs" />
    114     <Compile Include="Testfunctions\DTLZ3.cs" />
    115     <Compile Include="Testfunctions\DTLZ2.cs" />
     165    <Compile Include="Testfunctions\DTLZ\DTLZ.cs" />
     166    <Compile Include="Testfunctions\DTLZ\DTLZ5.cs" />
     167    <Compile Include="Testfunctions\DTLZ\DTLZ8.cs" />
     168    <Compile Include="Testfunctions\DTLZ\DTLZ7.cs" />
     169    <Compile Include="Testfunctions\DTLZ\DTLZ6.cs" />
     170    <Compile Include="Testfunctions\DTLZ\DTLZ4.cs" />
     171    <Compile Include="Testfunctions\DTLZ\DTLZ3.cs" />
     172    <Compile Include="Testfunctions\DTLZ\DTLZ2.cs" />
    116173    <Compile Include="Testfunctions\Evaluators.cs" />
    117174    <Compile Include="Testfunctions\Kursawe.cs" />
    118     <Compile Include="Testfunctions\DTLZ1.cs" />
    119     <Compile Include="Testfunctions\ZDT6.cs" />
    120     <Compile Include="Testfunctions\ZDT4.cs" />
    121     <Compile Include="Testfunctions\ZDT3.cs" />
    122     <Compile Include="Testfunctions\ZDT2.cs" />
    123     <Compile Include="Testfunctions\ZDT1.cs" />
     175    <Compile Include="Testfunctions\DTLZ\DTLZ1.cs" />
     176    <Compile Include="Testfunctions\ZDT\ZDT.cs" />
     177    <Compile Include="Testfunctions\ZDT\ZDT6.cs" />
     178    <Compile Include="Testfunctions\ZDT\ZDT4.cs" />
     179    <Compile Include="Testfunctions\ZDT\ZDT3.cs" />
     180    <Compile Include="Testfunctions\ZDT\ZDT2.cs" />
     181    <Compile Include="Testfunctions\ZDT\ZDT1.cs" />
    124182    <Compile Include="Testfunctions\SchafferN2.cs" />
    125183    <Compile Include="Testfunctions\SchafferN1.cs" />
    … …  
    132190    <None Include="Properties\AssemblyInfo.cs.frame" />
    133191  </ItemGroup>
    134   <ItemGroup />
     192  <ItemGroup>
     193    <EmbeddedResource Include="Drawings\MOQualitiesScatterPlotView.resx">
     194      <DependentUpon>MOQualitiesScatterPlotView.cs</DependentUpon>
     195    </EmbeddedResource>
     196    <EmbeddedResource Include="Drawings\MOQulaitiesView.resx">
     197      <DependentUpon>MOQulaitiesView.cs</DependentUpon>
     198    </EmbeddedResource>
     199  </ItemGroup>
    135200  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    136201  <PropertyGroup>
    137     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     202    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    138203set ProjectDir=$(ProjectDir)
    139204set SolutionDir=$(SolutionDir)
    … …  
    142207call PreBuildEvent.cmd
    143208</PreBuildEvent>
     209    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     210  export ProjectDir=$(ProjectDir)
     211export SolutionDir=$(SolutionDir)
     212
     213$SolutionDir/PreBuildEvent.sh
     214</PreBuildEvent>
     215  </PropertyGroup>
     216  <PropertyGroup>
     217    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     218set ProjectDir=$(ProjectDir)
     219set SolutionDir=$(SolutionDir)
     220set Outdir=$(Outdir)
     221
     222call PreBuildEvent.cmd</PreBuildEvent>
    144223  </PropertyGroup>
    145224  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/MultiObjectiveTestFunctionProblem.cs

    r13620 r13622  
    103103      //Graphical analysis
    104104      if (!results.ContainsKey("Front")) results.Add(new Result("Front", typeof(IMOQualities)));
    105       results["Front"].Value = new IMOSolution(qualities, individuals, opf, Objectives);
     105      results["Front"].Value = new MOSolution(qualities, individuals, opf, Objectives);
    106106
    107107

  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/ZDT/ZDT.cs

    r13620 r13622  
    4343    }
    4444
    45     public virtual double BestKnownHypervolume(int objectives) {
     45    public override double BestKnownHypervolume(int objectives) {
    4646      return -1;
    4747    }
Note: See TracChangeset for help on using the changeset viewer.