Changeset 14071


Ignore:
Timestamp:
07/14/16 16:17:03 (10 months ago)
Author:
abeham
Message:

#2281: merged ResultParameter to trunk

Location:
trunk/sources
Files:
3 deleted
4 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r13666 r14071  
    166166      <DependentUpon>ExperimentListView.cs</DependentUpon>
    167167    </Compile>
     168    <Compile Include="ResultParameterView.cs">
     169      <SubType>UserControl</SubType>
     170    </Compile>
     171    <Compile Include="ResultParameterView.Designer.cs">
     172      <DependentUpon>ResultParameterView.cs</DependentUpon>
     173    </Compile>
    168174    <Compile Include="MultiEncodingView.cs">
    169175      <SubType>UserControl</SubType>
     
    405411      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    406412      <Name>HeuristicLab.Optimization-3.3</Name>
     413      <Private>False</Private>
     414    </ProjectReference>
     415    <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
     416      <Project>{ae5b1ce5-9862-4d6f-a700-d72cd9aea295}</Project>
     417      <Name>HeuristicLab.Parameters.Views-3.3</Name>
     418      <Private>False</Private>
     419    </ProjectReference>
     420    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     421      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     422      <Name>HeuristicLab.Parameters-3.3</Name>
    407423      <Private>False</Private>
    408424    </ProjectReference>
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame

    r13321 r14071  
    3939  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    4040  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     41  [PluginDependency("HeuristicLab.Parameters.Views", "3.3")]
    4142  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4243  [PluginDependency("HeuristicLab.Problems.Instances.Views", "3.3")]
  • trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r13540 r14071  
    156156    <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
    157157    <Compile Include="Interfaces\IMultiObjectiveOperator.cs" />
     158    <Compile Include="Results\IResultParameter.cs" />
    158159    <Compile Include="Interfaces\ISingleObjectiveOperator.cs" />
    159160    <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />
     
    169170    <Compile Include="MetaOptimizers\Experiment.cs" />
    170171    <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
     172    <Compile Include="Results\ResultParameter.cs" />
    171173    <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
    172174    <Compile Include="Plugin.cs" />
     
    230232    <Compile Include="RunCollection.cs" />
    231233    <Compile Include="Run.cs" />
    232     <Compile Include="Interfaces\IResult.cs" />
     234    <Compile Include="Results\IResult.cs" />
    233235    <Compile Include="Interfaces\IDiscreteDoubleValueModifier.cs" />
    234236    <Compile Include="Interfaces\IExhaustiveMoveGenerator.cs" />
     
    254256    <Compile Include="Interfaces\ITabuChecker.cs" />
    255257    <Compile Include="Interfaces\ITabuMaker.cs" />
    256     <Compile Include="Result.cs" />
     258    <Compile Include="Results\Result.cs" />
    257259    <Compile Include="Algorithms\UserDefinedAlgorithm.cs" />
    258260    <Compile Include="Algorithms\EngineAlgorithm.cs" />
    259261    <Compile Include="Properties\AssemblyInfo.cs" />
    260     <Compile Include="ResultCollection.cs" />
     262    <Compile Include="Results\ResultCollection.cs" />
    261263    <Compile Include="Problems\UserDefinedProblem.cs" />
    262264  </ItemGroup>
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/HeuristicLab.Parameters.Views-3.3.csproj

    r11623 r14071  
    217217      <Private>False</Private>
    218218    </ProjectReference>
    219     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    220       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    221       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    222       <Private>False</Private>
    223     </ProjectReference>
    224     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    225       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    226       <Name>HeuristicLab.Optimization-3.3</Name>
    227       <Private>False</Private>
    228     </ProjectReference>
    229219    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    230220      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
Note: See TracChangeset for help on using the changeset viewer.